From a2b2070b679ff7e92d856c7d6775f5f67ce4792d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:54:27 +0200 Subject: bootstrap: %bootstrap-inputs: Wrap input lists into thunks. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Change to procedure. Update users; prepares for Mes bootstrap. * gnu/packages/commencement.scm (%boot0-inputs, %boot1-inputs, %boot2-inputs, %boot3-inputs, %boot4-inputs, %boot5-inputs, %boot-6-inputs): Change to procedure. Update users. * tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths): Make a procedure, filter on package?. Update users. --- gnu/packages/bootstrap.scm | 2 +- gnu/packages/commencement.scm | 115 +++++++++++++++++++++--------------------- 2 files changed, 59 insertions(+), 58 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 936d6c1a2a..fb6e8db88a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -586,7 +586,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %bootstrap-inputs +(define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. `(("libc" ,%bootstrap-glibc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0aa65fe638..a4e71b000b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,13 +101,13 @@ (install-file "make" bin) #t)))))))) (native-inputs '()) ; no need for 'pkg-config' - (inputs %bootstrap-inputs)))) + (inputs (%bootstrap-inputs))))) (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -120,7 +121,7 @@ (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) (current-source-location) #:guile %bootstrap-guile))) @@ -130,17 +131,17 @@ (inherit file) (name "file-boot0")) `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) (current-source-location) #:guile %bootstrap-guile))) -(define %boot0-inputs +(define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ,@%bootstrap-inputs)) + ,@(%bootstrap-inputs))) (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the @@ -149,7 +150,7 @@ ;; Following Linux From Scratch, build a cross-toolchain in stage 0. That ;; toolchain actually targets the same OS and arch, but it has the advantage -;; of being independent of the libc and tools in %BOOTSTRAP-INPUTS, since +;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since ;; GCC-BOOT0 (below) is built without any reference to the target libc. (define binutils-boot0 @@ -184,7 +185,7 @@ ((#:configure-flags cf) `(cons ,(string-append "--target=" (boot-triplet)) ,cf))))) - (inputs %boot0-inputs)))) + (inputs (%boot0-inputs))))) ;; Use a "fixed" package source for this early libstdc++ variant so we can ;; update GCC 4.9 without triggering a full rebuild. @@ -216,7 +217,7 @@ #:validate-runpath? #f ,@(package-arguments lib))) - (inputs %boot0-inputs) + (inputs (%boot0-inputs)) (native-inputs '())))) (define gcc-boot0 @@ -307,8 +308,8 @@ ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. - ("libc-native" ,@(assoc-ref %boot0-inputs "libc")) - ,@(alist-delete "libc" %boot0-inputs))) + ("libc-native" ,@(assoc-ref (%boot0-inputs) "libc")) + ,@(alist-delete "libc" (%boot0-inputs)))) ;; No need for the native-inputs to build the documentation at this stage. (native-inputs `())))) @@ -338,7 +339,7 @@ `(delete "-Dusethreads" ,configure-flags)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl - %boot0-inputs + (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -347,7 +348,7 @@ ;; It is also needed to rebuild Bash's parser, which is modified by ;; its CVE patches. Remove it when it's no longer needed. (let* ((m4 (package-with-bootstrap-guile - (package-with-explicit-inputs m4 %boot0-inputs + (package-with-explicit-inputs m4 (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) (bison (package (inherit bison) @@ -363,7 +364,7 @@ "V=1")))))) (package (inherit (package-with-bootstrap-guile - (package-with-explicit-inputs bison %boot0-inputs + (package-with-explicit-inputs bison (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) (native-inputs `(("perl" ,perl-boot0)))))) @@ -376,7 +377,7 @@ (inputs `(("indent" ,indent))) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs flex %boot0-inputs + (package-with-explicit-inputs flex (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -394,12 +395,12 @@ ,@(package-arguments linux-libre-headers))) (native-inputs `(("perl" ,perl-boot0) - ,@%boot0-inputs)))))) + ,@(%boot0-inputs))))))) (define gnumach-headers-boot0 (package-with-bootstrap-guile (package-with-explicit-inputs gnumach-headers - %boot0-inputs + (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) @@ -413,7 +414,7 @@ `(,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %build-inputs "flex") "/lib/"))))))) (package-with-bootstrap-guile - (package-with-explicit-inputs mig %boot0-inputs + (package-with-explicit-inputs mig (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -422,7 +423,7 @@ (native-inputs `(("mig" ,mig-boot0))) (inputs '())))) (package-with-bootstrap-guile - (package-with-explicit-inputs hurd-headers %boot0-inputs + (package-with-explicit-inputs hurd-headers (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -431,7 +432,7 @@ (native-inputs `(("mig" ,mig-boot0))) (inputs '())))) (package-with-bootstrap-guile - (package-with-explicit-inputs hurd-minimal %boot0-inputs + (package-with-explicit-inputs hurd-minimal (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -447,7 +448,7 @@ the bootstrap environment." `(("gnumach-headers" ,gnumach-headers-boot0) ("hurd-headers" ,hurd-headers-boot0) ("hurd-minimal" ,hurd-minimal-boot0) - ,@%boot0-inputs)))))) + ,@(%boot0-inputs))))))) (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system @@ -458,7 +459,7 @@ the bootstrap environment." ;; Texinfo used to build libc's manual. ;; We build without ncurses because it fails to build at this stage, and ;; because we don't need the stand-alone Info reader. - ;; Also, use %BOOT0-INPUTS to avoid building Perl once more. + ;; Also, use (%BOOT0-INPUTS) to avoid building Perl once more. (let ((texinfo (package (inherit texinfo) (native-inputs '()) (inputs `(("perl" ,perl-boot0))) @@ -468,7 +469,7 @@ the bootstrap environment." ;; UTF-8 locale at this stage, so skip them. (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs texinfo %boot0-inputs + (package-with-explicit-inputs texinfo (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -479,14 +480,14 @@ the bootstrap environment." #:target boot-triplet #:binutils binutils-boot0 #:guile %bootstrap-guile - #:bash (car (assoc-ref %boot0-inputs "bash")))) + #:bash (car (assoc-ref (%boot0-inputs) "bash")))) -(define %boot1-inputs +(define (%boot1-inputs) ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) ("ld-wrapper-cross" ,ld-wrapper-boot0) ("binutils-cross" ,binutils-boot0) - ,@(alist-delete "binutils" %boot0-inputs))) + ,@(alist-delete "binutils" (%boot0-inputs)))) (define glibc-final-with-bootstrap-bash ;; The final libc, "cross-built". If everything went well, the resulting @@ -542,7 +543,7 @@ the bootstrap environment." (inputs `(;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. - ,@%boot1-inputs + ,@(%boot1-inputs) ;; A native MiG is needed to build Glibc on Hurd. ,@(if (hurd-triplet? (%current-system)) @@ -550,11 +551,11 @@ the bootstrap environment." '()) ;; A native GCC is needed to build `cross-rpcgen'. - ("native-gcc" ,@(assoc-ref %boot0-inputs "gcc")) + ("native-gcc" ,@(assoc-ref (%boot0-inputs) "gcc")) ;; Here, we use the bootstrap Bash, which is not satisfactory ;; because we don't want to depend on bootstrap tools. - ("static-bash" ,@(assoc-ref %boot0-inputs "bash"))))))) + ("static-bash" ,@(assoc-ref (%boot0-inputs) "bash"))))))) (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC @@ -613,7 +614,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final-with-bootstrap-bash - (car (assoc-ref %boot1-inputs "bash")))) + (car (assoc-ref (%boot1-inputs) "bash")))) (bash (package (inherit static-bash) (arguments @@ -632,7 +633,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gcc" ,gcc) ("libc" ,glibc-final-with-bootstrap-bash) ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete %boot1-inputs + ,@(fold alist-delete (%boot1-inputs) '("gcc" "libc"))))) (package-with-bootstrap-guile (package-with-explicit-inputs bash inputs @@ -670,7 +671,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (delete 'patch-tests)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal - %boot1-inputs + (%boot1-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -707,14 +708,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; non-cross names. (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final - (car (assoc-ref %boot1-inputs "bash")))) + (car (assoc-ref (%boot1-inputs) "bash")))) -(define %boot2-inputs +(define (%boot2-inputs) ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("gcc" ,gcc-boot0-wrapped) - ,@(fold alist-delete %boot1-inputs '("libc" "gcc")))) + ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) (define binutils-final (package-with-bootstrap-guile @@ -724,7 +725,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ("out" ,glibc-final) ,@(package-arguments binutils))) - (inputs %boot2-inputs)))) + (inputs (%boot2-inputs))))) (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC @@ -750,7 +751,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (assoc-ref %outputs "out") "/include")))) (outputs '("out")) - (inputs %boot2-inputs) + (inputs (%boot2-inputs)) (synopsis "GNU C++ standard library (intermediate)")))) (define zlib-final @@ -763,14 +764,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ("out" ,glibc-final) ,@(package-arguments zlib))) - (inputs %boot2-inputs)))) + (inputs (%boot2-inputs))))) (define ld-wrapper-boot3 ;; A linker wrapper that uses the bootstrap Guile. (make-ld-wrapper "ld-wrapper-boot3" #:binutils binutils-final #:guile %bootstrap-guile - #:bash (car (assoc-ref %boot2-inputs "bash")))) + #:bash (car (assoc-ref (%boot2-inputs) "bash")))) (define gcc-final ;; The final GCC. @@ -835,13 +836,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) ("zlib" ,zlib-final) - ,@%boot2-inputs)))) + ,@(%boot2-inputs))))) -(define %boot3-inputs +(define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) ("ld-wrapper" ,ld-wrapper-boot3) - ,@(alist-delete "gcc" %boot2-inputs))) + ,@(alist-delete "gcc" (%boot2-inputs)))) (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference @@ -851,25 +852,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit bash-minimal) (arguments `(#:disallowed-references - ,(assoc-ref %boot3-inputs "coreutils&co") + ,(assoc-ref (%boot3-inputs) "coreutils&co") ,@(package-arguments bash-minimal)))))) (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) - %boot3-inputs + (%boot3-inputs) (current-source-location) #:guile %bootstrap-guile)))) -(define %boot4-inputs +(define (%boot4-inputs) ;; Now use the final Bash. `(("bash" ,bash-final) - ,@(alist-delete "bash" %boot3-inputs))) + ,@(alist-delete "bash" (%boot3-inputs)))) (define-public guile-final ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (package-with-bootstrap-guile (package-with-explicit-inputs (hidden-package guile-2.2/fixed) - %boot4-inputs + (%boot4-inputs) (current-source-location) #:guile %bootstrap-guile))) @@ -883,7 +884,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit glibc-utf8-locales) (inputs `(("glibc" ,glibc-final) ("gzip" - ,(package-with-explicit-inputs gzip %boot4-inputs + ,(package-with-explicit-inputs gzip (%boot4-inputs) (current-source-location) #:guile %bootstrap-guile)))))) @@ -894,19 +895,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:guile guile-final #:bash bash-final)) -(define %boot5-inputs +(define (%boot5-inputs) ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; with an older libc, which cannot load the new locale format. See ;; . `(("locales" ,glibc-utf8-locales-final) - ,@%boot4-inputs)) + ,@(%boot4-inputs))) (define gnu-make-final ;; The final GNU Make, which uses the final Guile. (package-with-bootstrap-guile (package-with-explicit-inputs gnu-make `(("guile" ,guile-final) - ,@%boot5-inputs) + ,@(%boot5-inputs)) (current-source-location)))) (define coreutils-final @@ -914,7 +915,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Findutils, keep a reference to the Coreutils they were built with. (package-with-bootstrap-guile (package-with-explicit-inputs coreutils - %boot5-inputs + (%boot5-inputs) (current-source-location) ;; Use the final Guile, linked against the @@ -927,23 +928,23 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; built before gzip. (let ((grep (package-with-bootstrap-guile - (package-with-explicit-inputs grep %boot5-inputs + (package-with-explicit-inputs grep (%boot5-inputs) (current-source-location) #:guile guile-final)))) (package/inherit grep (inputs (alist-delete "pcre" (package-inputs grep))) (native-inputs `(("perl" ,perl-boot0)))))) -(define %boot6-inputs +(define (%boot6-inputs) ;; Now use the final Coreutils. `(("coreutils" ,coreutils-final) ("grep" ,grep-final) - ,@%boot5-inputs)) + ,@(%boot5-inputs))) (define sed-final ;; The final sed. (let ((sed (package-with-bootstrap-guile - (package-with-explicit-inputs sed %boot6-inputs + (package-with-explicit-inputs sed (%boot6-inputs) (current-source-location) #:guile guile-final)))) (package/inherit sed (native-inputs `(("perl" ,perl-boot0)))))) @@ -954,7 +955,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; used for origins that have patches, thereby avoiding circular ;; dependencies. (let ((finalize (compose package-with-bootstrap-guile - (cut package-with-explicit-inputs <> %boot6-inputs + (cut package-with-explicit-inputs <> (%boot6-inputs) (current-source-location))))) `(,@(map (match-lambda ((name package) -- cgit v1.2.3 From c362904485d3c8c3f155538ab2f7cd082b334801 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:33:41 +0200 Subject: bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): : New procedure replacing %bootstrap-inputs to prepare for Mes bootstrap. Update users. * tests/union.scm (%bootstrap-inputs): New variable: set to %bootstrap-inputs+toolchain. --- gnu/packages/commencement.scm | 19 +++++++++++-------- tests/union.scm | 4 ++++ 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a4e71b000b..12d5b528fd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -79,6 +79,9 @@ ;;; ;;; Code: +(define (%bootstrap-inputs+toolchain) + (%bootstrap-inputs)) + (define gnu-make-boot0 (package-with-bootstrap-guile (package (inherit gnu-make) @@ -101,13 +104,13 @@ (install-file "make" bin) #t)))))))) (native-inputs '()) ; no need for 'pkg-config' - (inputs (%bootstrap-inputs))))) + (inputs (%bootstrap-inputs+toolchain))))) (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -121,7 +124,7 @@ (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) (current-source-location) #:guile %bootstrap-guile))) @@ -131,17 +134,16 @@ (inherit file) (name "file-boot0")) `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) (current-source-location) #:guile %bootstrap-guile))) - (define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ,@(%bootstrap-inputs))) + ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the @@ -150,8 +152,9 @@ ;; Following Linux From Scratch, build a cross-toolchain in stage 0. That ;; toolchain actually targets the same OS and arch, but it has the advantage -;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since -;; GCC-BOOT0 (below) is built without any reference to the target libc. +;; of being independent of the libc and tools in +;; (%BOOTSTRAP-INPUTS+TOOLCHAIN), since GCC-BOOT0 (below) is built without any +;; reference to the target libc. (define binutils-boot0 (package-with-bootstrap-guile diff --git a/tests/union.scm b/tests/union.scm index 5599625447..091895ff8e 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,9 @@ #:use-module (rnrs io ports) #:use-module (ice-9 match)) +(define %bootstrap-inputs + (@@ (gnu packages commencement) %bootstrap-inputs+toolchain)) + ;; Exercise the (guix build union) module. (define %store -- cgit v1.2.3 From 32f4a073e197e10223fc3c45d459be359d606968 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:44:43 +0200 Subject: gnu: m4-boot0: New variable. * gnu/packages/commencement.scm (m4-boot0): New variable. --- gnu/packages/commencement.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 12d5b528fd..a62655800d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -346,6 +346,17 @@ (current-source-location) #:guile %bootstrap-guile)))) +(define m4-boot0 + (package-with-bootstrap-guile + (package + (inherit m4) + (name "m4-boot0") + (inputs (%boot0-inputs)) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + ,@(package-arguments m4)))))) + (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. ;; It is also needed to rebuild Bash's parser, which is modified by -- cgit v1.2.3 From f50b013f8ce7606f3769ef02c09b4f7e0620686b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:36:48 +0200 Subject: bootstrap: Use thunk for inputs in package-with-explicit-inputs. * gnu/packages/commencement.scm (diffutils-boot0, findutils-boot0, perl-boot0, bison-boot0, flex-boot0, texinfo-boot0, static-bash-for-glibc, gettext-boot0, bash-final, guile-final, glibc-utf8-locales-final, gnu-make-final, coreutils-final, grep-final, sed-final, %final-inputs): Use thunk for inputs in package-with-explicit-inputs. This makes --system=i686-linux behave identical to a native x86 build and prepares for Mes bootstrap. (ld-wrapper-boot0, ld-wrapper-boot3): Change to procedure. Explicitly add #:guile-for-build. Update users. --- gnu/packages/commencement.scm | 82 +++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 38 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a62655800d..ea30694475 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -109,8 +109,9 @@ (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils - `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs+toolchain)) + (lambda _ + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -122,9 +123,10 @@ (package-with-explicit-inputs (package (inherit findutils) (name "findutils-boot0")) - `(("make" ,gnu-make-boot0) - ("diffutils" ,diffutils-boot0) ; for tests - ,@(%bootstrap-inputs+toolchain)) + (lambda _ + `(("make" ,gnu-make-boot0) + ("diffutils" ,diffutils-boot0) ; for tests + ,@(%bootstrap-inputs+toolchain))) (current-source-location) #:guile %bootstrap-guile))) @@ -132,9 +134,13 @@ (package-with-bootstrap-guile (package-with-explicit-inputs (package (inherit file) - (name "file-boot0")) - `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs+toolchain)) + (name "file-boot0") + (arguments + '(#:strip-binaries? #f + #:validate-runpath? #f))) + (lambda _ + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) (current-source-location) #:guile %bootstrap-guile))) @@ -342,7 +348,7 @@ `(delete "-Dusethreads" ,configure-flags)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl - (%boot0-inputs) + %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -361,11 +367,7 @@ ;; This Bison is needed to build MiG so we need it early in the process. ;; It is also needed to rebuild Bash's parser, which is modified by ;; its CVE patches. Remove it when it's no longer needed. - (let* ((m4 (package-with-bootstrap-guile - (package-with-explicit-inputs m4 (%boot0-inputs) - (current-source-location) - #:guile %bootstrap-guile))) - (bison (package (inherit bison) + (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... (arguments @@ -374,11 +376,12 @@ ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) - #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D" + #:make-flags '("ARFLAGS=crD" + "RANLIB=ranlib -D" "V=1")))))) (package (inherit (package-with-bootstrap-guile - (package-with-explicit-inputs bison (%boot0-inputs) + (package-with-explicit-inputs bison %boot0-inputs (current-source-location) #:guile %bootstrap-guile))) (native-inputs `(("perl" ,perl-boot0)))))) @@ -391,7 +394,7 @@ (inputs `(("indent" ,indent))) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs flex (%boot0-inputs) + (package-with-explicit-inputs flex %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -483,23 +486,24 @@ the bootstrap environment." ;; UTF-8 locale at this stage, so skip them. (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs texinfo (%boot0-inputs) + (package-with-explicit-inputs texinfo %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) -(define ld-wrapper-boot0 +(define (ld-wrapper-boot0) ;; We need this so binaries on Hurd will have libmachuser and libhurduser ;; in their RUNPATH, otherwise validate-runpath will fail. (make-ld-wrapper "ld-wrapper-boot0" #:target boot-triplet #:binutils binutils-boot0 #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot0-inputs) "bash")))) + #:bash (car (assoc-ref (%boot0-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define (%boot1-inputs) ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) - ("ld-wrapper-cross" ,ld-wrapper-boot0) + ("ld-wrapper-cross" ,(ld-wrapper-boot0)) ("binutils-cross" ,binutils-boot0) ,@(alist-delete "binutils" (%boot0-inputs)))) @@ -650,7 +654,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(fold alist-delete (%boot1-inputs) '("gcc" "libc"))))) (package-with-bootstrap-guile - (package-with-explicit-inputs bash inputs + (package-with-explicit-inputs bash (lambda _ inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -685,7 +689,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (delete 'patch-tests)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal - (%boot1-inputs) + %boot1-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -718,7 +722,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments glibc-final-with-bootstrap-bash)))))) -(define gcc-boot0-wrapped +(define (gcc-boot0-wrapped) ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; non-cross names. (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final @@ -728,7 +732,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("gcc" ,gcc-boot0-wrapped) + ("gcc" ,(gcc-boot0-wrapped)) ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) (define binutils-final @@ -780,12 +784,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments zlib))) (inputs (%boot2-inputs))))) -(define ld-wrapper-boot3 +(define (ld-wrapper-boot3) ;; A linker wrapper that uses the bootstrap Guile. (make-ld-wrapper "ld-wrapper-boot3" #:binutils binutils-final #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot2-inputs) "bash")))) + #:bash (car (assoc-ref (%boot2-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define gcc-final ;; The final GCC. @@ -846,7 +851,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) - ("ld-wrapper" ,ld-wrapper-boot3) + ("ld-wrapper" ,(ld-wrapper-boot3)) ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) ("zlib" ,zlib-final) @@ -855,7 +860,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) - ("ld-wrapper" ,ld-wrapper-boot3) + ("ld-wrapper" ,(ld-wrapper-boot3)) ,@(alist-delete "gcc" (%boot2-inputs)))) (define bash-final @@ -870,7 +875,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments bash-minimal)))))) (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) - (%boot3-inputs) + %boot3-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -884,7 +889,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; mark it as hidden so that 'fold-packages' ignores it. (package-with-bootstrap-guile (package-with-explicit-inputs (hidden-package guile-2.2/fixed) - (%boot4-inputs) + %boot4-inputs (current-source-location) #:guile %bootstrap-guile))) @@ -898,7 +903,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit glibc-utf8-locales) (inputs `(("glibc" ,glibc-final) ("gzip" - ,(package-with-explicit-inputs gzip (%boot4-inputs) + ,(package-with-explicit-inputs gzip %boot4-inputs (current-source-location) #:guile %bootstrap-guile)))))) @@ -920,8 +925,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final GNU Make, which uses the final Guile. (package-with-bootstrap-guile (package-with-explicit-inputs gnu-make - `(("guile" ,guile-final) - ,@(%boot5-inputs)) + (lambda _ + `(("guile" ,guile-final) + ,@(%boot5-inputs))) (current-source-location)))) (define coreutils-final @@ -929,7 +935,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Findutils, keep a reference to the Coreutils they were built with. (package-with-bootstrap-guile (package-with-explicit-inputs coreutils - (%boot5-inputs) + %boot5-inputs (current-source-location) ;; Use the final Guile, linked against the @@ -942,7 +948,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; built before gzip. (let ((grep (package-with-bootstrap-guile - (package-with-explicit-inputs grep (%boot5-inputs) + (package-with-explicit-inputs grep %boot5-inputs (current-source-location) #:guile guile-final)))) (package/inherit grep @@ -958,7 +964,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define sed-final ;; The final sed. (let ((sed (package-with-bootstrap-guile - (package-with-explicit-inputs sed (%boot6-inputs) + (package-with-explicit-inputs sed %boot6-inputs (current-source-location) #:guile guile-final)))) (package/inherit sed (native-inputs `(("perl" ,perl-boot0)))))) @@ -969,7 +975,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; used for origins that have patches, thereby avoiding circular ;; dependencies. (let ((finalize (compose package-with-bootstrap-guile - (cut package-with-explicit-inputs <> (%boot6-inputs) + (cut package-with-explicit-inputs <> %boot6-inputs (current-source-location))))) `(,@(map (match-lambda ((name package) -- cgit v1.2.3 From 517af02ea1de95ecbde3fa265f3e40b4e44c0eca Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 22:25:27 +0200 Subject: bootstrap: static-bash-for-glibc: Consider %current-system at run time. * gnu/packages/commencement.scm (static-bash-for-glibc): Rewrite so that (%boot1-inputs) is evaluated run time, rather than at load time. --- gnu/packages/commencement.scm | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ea30694475..84d834f5c1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -630,33 +630,35 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. - (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash")))) - (bash (package - (inherit static-bash) - (arguments - (substitute-keyword-arguments - (package-arguments static-bash) - ((#:guile _ #f) - '%bootstrap-guile) - ((#:configure-flags flags '()) - ;; Add a '-L' flag so that the pseudo-cross-ld of - ;; BINUTILS-BOOT0 can find libc.a. - `(append ,flags - (list (string-append "LDFLAGS=-static -L" - (assoc-ref %build-inputs - "libc:static") - "/lib")))))))) - (inputs `(("gcc" ,gcc) - ("libc" ,glibc-final-with-bootstrap-bash) - ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete (%boot1-inputs) - '("gcc" "libc"))))) + (let ((bash (package + (inherit static-bash) + (arguments + (substitute-keyword-arguments + (package-arguments static-bash) + ((#:guile _ #f) + '%bootstrap-guile) + ((#:configure-flags flags '()) + ;; Add a '-L' flag so that the pseudo-cross-ld of + ;; BINUTILS-BOOT0 can find libc.a. + `(append ,flags + (list (string-append "LDFLAGS=-static -L" + (assoc-ref %build-inputs + "libc:static") + "/lib"))))))))) (package-with-bootstrap-guile - (package-with-explicit-inputs bash (lambda _ inputs) - (current-source-location) - #:guile %bootstrap-guile)))) + (package-with-explicit-inputs + bash + (lambda _ + (let ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash"))))) + `(("gcc" ,gcc) + ("libc" ,glibc-final-with-bootstrap-bash) + ("libc:static" ,glibc-final-with-bootstrap-bash "static") + ,@(fold alist-delete (%boot1-inputs) + '("gcc" "libc"))))) + (current-source-location) + #:guile %bootstrap-guile)))) (define gettext-boot0 ;; A minimal gettext used during bootstrap. -- cgit v1.2.3 From dbabfc470d568125d523bbd1942e421a14911f6d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 12:32:07 +0200 Subject: guix: package-from-tarball: Allow PROGRAM-TO-TEST to be #f. * gnu/packages/bootstrap.scm (package-from-tarball): Allow PROGRAM-TO-TEST to be #f. --- gnu/packages/bootstrap.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index fb6e8db88a..c8d4e7e85f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,10 +98,10 @@ (define* (package-from-tarball name source program-to-test description #:key snippet) "Return a package that correspond to the extraction of SOURCE. -PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to check -whether everything is alright. If SNIPPET is provided, it is evaluated after -extracting SOURCE. SNIPPET should raise an exception to signal an error; its -return value is ignored." +PROGRAM-TO-TEST is #f or a string: the program to run after extraction of +SOURCE to check whether everything is alright. If SNIPPET is provided, it is +evaluated after extracting SOURCE. SNIPPET should return true if successful, +or false to signal an error." (package (name name) (version "0") @@ -123,8 +124,9 @@ return value is ignored." (invoke tar "xvf" (string-append builddir "/binaries.tar")) ,@(if snippet (list snippet) '()) - (invoke (string-append "bin/" ,program-to-test) - "--version")))))) + (or (not ,program-to-test) + (invoke (string-append "bin/" ,program-to-test) + "--version"))))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) -- cgit v1.2.3 From 990ee3016486c1f1915a35ccea475eec1acde202 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:49:04 +0200 Subject: gnu: Add linux-libre-headers-bootstrap-tarball. * gnu/packages/make-bootstrap.scm (%linux-libre-headers-stripped): New variable. (%linux-libre-headers-bootstrap-tarball): New variable. --- gnu/packages/make-bootstrap.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 65d632f64e..6523f36d8d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%bootstrap-binaries-tarball + %linux-libre-headers-bootstrap-tarball %binutils-bootstrap-tarball %glibc-bootstrap-tarball %gcc-bootstrap-tarball @@ -300,6 +302,26 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (license gpl3+) (home-page #f))) +(define %linux-libre-headers-stripped + ;; The subset of Linux-Libre-Headers that we need. + (package (inherit linux-libre-headers) + (name (string-append (package-name linux-libre-headers) "-stripped")) + (build-system trivial-build-system) + (outputs '("out")) + (arguments + `(#:modules ((guix build utils) + (guix build make-bootstrap)) + #:builder + (begin + (use-modules (guix build utils) + (guix build make-bootstrap)) + + (let* ((in (assoc-ref %build-inputs "linux-libre-headers")) + (out (assoc-ref %outputs "out"))) + (copy-linux-headers out in) + #t)))) + (inputs `(("linux-libre-headers" ,linux-libre-headers))))) + (define %binutils-static ;; Statically-linked Binutils. (package (inherit binutils) @@ -658,6 +680,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked bootstrap binaries. (tarball-package %static-binaries)) +(define %linux-libre-headers-bootstrap-tarball + ;; A tarball with the statically-linked Linux-Libre-Headers programs. + (tarball-package %linux-libre-headers-stripped)) + (define %binutils-bootstrap-tarball ;; A tarball with the statically-linked Binutils programs. (tarball-package %binutils-static-stripped)) -- cgit v1.2.3 From aec77e869571347863043fdf09c3aeecd28f3682 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 12:34:21 +0200 Subject: bootstrap: Add Mes bootstrap seeds. * gnu/packages/bootstrap.scm (%mescc-tools-seed, %mes-seed, %tinycc-seed, %srfi-43): New variable. --- gnu/packages/bootstrap.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c8d4e7e85f..19995e629f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -44,10 +44,15 @@ %bootstrap-guile %bootstrap-coreutils&co + %bootstrap-linux-libre-headers %bootstrap-binutils %bootstrap-gcc %bootstrap-glibc - %bootstrap-inputs)) + %bootstrap-inputs + %mescc-tools-seed + %mes-seed + %srfi-43 + %tinycc-seed)) ;;; Commentary: ;;; @@ -393,6 +398,23 @@ $out/bin/guile --version~%" (("^exec grep") (string-append (getcwd) "/bin/grep")))) (chmod "bin" #o555)))) +(define-public %bootstrap-linux-libre-headers + (package-from-tarball + "linux-libre-headers-bootstrap" + (lambda (system) + (origin + (method url-fetch) + (uri (match system + ((or "i686-linux" + "x86_64-linux") + "http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.14.26-i686-linux.tar.xz") + (_ (error "linux-libre-headers-bootstrap: system not supported")))) + (sha256 + (base32 + "0nwspwydn089xbd28nnas762iwl6l9ymbcz170qvfi50ywgim1ma")))) + #f ; no program to test + "Bootstrap linux-libre-headers")) + (define %bootstrap-binutils (package-from-tarball "binutils-bootstrap" (lambda (system) @@ -588,6 +610,48 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ + (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" + "/-/archive/" commit + "/mescc-tools-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) + +(define %mes-seed + (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes-seed" + "/-/archive/" commit + "/mes-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0k7iv9djcky18r8lm0zq96xj5nz8v5kg1clf7a2y8r47n6wzww8s"))))) + +(define %tinycc-seed + (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed" + "/-/archive/" commit + "/tinycc-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0hzjd0iyghj4zphwn3ppyclq7k9qqg3xam9fj9hsrr2m0ibvr387"))))) + +(define %srfi-43 + (origin + (method url-fetch) + (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") + (file-name "srfi-43.scm") + (sha256 + (base32 + "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) + (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. -- cgit v1.2.3 From 0b652851b187dd0451c221f6dc173afbd7a555f4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 14:52:00 +0200 Subject: bootstrap: Add Mes bootstrap. * gnu/packages/patches/mes-nyacc-0.86.0.patch: Support bootstrap build. * gnu/packages/commencement.scm (%fake-bootstrap mes-boot0, mescc-tools-boot, nyacc-boot, mes-boot, tcc-boot0, tcc-boot, make-mesboot0, diffutils-mesboot, binutils-mesboot0, gcc-core-mesboot, mesboot-headers, glibc-mesboot0, gcc-mesboot0, binutils-mesboot, make-mesboot, gmp-boot, mpfr-boot, mpc-boot, gcc-mesboot1, gcc-mesboot1-wrapper, glibc-headers-mesboot, glibc-mesboot, gcc-mesboot, gcc-mesboot-wrapper, m4-mesboot): New variable. * gnu/packages/patches/binutils-boot-2.20.1a.patch: New file. New file. * gnu/packages/patches/gcc-boot-2.95.3.patch: New file. * gnu/packages/patches/gcc-boot-4.7.4.patch: New file. * gnu/packages/patches/glibc-boot-2.16.0.patch: New file. * gnu/packages/patches/glibc-boot-2.2.5.patch: New file. * gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch: New file. * gnu/packages/patches/tcc-boot-0.9.27.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 6 + gnu/packages/commencement.scm | 1491 ++++++++++++++++++++ gnu/packages/patches/binutils-boot-2.20.1a.patch | 157 +++ gnu/packages/patches/gcc-boot-2.95.3.patch | 137 ++ gnu/packages/patches/gcc-boot-4.7.4.patch | 68 + gnu/packages/patches/glibc-boot-2.16.0.patch | 352 +++++ gnu/packages/patches/glibc-boot-2.2.5.patch | 251 ++++ .../patches/glibc-bootstrap-system-2.16.0.patch | 30 + gnu/packages/patches/mes-nyacc-0.86.0.patch | 28 + gnu/packages/patches/tcc-boot-0.9.27.patch | 26 + 10 files changed, 2546 insertions(+) create mode 100644 gnu/packages/patches/binutils-boot-2.20.1a.patch create mode 100644 gnu/packages/patches/gcc-boot-2.95.3.patch create mode 100644 gnu/packages/patches/gcc-boot-4.7.4.patch create mode 100644 gnu/packages/patches/glibc-boot-2.16.0.patch create mode 100644 gnu/packages/patches/glibc-boot-2.2.5.patch create mode 100644 gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch create mode 100644 gnu/packages/patches/tcc-boot-0.9.27.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c10894cb5d..71d8e832fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -593,6 +593,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ + %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ @@ -697,6 +698,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-asan-missing-include.patch \ + %D%/packages/patches/gcc-boot-2.95.3.patch \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ @@ -745,6 +747,9 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ + %D%/packages/patches/glibc-boot-2.16.0.patch \ + %D%/packages/patches/glibc-boot-2.2.5.patch \ + %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ @@ -1155,6 +1160,7 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ + %D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 84d834f5c1..ea4d2de725 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages bootstrap) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) #:use-module (gnu packages code) @@ -40,6 +41,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages multiprecision) #:use-module (gnu packages compression) + #:use-module (gnu packages mes) #:use-module (gnu packages perl) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) @@ -79,7 +81,1496 @@ ;;; ;;; Code: +(define %fake-bootstrap? #t) ; cheat using Guile (instead of Mes) in MesCC + ; for speed-up? + +(define mes-boot0 + (let ((version "0.17.1") + (revision "2") + (commit #f)) + (package + (inherit mes) + (name "mes-boot0") + (version (if commit (string-append version "-" revision "." (string-take commit 7)) + version)) + (source (if commit + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes" + "/-/archive/" commit + "/mes-" commit ".tar.gz")) + (sha256 + (base32 + "1dfnchrz3fb8x220bz28i6p3ql2xfahk9mzin3vk8lyw45s12r5g"))) + (package-source mes))) + (native-inputs '()) + (propagated-inputs '())))) + +(define mescc-tools-boot + (let ((version "0.4") + (revision "1") + (commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5")) + (package-with-bootstrap-guile + (package + (inherit mescc-tools) + (name "mescc-tools-boot") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools" + "/-/archive/" commit + "/mescc-tools-" commit ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-source" ,(package-source mes-boot0)) + + ("coreutils" ,%bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed))) + (build-system gnu-build-system) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (mes-source (assoc-ref %build-inputs "mes-source")) + (out (assoc-ref %outputs "out"))) + (with-directory-excursion ".." + (and + (mkdir-p "mescc-tools-seed") + (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" + "-xvf" mescc-tools-seed) + (mkdir-p "mes-source") + (invoke "tar" "--strip=1" "-C" "mes-source" + "-xvf" mes-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed)))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (out (assoc-ref %outputs "out"))) + (setenv "PATH" (string-append coreutils "/bin" + ":" "../mescc-tools-seed")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (setenv "PREFIX" out) + (setenv "MES_PREFIX" "../mes-source") + (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") + (setenv "MES_SEED" "../mes-seed") + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (invoke "sh" "check.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))))))) + +(define nyacc-boot + (let ((version "0.86.0") + (revision "0") + (commit #f)) + (package + (inherit nyacc) + (name "nyacc-boot") + (version + (if commit + (string-append version "-" revision "." (string-take commit 7)) + version)) + (source + (if commit + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/nyacc" + "/-/archive/" commit + "/nyacc-" commit ".tar.gz")) + (sha256 + (base32 + "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"))) + (package-source nyacc)))))) + +(define mes-boot + (package-with-bootstrap-guile + (package + (inherit mes) + (source (package-source mes-boot0)) + (name "mes-boot") + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools" ,mescc-tools-boot) + ("nyacc-source" ,(package-source nyacc-boot)) + + ("coreutils" , %bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed) + ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile + `(("guile" ,%bootstrap-guile) + ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick + '()))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (srfi-43 (assoc-ref %build-inputs "srfi-43")) + (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (mes-seed (assoc-ref %build-inputs "mes-seed"))) + (with-directory-excursion ".." + (and + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed) + (or (not srfi-43) + (and (mkdir-p "srfi") + (copy-file srfi-43 "srfi/srfi-43.scm") + #t))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + (symlink (string-append "../nyacc-source/module") "nyacc") + (setenv "GUILE_LOAD_PATH" "nyacc") + (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile + (invoke "bash" "-x" "configure.sh" + (string-append "--prefix=" out)) + (setenv "MES" "src/mes") + (setenv "MESCC" "scripts/mescc") + (when ,%fake-bootstrap? ; Cheat using Guile+Nyacc+MesCC; ~30 times faster + (let ((dir (with-directory-excursion ".." (getcwd))) + (guile (assoc-ref %build-inputs "guile")) + (srfi-43 (assoc-ref %build-inputs "srfi-43"))) + (setenv "MES" "guile") + (setenv "GUILE_AUTO_COMPILE" "1") + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append guile "/lib/guile/2.0/ccache")) + (setenv "GUILE_LOAD_PATH" + (string-append (string-append dir "/nyacc-source/module") + ":" dir + ":" guile "/share/guile/2.0/")) + ;; these fail with guile-2.0 + (when srfi-43 + (delete-file "tests/srfi-9.test") + (delete-file "tests/srfi-43.test")) + ;; give auto-compile a home -- massive speed-up + (mkdir-p "/tmp/home") + (setenv "HOME" "/tmp/home"))) + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (when ,%fake-bootstrap? + ;; breaks with guile-2.0 + (delete-file "scaffold/boot/50-primitive-load.scm") + (delete-file "scaffold/boot/51-module.scm")) + (and + (setenv "MES_ARENA" "100000000") + (setenv "DIFF" "sh scripts/diff.scm") + (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "-x" "check.sh")))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("share/mes/include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("share/mes/lib")))))))) + +(define tcc-boot0 + ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 + ;; patches. In a very early and rough form they were presented to the + ;; TinyCC developers, who at the time showed no interest in supporting the + ;; bootstrappable effort; we will try again later. These patches have been + ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more + ;; mature, this package should use the 0.9.27 sources (or later). + (let ((version "0.9.26") + (revision "3") + (commit "812e9343e4520ec90934fd7f47134416ad0dce07")) + (package-with-bootstrap-guile + (package + (inherit tcc) + (name "tcc-boot0") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc" + "/-/archive/" commit + "/tinycc-" commit ".tar.gz")) + (sha256 + (base32 + "0c68hmi6ryb3bmbmdrr5knhz61li3mlhkmxvji6khgkb199znlqc")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mes" ,mes-boot) + ("mes-seed" ,%mes-seed) + ("mescc-tools" ,mescc-tools-boot) + ("nyacc-source" ,(package-source nyacc-boot)) + + ("coreutils" , %bootstrap-coreutils&co) + ("tinycc-seed" ,%tinycc-seed) + ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile + `(("guile" ,%bootstrap-guile) + ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick + '()))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (srfi-43 (assoc-ref %build-inputs "srfi-43")) + (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))) + (setenv "PATH" (string-append + coreutils "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (with-directory-excursion ".." + (and + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" + "-xvf" nyacc-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed) + (mkdir-p "tinycc-seed") + (invoke "tar" "--strip=1" "-C" "tinycc-seed" + "-xvf" tinycc-seed) + (or (not srfi-43) + (and (mkdir-p "srfi") + (copy-file srfi-43 "srfi/srfi-43.scm") + #t))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (dir (with-directory-excursion ".." (getcwd))) + (coreutils (assoc-ref %build-inputs "coreutils")) + (guile (assoc-ref %build-inputs "guile")) + (mes (assoc-ref %build-inputs "mes")) + (mescc-tools (assoc-ref %build-inputs "mescc-tools")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + (setenv "PATH" (string-append + coreutils "/bin" + ":" mes "/bin" + (if guile (string-append ":" guile "/bin") + "") + ":" mescc-tools "/bin")) + + (setenv "PREFIX" out) + (setenv "MESCC" (string-append mes "/bin/mescc")) + (symlink (string-append mes "/share/mes") "mes") + (setenv "MES_PREFIX" "mes") + (setenv "OBJDUMP" "true") + (setenv "ONE_SOURCE" "1") + (setenv "PREPROCESS" "1") + (setenv "MES_DEBUG" "1") + (setenv "MES_ARENA" "70000000") + (setenv "MES_MAX_ARENA" "70000000") + + (if ,%fake-bootstrap? + (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster + (setenv "MES" "guile") + (setenv "GUILE_AUTO_COMPILE" "1") + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append guile "/lib/guile/2.0/ccache")) + (setenv "GUILE_LOAD_PATH" + (string-append dir + ":" guile "/share/guile/2.0/" + ":" dir "/nyacc-source/module" + ":" mes "/share/mes/guile")) + + ;; give auto-compile a home -- massive speed-up + (mkdir-p "/tmp/home") + (setenv "HOME" "/tmp/home")) + + (begin ; True bootstrap build with Mes+Nyacc+MesCC + (setenv "MES" "mes") + (setenv "GUILE_LOAD_PATH" "nyacc") + (symlink (string-append "../nyacc-source/module") "nyacc"))) + (invoke "sh" "configure" + "--prefix=$PREFIX" + (string-append "--elfinterp=" interpreter) + "--crtprefix=." + "--tccdir=.")))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (setenv "DIFF" "diff.scm") + ;; fail fast tests + ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") + ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") + (setenv "TCC" "./tcc") + (invoke "sh" "check.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib"))))))))) + +(define tcc-boot + (package-with-bootstrap-guile + (package + (inherit tcc-boot0) + (name "tcc-boot") + (version "0.9.27") + (source (origin + (inherit (package-source tcc)) + (patches (search-patches "tcc-boot-0.9.27.patch")))) + (build-system gnu-build-system) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mes" ,mes-boot) + ("tcc" ,tcc-boot0) + + ("coreutils" , %bootstrap-coreutils&co))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 + ; binaries, tcc-boot also comes with + ; MesCC/M1/hex2-built binaries + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (mes (assoc-ref %build-inputs "mes")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + ;; unpack + (setenv "PATH" (string-append + coreutils "/bin" + ":" tcc "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (invoke "sh" "configure" + (string-append "--cc=tcc") + (string-append "--cpu=i386") + (string-append "--prefix=" out) + (string-append "--elfinterp=" interpreter) + (string-append "--crtprefix=" tcc "/lib") + (string-append "--sysincludepaths=" tcc "/include") + (string-append "--libpaths=" tcc "/lib"))))) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (mes (assoc-ref %build-inputs "mes")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + (invoke "tcc" + "-vvv" + "-D" "BOOTSTRAP=1" + "-D" "ONE_SOURCE=1" + "-D" "TCC_TARGET_I386=1" + "-D" "CONFIG_TCC_STATIC=1" + "-D" "CONFIG_USE_LIBGCC=1" + "-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"") + "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"") + "-D" (string-append "TCC_LIBGCC=\"" tcc "/lib/libc.a\"") + "-o" "tcc" + "tcc.c")))) + (replace 'check + (lambda _ + ;; FIXME: add sensible check target (without depending on make) + ;; ./check.sh ? + (= 1 (status:exit-val (system* "./tcc" "--help"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out")) + (tcc (assoc-ref %build-inputs "tcc"))) + (and + (mkdir-p (string-append out "/bin")) + (copy-file "tcc" (string-append out "/bin/tcc")) + (mkdir-p (string-append out "/lib/tcc")) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + (copy-recursively (string-append tcc "/lib") + (string-append out "/lib")) + (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) + (delete-file (string-append out "/lib/tcc/libtcc1.a")) + (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) + #t)))))))))) + +(define make-mesboot0 + (package-with-bootstrap-guile + (package + (inherit gnu-make) + (name "make-mesboot0") + (version "3.80") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" + version ".tar.gz")) + (sha256 + (base32 + "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co))) + (arguments + `(#:implicit-inputs? #f + #:tests? #f ; check depends on perl + #:guile ,%bootstrap-guile + #:configure-flags `("CC=tcc -DO_RDONLY=0" + "LD=tcc" + "--disable-nls") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'configure-fixup + (lambda _ + (substitute* "build.sh" + (("^REMOTE=.*") "REMOTE=stub\n") + (("^extras=.*") "extras=getloadavg.c\n")) + (substitute* "make.h" + (("^extern long int lseek.*" all) (string-append "// " all))) + #t)) + (delete 'patch-generated-file-shebangs) ; no perl + (replace 'build + (lambda _ + (invoke "sh" "./build.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin)))))))))) + +(define diffutils-mesboot + (package-with-bootstrap-guile + (package + (inherit diffutils) + (name "diffutils-mesboot") + (version "2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/diffutils/diffutils-" + version ".tar.gz")) + (sha256 + (base32 + "1mirn5i825bn5w7rh6mgn0r8aj9xqanav95dwcl1b8sn82f4iwnm")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("mes" ,mes-boot) + ("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("make" ,make-mesboot0))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:tests? #f ; check is naive, also checks non-built PROGRAMS + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + ;; diffutils-2.7 needs more traditional configure + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "CC" "tcc") + (setenv "LD" "tcc") + (invoke "./configure" (string-append "--prefix=" out))))) + (add-before 'configure 'remove-diff3-sdiff + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.in" + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))))))))) + + +(define binutils-mesboot0 + (package-with-bootstrap-guile + (package + (inherit binutils) + (name "binutils-mesboot0") + (version "2.20.1a") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (patches (search-patches "binutils-boot-2.20.1a.patch")) + (sha256 + (base32 + "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("make" ,make-mesboot0))) + (supported-systems '("i686-linux" "x86_64-linux")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f ; runtest: command not found + #:parallel-build? #f + #:strip-binaries? #f ; no strip yet + #:configure-flags + (let ((cppflags (string-append " -D __GLIBC_MINOR__=6" + " -D MES_BOOTSTRAP=1")) + (bash (assoc-ref %build-inputs "bash"))) + `(,(string-append "CONFIG_SHELL=" bash "/bin/sh") + ,(string-append "CPPFLAGS=" cppflags) + "AR=tcc -ar" + "CXX=false" + "RANLIB=true" + ,(string-append "CC=tcc" cppflags) + "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/"))))))) + +(define gcc-core-mesboot + ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C + ;; Library v0.16 offers. Gcc-3.x (and 4.x) place higher demands on a C + ;; library, such as dir.h/struct DIR/readdir, locales, signals... Also, + ;; with gcc-2.95.3, binutils-boot-2.20.1a and glibc-2.2.5 we found a GNU + ;; toolchain triplet "that works". + (package-with-bootstrap-guile + (package + (inherit gcc) + (name "gcc-core-mesboot") + (version "2.95.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" + version + ".tar.gz")) + (patches (search-patches "gcc-boot-2.95.3.patch")) + (sha256 + (base32 + "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("make" ,make-mesboot0))) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:parallel-build? #f + #:strip-binaries? #f + #:configure-flags + (let ((out (assoc-ref %outputs "out"))) + `("--enable-static" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + ,(string-append "--prefix=" out))) + #:make-flags (list + "CC=tcc -static -D __GLIBC_MINOR__=6" + "OLDCC=tcc -static -D __GLIBC_MINOR__=6" + "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6" + "AR=ar" + "RANLIB=ranlib" + (string-append "LIBGCC2_INCLUDES=-I " + (assoc-ref %build-inputs "tcc") + "/include") + "LANGUAGES=c" + (string-append "BOOT_LDFLAGS=" + " -B" (assoc-ref %build-inputs "tcc") + "/lib/")) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + ;; gcc-2.95.3 needs more traditional configure + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (tcc (assoc-ref %build-inputs "tcc")) + (cppflags " -D __GLIBC_MINOR__=6")) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "CPPFLAGS" cppflags) + (setenv "CC" (string-append "tcc" cppflags)) + (setenv "CC_FOR_BUILD" (string-append "tcc" cppflags)) + (setenv "CPP" (string-append "tcc -E" cppflags)) + (with-output-to-file "config.cache" + (lambda _ + (display " +ac_cv_c_float_format='IEEE (little-endian)' +")))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke "./configure" configure-flags))) + (add-after 'configure 'remove-info + (lambda _ + ;; no info at this stage + (delete-file-recursively "texinfo") + (invoke "touch" "gcc/cpp.info" "gcc/gcc.info"))) + (add-after 'install 'install2 + (lambda* (#:key outputs #:allow-other-keys) + (let* ((tcc (assoc-ref %build-inputs "tcc")) + (tcc-lib (string-append tcc "/lib/x86-mes-gcc")) + (out (assoc-ref outputs "out")) + (gcc-dir (string-append + out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) + (and + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + (copy-file (string-append tcc "/lib/libtcc1.a") + (string-append out "/lib/libtcc1.a")) + (invoke "ar" "r" (string-append gcc-dir "/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ar" "r" (string-append out "/lib/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ls" "-ltrF" gcc-dir) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + #t))))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include" "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define mesboot-headers + (package-with-bootstrap-guile + (package + (inherit mes-boot) + (name "mesboot-headers") + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("coreutils" ,%bootstrap-coreutils&co) + ("headers" ,%bootstrap-linux-libre-headers))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include (string-append out "/include")) + (headers (assoc-ref %build-inputs "headers" ))) + (mkdir-p include) + (copy-recursively "include" out) + (copy-recursively headers out) + #t)))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include")))))))) + +(define glibc-mesboot0 + ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build + ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer + ;; gcc. + (package-with-bootstrap-guile + (package + (inherit glibc) + (name "glibc-mesboot0") + (version "2.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + (patches (search-patches "glibc-boot-2.2.5.patch")) + (sha256 + (base32 + "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("gcc" ,gcc-core-mesboot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("headers" ,mesboot-headers) + ("make" ,make-mesboot0))) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:strip-binaries? #f + #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds + #:make-flags (list (string-append + "SHELL=" + (assoc-ref %build-inputs "bash") + "/bin/sh")) + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (headers (assoc-ref %build-inputs "headers"))) + (list + "--disable-shared" + "--enable-static" + "--disable-sanity-checks" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + (string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--without-__thread" + "--without-cvs" + "--without-gd" + "--without-tls" + (string-append "--prefix=" out))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (headers (assoc-ref %build-inputs "headers")) + (cppflags (string-append + ;;" -D __STDC__=1" + " -D MES_BOOTSTRAP=1" + " -D BOOTSTRAP_GLIBC=1")) + (cflags (string-append " -L " (getcwd)))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "SHELL" (getenv "CONFIG_SHELL")) + (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) + (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + #t))) + ;; glibc-2.2.5 needs a more classic invocation of configure + ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke "./configure" configure-flags)))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define gcc-mesboot0 + (package-with-bootstrap-guile + (package + (inherit gcc-core-mesboot) + (name "gcc-mesboot0") + (native-inputs `(("binutils" ,binutils-mesboot0) + ("gcc" ,gcc-core-mesboot) + ("libc" ,glibc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot0))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" + ":" kernel-headers "/include" + ":" glibc "/include")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + ;; FIXME: add glibc dirs to paths manually + (setenv "LIBRARY_PATH" (string-join + (list (string-append glibc "/lib") + (getenv "LIBRARY_PATH")) + ":")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + (with-output-to-file "config.cache" + (lambda _ + (display " +ac_cv_c_float_format='IEEE (little-endian)' +"))) + #t))) + (replace 'install2 + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gcc-dir (string-append + out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) + (and + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")))))))) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `("--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + ,(string-append "--prefix=" out)))) + ((#:make-flags make-flags) + `(let ((gcc (assoc-ref %build-inputs "gcc"))) + `("RANLIB=true" + ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") + "LANGUAGES=c")))))))) + +(define binutils-mesboot + (package-with-bootstrap-guile + (package + (inherit binutils-mesboot0) + (name "binutils-mesboot") + (native-inputs `(("binutils" ,binutils-mesboot0) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot0))) + (arguments + (substitute-keyword-arguments (package-arguments binutils-mesboot0) + ((#:configure-flags configure-flags) + '(list "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/"))))))) + +(define make-mesboot + (package-with-bootstrap-guile + (package + (inherit make-mesboot0) + (name "make-mesboot") + (version "3.82") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" + version ".tar.gz")) + (sha256 + (base32 + "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot0) + ("make" ,make-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("kernel-headers" ,%bootstrap-linux-libre-headers))) + (arguments + (substitute-keyword-arguments (package-arguments make-mesboot0) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `(,(string-append "--prefix=" out)))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-fixup) + (add-before 'configure 'setenv + (lambda _ + (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") + #t))))))))) + +(define gmp-boot + (package + (inherit gmp) + (version "4.3.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gmp/gmp-" version + ".tar.gz")) + (sha256 (base32 + "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv")))))) + +(define mpfr-boot + (package + (inherit mpfr) + (version "2.4.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mpfr/mpfr-" version + ".tar.gz")) + (sha256 (base32 + "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94")))))) + +(define mpc-boot + (package + (inherit mpc) + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://gnu/mpc/mpc-" version ".tar.gz")) + (sha256 + (base32 + "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1")))))) + +(define gcc-mesboot1 + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot0) + (name "gcc-mesboot1") + (version "4.7.4") + (source (origin (inherit (package-source gcc-4.7)) + (patches (search-patches "gcc-boot-4.7.4.patch")))) + (inputs `(("gmp-source" ,(package-source gmp-boot)) + ("mpfr-source" ,(package-source mpfr-boot)) + ("mpc-source" ,(package-source mpc-boot)))) + (native-inputs `(("binutils" ,binutils-mesboot) + ("gcc" ,gcc-mesboot0) + ("libc" ,glibc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + ((#:make-flags make-flags) + `(let* ((libc (assoc-ref %build-inputs "libc")) + (ldflags (string-append + "-B" libc "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc + ,(glibc-dynamic-linker)))) + (list (string-append "LDFLAGS=" ldflags) + (string-append "LDFLAGS_FOR_TARGET=" ldflags)))) + ((#:phases phases) + `(modify-phases ,phases + ;; c&p from commencement.scm:gcc-boot0 + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (or (invoke "tar" "xvf" source) + (error "failed to unpack tarball" + source))) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-boot mpfr-boot mpc-boot)) + #t))) + (delete 'remove-info) + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t))) + (delete 'install2))) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (glibc (assoc-ref %build-inputs "libc"))) + (list (string-append "--prefix=" out) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + (string-append "--with-native-system-header-dir=" glibc "/include") + (string-append "--with-build-sysroot=" glibc "/include") + + "--disable-bootstrap" + "--disable-decimal-float" + "--disable-libatomic" + "--disable-libcilkrts" + "--disable-libgomp" + "--disable-libitm" + "--disable-libmudflap" + "--disable-libquadmath" + "--disable-libsanitizer" + "--disable-libssp" + "--disable-libvtv" + "--disable-lto" + "--disable-lto-plugin" + "--disable-multilib" + "--disable-plugin" + "--disable-threads" + "--enable-languages=c,c++" + + "--enable-static" + ;; libstdc++.so: error: depends on 'libgcc_s.so.1', which cannot be found in RUNPATH () + "--disable-shared" + "--enable-threads=single" + + ;; No pre-compiled libstdc++ headers, to save space. + "--disable-libstdcxx-pch" + + ;; for libcpp ... + "--disable-build-with-cxx")))))))) + +(define gcc-mesboot1-wrapper + ;; We need this so gcc-mesboot1 can be used to create shared binaries that + ;; have the correct interpreter, otherwise configuring gcc-mesboot using + ;; --enable-shared will fail. + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1) + (name "gcc-mesboot1-wrapper") + (source #f) + (inputs '()) + (native-inputs `(("bash" ,%bootstrap-coreutils&co) + ("libc" ,glibc-mesboot) + ("gcc" ,gcc-mesboot1))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'install) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (libc (assoc-ref %build-inputs "libc")) + (gcc (assoc-ref %build-inputs "gcc")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (for-each + (lambda (program) + (let ((wrapper (string-append bin "/" program))) + (with-output-to-file wrapper + (lambda _ + (display (string-append "#! " bash "/bin/bash +exec " gcc "/bin/" program +" -Wl,--dynamic-linker" +" -Wl," libc ,(glibc-dynamic-linker) +" -Wl,--rpath" +" -Wl," libc "/lib" +" \"$@\" +")) + (chmod wrapper #o555))))) + '( + "gcc" + "g++" + "i686-unknown-linux-gnu-gcc" + "i686-unknown-linux-gnu-g++" + )) + #t))) + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (program (string-append bin "/gcc"))) + (invoke program "--help")))))))))) + +(define glibc-headers-mesboot + (package-with-bootstrap-guile + (package + (inherit glibc-mesboot0) + (name "glibc-headers-mesboot") + (version "2.16.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + (patches (search-patches "glibc-boot-2.16.0.patch" + "glibc-bootstrap-system-2.16.0.patch")) + (sha256 + (base32 + "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7")))) + (native-inputs `(("binutils" ,binutils-mesboot) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot1) + ("headers" ,mesboot-headers) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + + (arguments + (substitute-keyword-arguments (package-arguments glibc-mesboot0) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (headers (assoc-ref %build-inputs "headers"))) + (list + (string-append "--prefix=" out) + "--disable-obsolete-rpc" + "--host=i686-unknown-linux-gnu" + (string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--with-pthread" + "--without-cvs" + "--without-gd" + "--enable-add-ons=nptl"))) + ((#:make-flags make-flags) + `(let ((bash (assoc-ref %build-inputs "bash"))) + (list (string-append "SHELL=" bash "/bin/sh") + "install-bootstrap-headers=yes" "install-headers"))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (headers (assoc-ref %build-inputs "headers")) + (bash (assoc-ref %build-inputs "bash")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (libc (assoc-ref %build-inputs "libc")) + (gcc (assoc-ref %build-inputs "gcc")) + (cppflags (string-append + " -I " (getcwd) "/nptl/sysdeps/pthread/bits" + " -D BOOTSTRAP_GLIBC=1")) + (cflags (string-append " -L " (getcwd) + " -L " libc "/lib"))) + (setenv "libc_cv_friendly_stddef" "yes") + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "SHELL" (getenv "CONFIG_SHELL")) + (format (current-error-port) "CONFIG_SHELL=~s\n" (getenv "CONFIG_SHELL")) + + (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) + (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + + ;; avoid -fstack-protector + (setenv "libc_cv_ssp" "false") + (substitute* "configure" + (("/bin/pwd") (string-append coreutils "/bin/pwd"))) + (setenv "C_INCLUDE_PATH" (string-append libc "/include" + headers "/include")) + (setenv "LIBRARY_PATH" (string-append libc "/lib"))))) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) + (out (assoc-ref outputs "out"))) + (and (apply invoke "make" make-flags) + (copy-recursively kernel-headers out) + #t)))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) "running ../configure ~a\n" (string-join configure-flags)) + (mkdir-p "build") + (chdir "build") + (apply invoke "../configure" configure-flags))) + (add-after 'configure 'remove-sunrpc + (lambda _ + (invoke "make" (string-append (getcwd) "/sysd-sorted" ) + (string-append "SHELL=" (getenv "CONFIG_SHELL"))) + (substitute* "sysd-sorted" + ((" sunrpc") " ") + ((" nis") " ")) + ;; 'rpcgen' needs native libc headers to be built. + (substitute* "../Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) + (substitute* "../Makeconfig" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) + (substitute* "../elf/Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL"))))))))))))) + +(define glibc-mesboot + (package-with-bootstrap-guile + (package + (inherit glibc-headers-mesboot) + (name "glibc-mesboot") + (native-inputs `(("binutils" ,binutils-mesboot) + ("libc" ,glibc-mesboot0) + ("headers" ,glibc-headers-mesboot) + ("gcc" ,gcc-mesboot1) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + + (arguments + `(#:validate-runpath? #f ; fails when using --enable-shared + ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot) + ((#:make-flags make-flags) + `(let ((bash (assoc-ref %build-inputs "bash"))) + (list (string-append "SHELL=" bash "/bin/sh")))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) + (out (assoc-ref outputs "out")) + (install-flags (cons "install" make-flags))) + (and (apply invoke "make" install-flags) + (copy-recursively kernel-headers out) + #t))))))))) + (native-search-paths ;; FIXME: move to glibc-mesboot0 + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define gcc-mesboot + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1) + (name "gcc-mesboot") + (version "4.9.4") + (source (package-source gcc-4.9)) + (native-inputs `(("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot1-wrapper) + ("gcc" ,gcc-mesboot1) + ("libc" ,glibc-mesboot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + (arguments + `(#:validate-runpath? #f + ,@(substitute-keyword-arguments (package-arguments gcc-mesboot1) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (glibc (assoc-ref %build-inputs "libc"))) + (list (string-append "--prefix=" out) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + "--with-host-libstdcxx=-lsupc++" + + (string-append "--with-native-system-header-dir=" glibc "/include") + (string-append "--with-build-sysroot=" glibc "/include") + + "--disable-bootstrap" + "--disable-decimal-float" + "--disable-libatomic" + "--disable-libcilkrts" + "--disable-libgomp" + "--disable-libitm" + "--disable-libmudflap" + "--disable-libquadmath" + "--disable-libsanitizer" + "--disable-libssp" + "--disable-libvtv" + "--disable-lto" + "--disable-lto-plugin" + "--disable-multilib" + "--disable-plugin" + "--disable-threads" + "--enable-languages=c,c++" + + "--enable-static" + "--enable-shared" + "--enable-threads=single" + + ;; No pre-compiled libstdc++ headers, to save space. + "--disable-libstdcxx-pch" + + ;; for libcpp ... + "--disable-build-with-cxx"))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "CPLUS_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t))))))))))) + +(define gcc-mesboot-wrapper + ;; We need this so gcc-mesboot can be used to create shared binaries that + ;; have the correct interpreter and runpath to libc. + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1-wrapper) + (name "gcc-mesboot-wrapper") + (source #f) + (inputs '()) + (native-inputs `(("bash" ,%bootstrap-coreutils&co) + ("libc" ,glibc-mesboot) + ("gcc" ,gcc-mesboot)))))) + +(define m4-mesboot + (package-with-bootstrap-guile + (package + (inherit m4) + (name "m4-mesboot") + (version "1.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/m4/m4-" + version ".tar.gz")) + (sha256 + (base32 + "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw")))) + (supported-systems '("i686-linux")) + (native-inputs `(("mes" ,mes-boot) + ("tcc" ,tcc-boot))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (string-append + (assoc-ref %build-inputs "bash") + "/bin/sh")) + (setenv "CC" "tcc -static") + (setenv "CPP" "tcc -E") + (invoke "./configure" (string-append "--prefix=" out))))))))))) + (define (%bootstrap-inputs+toolchain) + ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed + ;; the actual reduced set with bootstrapped toolchain. (%bootstrap-inputs)) (define gnu-make-boot0 diff --git a/gnu/packages/patches/binutils-boot-2.20.1a.patch b/gnu/packages/patches/binutils-boot-2.20.1a.patch new file mode 100644 index 0000000000..7e5762ceb4 --- /dev/null +++ b/gnu/packages/patches/binutils-boot-2.20.1a.patch @@ -0,0 +1,157 @@ +This patch enables building binutils using TCC and Mes C Library + + * disable building DOC + * remove signed int trickery that does not work with TCC + * fixe the malloc prototype to use size_t + * add missing includes + * remove C99'isms to avoid of mixing code and variable declaration + * [MES_BOOTSTRAP]: remove strncmp to avoid duplicat symbol + +Upstream status: Not presented upstream. + +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/elf32-i386.c binutils-2.20.1a/bfd/elf32-i386.c +--- ../binutils-2.20.1a/bfd/elf32-i386.c 2009-09-10 13:47:12.000000000 +0200 ++++ binutils-2.20.1a/bfd/elf32-i386.c 2018-06-23 19:33:20.068134411 +0200 +@@ -4254,6 +4254,7 @@ elf_i386_finish_dynamic_symbol (bfd *out + if (!h->pointer_equality_needed) + abort (); + ++ { + /* For non-shared object, we can't use .got.plt, which + contains the real function addres if we need pointer + equality. We load the GOT entry with the PLT entry. */ +@@ -4262,6 +4263,7 @@ elf_i386_finish_dynamic_symbol (bfd *out + (plt->output_section->vma + + plt->output_offset + h->plt.offset), + htab->elf.sgot->contents + h->got.offset); ++ } + return TRUE; + } + } +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/elfcode.h binutils-2.20.1a/bfd/elfcode.h +--- ../binutils-2.20.1a/bfd/elfcode.h 2009-09-10 13:47:12.000000000 +0200 ++++ binutils-2.20.1a/bfd/elfcode.h 2018-06-19 19:07:16.647627075 +0200 +@@ -73,6 +73,7 @@ + #include "bfdlink.h" + #include "libbfd.h" + #include "elf-bfd.h" ++#include + + /* Renaming structures, typedefs, macros and functions to be size-specific. */ + #define Elf_External_Ehdr NAME(Elf,External_Ehdr) +@@ -706,8 +707,8 @@ elf_object_p (bfd *abfd) + if (i_ehdrp->e_shnum != 1) + { + /* Check that we don't have a totally silly number of sections. */ +- if (i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (x_shdr) +- || i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (i_shdr)) ++ if (i_ehdrp->e_shnum > INT_MAX / sizeof (x_shdr) ++ || i_ehdrp->e_shnum > INT_MAX / sizeof (i_shdr)) + goto got_wrong_format_error; + + where += (i_ehdrp->e_shnum - 1) * sizeof (x_shdr); +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/Makefile.in binutils-2.20.1a/bfd/Makefile.in +--- ../binutils-2.20.1a/bfd/Makefile.in 2010-03-03 14:59:15.000000000 +0100 ++++ binutils-2.20.1a/bfd/Makefile.in 2018-06-16 14:00:46.297724081 +0200 +@@ -320,7 +320,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../confi + # RELEASE=y + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po ++SUBDIRS = # these fail to build: doc po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/arparse.c binutils-2.20.1a/binutils/arparse.c +--- ../binutils-2.20.1a/binutils/arparse.c 2009-10-16 13:52:16.000000000 +0200 ++++ binutils-2.20.1a/binutils/arparse.c 2018-06-19 01:30:00.576219981 +0200 +@@ -330,7 +330,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/dwarf.c binutils-2.20.1a/binutils/dwarf.c +--- ../binutils-2.20.1a/binutils/dwarf.c 2009-09-14 13:43:26.000000000 +0200 ++++ binutils-2.20.1a/binutils/dwarf.c 2018-06-16 14:01:45.162684662 +0200 +@@ -27,6 +27,10 @@ + #include "dwarf2.h" + #include "dwarf.h" + ++#if MES_BOOTSTRAP ++#include "getopt.h" ++#endif ++ + static int have_frame_base; + static int need_base_address; + +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/sysinfo.c binutils-2.20.1a/binutils/sysinfo.c +--- ../binutils-2.20.1a/binutils/sysinfo.c 2009-10-16 13:52:17.000000000 +0200 ++++ binutils-2.20.1a/binutils/sysinfo.c 2018-06-19 01:29:23.823612807 +0200 +@@ -286,7 +286,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/gas/config/tc-i386.c binutils-2.20.1a/gas/config/tc-i386.c +--- ../binutils-2.20.1a/gas/config/tc-i386.c 2009-09-14 13:43:27.000000000 +0200 ++++ binutils-2.20.1a/gas/config/tc-i386.c 2018-06-23 19:39:37.546254752 +0200 +@@ -4869,6 +4869,7 @@ build_modrm_byte (void) + if (vex_3_sources) + { + unsigned int nds, reg; ++ expressionS *exp; + + if (i.tm.opcode_modifier.veximmext + && i.tm.opcode_modifier.immext) +@@ -4892,7 +4893,7 @@ build_modrm_byte (void) + + /* Generate an 8bit immediate operand to encode the register + operand. */ +- expressionS *exp = &im_expressions[i.imm_operands++]; ++ exp = &im_expressions[i.imm_operands++]; + i.op[i.operands].imms = exp; + i.types[i.operands] = imm8; + i.operands++; +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/ld/ldgram.c binutils-2.20.1a/ld/ldgram.c +--- ../binutils-2.20.1a/ld/ldgram.c 2009-10-16 13:52:15.000000000 +0200 ++++ binutils-2.20.1a/ld/ldgram.c 2018-06-19 01:30:57.809165437 +0200 +@@ -561,7 +561,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/libiberty/strncmp.c binutils-2.20.1a/libiberty/strncmp.c +--- ../binutils-2.20.1a/libiberty/strncmp.c 2005-03-28 04:09:01.000000000 +0200 ++++ binutils-2.20.1a/libiberty/strncmp.c 2018-06-23 19:19:50.038992482 +0200 +@@ -15,6 +15,13 @@ Compares the first @var{n} bytes of two + #include + #include + ++#if !MES_BOOTSTRAP ++ ++/* ++ libtool: link: /gnu/store/rgwjixk5zl7s2d3xsb2ws2z2q3m0xjm4-tcc-boot-0.9.26-0.97196ce/bin/tcc -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1 -g -o size size.o bucomm.o version.o filemode.o ../bfd/.libs/libbfd.a ../libiberty/libiberty.a ./../intl/libintl.a ++ /gnu/store/rgwjixk5zl7s2d3xsb2ws2z2q3m0xjm4-tcc-boot-0.9.26-0.97196ce/lib/libc.a: error: 'strncmp' defined twice ++*/ ++ + int + strncmp(const char *s1, const char *s2, register size_t n) + { +@@ -31,3 +38,5 @@ strncmp(const char *s1, const char *s2, + } + return 0; + } ++ ++#endif // !MES_BOOTSTRAP diff --git a/gnu/packages/patches/gcc-boot-2.95.3.patch b/gnu/packages/patches/gcc-boot-2.95.3.patch new file mode 100644 index 0000000000..fd167ae052 --- /dev/null +++ b/gnu/packages/patches/gcc-boot-2.95.3.patch @@ -0,0 +1,137 @@ +This patch enables building gcc-2.95.3 using TCC and Mes C Library. + + * Disable building DOC + * Avoid running `fixproto'. + * Force running `fixinc'. + * Replace Makefile trickery of creating an libgcc1.a archive, then + extracting the .o files later to create a new libgcc2.a archive. + Instead, keep temporary .o files. + +Upstream status: Not presented upstream. + +diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/Makefile.in gcc-2.95.3/gcc/Makefile.in +--- ../gcc-2.95.3/gcc/Makefile.in 2001-01-25 15:02:58.000000000 +0100 ++++ gcc-2.95.3/gcc/Makefile.in 2018-06-23 11:46:03.525159181 +0200 +@@ -221,7 +221,7 @@ RANLIB_TEST_FOR_TARGET = \ + SYSTEM_HEADER_DIR = /usr/include + + # Control whether to run fixproto. +-STMP_FIXPROTO = stmp-fixproto ++# STMP_FIXPROTO = stmp-fixproto + + # Test to see whether exists in the system header files. + LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] +@@ -958,6 +958,7 @@ libgcc1.cross: + # fragments. + libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1FUNCS_EXTRA) config.status + -rm -f tmplibgcc1.a ++ mkdir -p libgcc1-o + # Actually build it in tmplibgcc1.a, then rename at end, + # so that libgcc1.a itself remains nonexistent if compilation is aborted. + # -e causes any failing command to make this rule fail. +@@ -974,6 +975,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1F + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + mv libgcc1$(objext) $${name}$(objext); \ + $(OLDAR) $(OLDAR_FLAGS) tmplibgcc1.a $${name}$(objext); \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}$(objext); \ + done + # Some shells crash when a loop has no items. +@@ -994,6 +996,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1F + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + $(OLDAR) $(OLDAR_FLAGS) tmplibgcc1.a $${name}$(objext); \ + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}.s $${name}$(objext); \ + else true; \ + fi; \ +@@ -1024,6 +1027,7 @@ libgcc1-asm.a: libgcc2.ready config.stat + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + mv libgcc1$(objext) $${name}$(objext); \ + $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) tmplibgcc1.a $${name}$(objext); \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}$(objext); \ + done + -rm -f libgcc1.S +@@ -1062,6 +1066,7 @@ libgcc2.a: libgcc2.c libgcc2.ready $(CON + # Actually build it in tmplibgcc2.a, then rename at end, + # so that libgcc2.a itself remains nonexistent if compilation is aborted. + -rm -f tmplibgcc2.a ++ mkdir -p libgcc2-o + # -e causes any failing command to make this rule fail. + # -e doesn't work in certain shells, so we test $$? as well. + # lynx has a broken ar, it always complains when the initial library is +@@ -1139,6 +1144,7 @@ libgcc2.a: libgcc2.c libgcc2.ready $(CON + $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) -c $${file}; \ + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) tmplibgcc2.a $${oname}$(objext); \ ++ mv $${oname}$(objext) libgcc2-o;\ + rm -f $${name}.s $${oname}$(objext); \ + fi; \ + done +@@ -1156,7 +1162,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2) + -rm -rf tmplibgcc.a libgcc.a tmpcopy + mkdir tmpcopy + -if [ x$(LIBGCC1) != x ]; \ +- then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ ++ then cp -v libgcc1-o/*.o tmpcopy; \ + else true; \ + fi + # Some versions of ar (specifically the one in RISC/os 5.x), create an +@@ -1164,7 +1170,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2) + # the second ar command tries to overwrite this file. To avoid the error + # message from ar, we make sure all files are writable. + -(cd tmpcopy; chmod +w * > /dev/null 2>&1) +- (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) ++ cp -v libgcc2-o/*.o tmpcopy + (cd tmpcopy; $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) ../tmplibgcc.a *$(objext)) + rm -rf tmpcopy + -if $(RANLIB_TEST_FOR_TARGET) ; then \ +@@ -2093,14 +2099,18 @@ gcov$(exeext): $(GCOV_OBJS) $(LIBDEPS) + # s-* so that mostlyclean does not force the include directory to + # be rebuilt. + ++# STMP_FIXINC = @STMP_FIXINC@ ++STMP_FIXINC = stmp-fixinc ++ + # Build the include directory including float.h (which no longer depends upon + # enquire). +-stmp-int-hdrs: stmp-fixinc $(USER_H) xlimits.h ++stmp-int-hdrs: $(STMP_FIXINC) $(USER_H) xlimits.h + # Copy in the headers provided with gcc. + # The sed command gets just the last file name component; + # this is necessary because VPATH could add a dirname. + # Using basename would be simpler, but some systems don't have it. + # The touch command is here to workaround an AIX/Linux NFS bug. ++ -if [ -d include ] ; then true; else mkdir include; chmod a+rx include; fi + for file in .. $(USER_H); do \ + if [ X$$file != X.. ]; then \ + realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ +@@ -2265,16 +2275,17 @@ stmp-fixproto: fixhdr.ready fixproto stm + # + # Remake the info files. + +-doc: info +-info: cpp.info gcc.info lang.info +- +-cpp.info: $(srcdir)/cpp.texi +- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi +- +-gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \ +- $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \ +- $(srcdir)/tm.texi $(srcdir)/gcov.texi +- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi ++doc: ++# doc: info ++# info: cpp.info gcc.info lang.info ++ ++# cpp.info: $(srcdir)/cpp.texi ++# $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi ++ ++# gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \ ++# $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \ ++# $(srcdir)/tm.texi $(srcdir)/gcov.texi ++# $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi + + dvi: gcc.dvi cpp.dvi lang.dvi + diff --git a/gnu/packages/patches/gcc-boot-4.7.4.patch b/gnu/packages/patches/gcc-boot-4.7.4.patch new file mode 100644 index 0000000000..3e51e31fdf --- /dev/null +++ b/gnu/packages/patches/gcc-boot-4.7.4.patch @@ -0,0 +1,68 @@ +This patch enables building gcc-4.7.4 using gcc-2.95.3 and glibc-2.2.5 + + * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags + * Add missing limits.h include. + * Add SSIZE_MAX define. The SSIZE_MAX define has been added to Mes + upstream and can be removed with the next Mes release. + * Remove -fbuilding-libgcc flag, it assumes features being present from a + newer gcc or glibc. + * [MES_BOOTSTRAP_GCC]: Disable threads harder. + +Upstream status: not presented upstream. + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index f3cc49fdb18..bc5718fc9a6 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -458,7 +458,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ ++# NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c +index 94b7a0b89a7..ab2baab55ca 100644 +--- a/gcc/config/host-linux.c ++++ b/gcc/config/host-linux.c +@@ -23,6 +23,12 @@ + #include "hosthooks.h" + #include "hosthooks-def.h" + ++// ../.././gcc/config/host-linux.c:213: `SSIZE_MAX' undeclared (first ++// use in this function) ++#include ++#ifndef SSIZE_MAX ++# define SSIZE_MAX LONG_MAX ++#endif + + /* Linux has a feature called exec-shield-randomize that perturbs the + address of non-fixed mapped segments by a (relatively) small amount. +diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in +index c301ff03cae..f86318c3bd5 100644 +--- a/libgcc/Makefile.in ++++ b/libgcc/Makefile.in +@@ -225,7 +225,7 @@ endif + LIBGCC2_DEBUG_CFLAGS = -g + LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ + $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ +- -fbuilding-libgcc -fno-stack-protector \ ++ -fno-stack-protector \ + $(INHIBIT_LIBC_CFLAGS) + + # Additional options to use when compiling libgcc2.a. +diff --git a/libgcc/generic-morestack-thread.c b/libgcc/generic-morestack-thread.c +index bbe6dd12b5a..1d1d48223d7 100644 +--- a/libgcc/generic-morestack-thread.c ++++ b/libgcc/generic-morestack-thread.c +@@ -35,7 +35,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + will want to define inhibit_libc while building a compiler which + can build glibc. */ + +-#ifndef inhibit_libc ++#if 0 //!defined (inhibit_libc) && !MES_BOOTSTRAP_GCC + + #include + #include diff --git a/gnu/packages/patches/glibc-boot-2.16.0.patch b/gnu/packages/patches/glibc-boot-2.16.0.patch new file mode 100644 index 0000000000..5cb29bc271 --- /dev/null +++ b/gnu/packages/patches/glibc-boot-2.16.0.patch @@ -0,0 +1,352 @@ +This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library. + + * Makefile: Do not link with (non-existent) libgc_eh. + * Makefile: Add SHELL variable, ready for substitution, export it. + * Makefile: Do not build or assume librpc_compat_pic. + * Makefile: Do not build libmesusage. + * gen-as-const: Always add preamble. + * [BOOTSTRAP_GLIBC]: Really disable rpc. + +Upstream status: Not presented upstream. + +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/elf/Makefile glibc-2.16.0/elf/Makefile +--- /home/janneke/src/glibc-2.16.0/elf/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/elf/Makefile 2018-09-02 12:54:44.616962543 +0200 +@@ -17,6 +17,8 @@ + + # Makefile for elf subdirectory of GNU C Library. + ++SHELL := /bin/sh ++ + subdir := elf + + headers = elf.h bits/elfclass.h link.h bits/link.h +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/include/libc-symbols.h glibc-2.16.0/include/libc-symbols.h +--- /home/janneke/src/glibc-2.16.0/include/libc-symbols.h 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/include/libc-symbols.h 2018-09-02 22:41:00.798467803 +0200 +@@ -558,9 +558,9 @@ for linking") + # define libc_hidden_weak(name) hidden_weak (name) + # ifdef LINK_OBSOLETE_RPC + /* libc_hidden_nolink_sunrpc should only get used in sunrpc code. */ +-# define libc_hidden_nolink_sunrpc(name, version) hidden_def (name) ++# define libc_hidden_nolink_sunrpc(name, version) + # else +-# define libc_hidden_nolink_sunrpc(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink_sunrpc(name, version) + # endif + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makeconfig glibc-2.16.0/Makeconfig +--- /home/janneke/src/glibc-2.16.0/Makeconfig 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makeconfig 2018-09-03 00:00:25.290357414 +0200 +@@ -23,6 +23,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++SHELL := /bin/sh ++export SHELL ++ + all: # Make this the default goal + + ifneq "$(origin +included-Makeconfig)" "file" +@@ -521,9 +524,9 @@ ifneq ($(have-cc-with-libunwind),yes) + else + libunwind = -lunwind + endif +-libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed ++libgcc_eh := #-Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed + gnulib := -lgcc $(libgcc_eh) +-static-gnulib := -lgcc -lgcc_eh $(libunwind) ++static-gnulib := -lgcc $(libunwind) + libc.so-gnulib := -lgcc + endif + +preinit = $(addprefix $(csu-objpfx),crti.o) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile glibc-2.16.0/Makefile +--- /home/janneke/src/glibc-2.16.0/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makefile 2018-09-02 23:01:10.485803965 +0200 +@@ -22,6 +22,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++SHELL := /bin/sh ++export SHELL ++ + include Makeconfig + + +@@ -135,13 +138,10 @@ $(common-objpfx)linkobj/libc.so: $(elfob + $(shlib-lds) + $(build-shlib) + +-$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \ +- $(common-objpfx)sunrpc/librpc_compat_pic.a ++$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a + $(..)./scripts/mkinstalldirs $(common-objpfx)linkobj + (cd $(common-objpfx)linkobj; \ + $(AR) x ../libc_pic.a; \ +- rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \ +- $(AR) x ../sunrpc/librpc_compat_pic.a; \ + $(AR) cr libc_pic.a *.os; \ + rm *.os) + endif +@@ -151,7 +151,7 @@ endif + # the current libc build for testing. + $(common-objpfx)testrun.sh: $(common-objpfx)config.make \ + $(..)Makeconfig $(..)Makefile +- (echo '#!/bin/sh'; \ ++ (echo '#! $(SHELL)'; \ + echo 'builddir=`dirname "$$0"`'; \ + echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \ + echo 'exec $(subst $(common-objdir),"$${builddir}",\ +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile.in glibc-2.16.0/Makefile.in +--- /home/janneke/src/glibc-2.16.0/Makefile.in 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makefile.in 2018-09-02 13:03:01.892962551 +0200 +@@ -9,3 +9,6 @@ all .DEFAULT: + install: + LANGUAGE=C LC_ALL=C; export LANGUAGE LC_ALL; \ + $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ ++ ++export SHELL ++export BASH +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/malloc/Makefile glibc-2.16.0/malloc/Makefile +--- /home/janneke/src/glibc-2.16.0/malloc/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/malloc/Makefile 2018-09-02 17:11:33.461547394 +0200 +@@ -35,7 +35,7 @@ install-lib := libmcheck.a + non-lib.a := libmcheck.a + + # Additional library. +-extra-libs = libmemusage ++extra-libs = #libmemusage + extra-libs-others = $(extra-libs) + + libmemusage-routines = memusage +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/cache.c glibc-2.16.0/nscd/cache.c +--- /home/janneke/src/glibc-2.16.0/nscd/cache.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/cache.c 2018-09-02 23:38:31.757616750 +0200 +@@ -74,7 +74,11 @@ struct datahead * + cache_search (request_type type, const void *key, size_t len, + struct database_dyn *table, uid_t owner) + { ++#if !BOOTSTRAP_GLIBC + unsigned long int hash = __nis_hash (key, len) % table->head->module; ++#else ++ unsigned long int hash = 0; ++#endif + + unsigned long int nsearched = 0; + struct datahead *result = NULL; +@@ -153,7 +153,11 @@ cache_add (int type, const void *key, si + first ? _(" (first)") : ""); + } + ++#if !BOOTSTRAP_GLIBC + unsigned long int hash = __nis_hash (key, len) % table->head->module; ++#else ++ unsigned long int hash = 0; ++#endif + struct hashentry *newp; + + newp = mempool_alloc (table, sizeof (struct hashentry), 0); +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/Makefile glibc-2.16.0/nscd/Makefile +--- /home/janneke/src/glibc-2.16.0/nscd/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/Makefile 2018-09-02 23:49:29.948031787 +0200 +@@ -126,9 +126,7 @@ include $(patsubst %,$(..)cppflags-itera + $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o) + + ifeq ($(build-shared),yes) +-$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \ +- $(common-objpfx)nis/libnsl.so ++$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) + else +-$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \ +- $(common-objpfx)nis/libnsl.a ++$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) + endif +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c glibc-2.16.0/nscd/nscd_helper.c +--- /home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/nscd_helper.c 2018-09-02 23:38:04.941189464 +0200 +@@ -474,7 +474,7 @@ struct datahead * + __nscd_cache_search (request_type type, const char *key, size_t keylen, + const struct mapped_database *mapped, size_t datalen) + { +- unsigned long int hash = __nis_hash (key, keylen) % mapped->head->module; ++ unsigned long int hash = 0; + size_t datasize = mapped->datasize; + + ref_t trail = mapped->head->array[hash]; +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nss/getent.c glibc-2.16.0/nss/getent.c +--- /home/janneke/src/glibc-2.16.0/nss/function.def 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nss/function.def 2018-09-18 13:54:49.582060539 +0200 +@@ -63,10 +63,12 @@ + DEFINE_GET (files, pwnam) + DEFINE_GET (files, pwuid) + ++#if !BOOTSTRAP_GLIBC + /* rpc */ + DEFINE_ENT (files, rpc) + DEFINE_GETBY (files, rpc, name) + DEFINE_GETBY (files, rpc, number) ++#endif + + /* services */ + DEFINE_ENT (files, serv) +diff -u ~/src/glibc-2.16.0/nss/getent.c glibc-2.16.0/nss/getent.c +--- /home/janneke/src/glibc-2.16.0/nss/getent.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nss/getent.c 2018-09-18 13:57:41.856849140 +0200 +@@ -700,6 +700,7 @@ + return result; + } + ++#if !BOOTSTRAP_GLIBC + /* Now is all for rpc */ + static inline void + print_rpc (struct rpcent *rpc) +@@ -745,6 +746,7 @@ + + return result; + } ++#endif //rpc + + /* for services */ + static void +@@ -880,7 +882,9 @@ + D(networks) + D(passwd) + D(protocols) ++#if !BOOTSTRAP_GLIBC + D(rpc) ++#endif + D(services) + D(shadow) + #undef D +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/resolv/netdb.h glibc-2.16.0/resolv/netdb.h +--- /home/janneke/src/glibc-2.16.0/resolv/netdb.h 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/resolv/netdb.h 2018-09-08 08:49:30.537811219 +0200 +@@ -26,11 +26,13 @@ + + #include + #include ++#if 0 //!BOOTSTRAP_GLIBC + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the + Sun version. */ + # include + #endif ++#endif + + #ifdef __USE_GNU + # define __need_sigevent_t +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Rules glibc-2.16.0/Rules +--- /home/janneke/src/glibc-2.16.0/Rules 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Rules 2018-09-02 10:52:06.927362861 +0200 +@@ -24,6 +24,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++export SHELL ++export BASH ++ + all: # Don't let the default goal come from Makeconfig. + + include $(firstword $(..) ../)Makeconfig +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk glibc-2.16.0/scripts/gen-as-const.awk +--- /home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/scripts/gen-as-const.awk 2018-09-01 18:08:37.266516330 +0200 +@@ -14,6 +14,12 @@ BEGIN { started = 0 } + + NF >= 1 && !started { + if (test) { ++ print "\n#include "; ++ print "\n#include "; ++# print "\ntypedef unsigned long size_t;"; ++ print "\n#ifndef offsetof"; ++ print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)"; ++ print "\n#endif"; + print "\n#include "; + print "\n#include "; + print "\n#include "; +@@ -33,8 +39,15 @@ NF >= 1 && !started { + " source, #name, U (asconst_##name), #expr, (c_t) (expr));" \ + " } else ++good;\n"; + } +- else ++ else { ++ print "\n#include "; ++ print "\n#include "; ++# print "\ntypedef unsigned long size_t;"; ++ print "\n#ifndef offsetof"; ++ print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)"; ++ print "\n#endif"; + print "void dummy(void) {"; ++ } + started = 1; + } + +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c glibc-2.16.0/sunrpc/auth_none.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/auth_none.c 2018-09-02 22:09:21.629007932 +0200 +@@ -95,7 +95,9 @@ authnone_create (void) + __libc_once (authnone_private_guard, authnone_create_once); + return &authnone_private.no_client; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (authnone_create, GLIBC_2_0) ++#endif + + static bool_t + authnone_marshal (AUTH *client, XDR *xdrs) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c glibc-2.16.0/sunrpc/authuxprot.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/authuxprot.c 2018-09-02 22:15:51.927158451 +0200 +@@ -63,4 +63,6 @@ xdr_authunix_parms (XDR * xdrs, struct a + } + return FALSE; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0) ++#endif +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c glibc-2.16.0/sunrpc/bindrsvprt.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/bindrsvprt.c 2018-09-02 22:24:32.687187675 +0200 +@@ -96,4 +96,7 @@ bindresvport (int sd, struct sockaddr_in + + return res; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_def (bindresvport) ++#endif ++ +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c glibc-2.16.0/sunrpc/clnt_raw.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/clnt_raw.c 2018-09-02 22:33:21.151343826 +0200 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #define MCALL_MSG_SIZE 24 + +@@ -129,7 +130,9 @@ clntraw_create (u_long prog, u_long vers + client->cl_auth = authnone_create (); + return client; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0) ++#endif + + static enum clnt_stat + clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c glibc-2.16.0/sunrpc/clnt_simp.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/clnt_simp.c 2018-09-02 22:34:14.884175251 +0200 +@@ -139,7 +139,9 @@ callrpc (const char *host, u_long prognu + crp->valid = 0; + return (int) clnt_stat; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (callrpc, GLIBC_2_0) ++#endif + + #ifdef _RPC_THREAD_SAFE_ + void diff --git a/gnu/packages/patches/glibc-boot-2.2.5.patch b/gnu/packages/patches/glibc-boot-2.2.5.patch new file mode 100644 index 0000000000..26bc92a6bb --- /dev/null +++ b/gnu/packages/patches/glibc-boot-2.2.5.patch @@ -0,0 +1,251 @@ +This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library. + + * Makefile: Do not assemble from stdin, use file indirection. + * Makefile: Add new target: install-lib-all. + * Makefile: Avoid building stub DOC. + * [_LIBC_REENTRANT]: Add missing guarding. + * [MES_BOOTSTRAP]: Disable some GCC extensions. + * [MES_BOOTSTRAP]: Add missing GCC div/mod defines. + +Upstream status: Not presented upstream. + +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/config.h.in glibc-2.2.5/config.h.in +--- ../glibc-2.2.5/config.h.in 2001-11-16 02:02:56.000000000 +0100 ++++ glibc-2.2.5/config.h.in 2018-06-17 21:30:02.313029074 +0200 +@@ -1,3 +1,10 @@ ++#if MES_BOOTSTRAP && BOOTSTRAP_GLIBC ++#undef __umoddi3 ++#define __umoddi3(a,b) ((a)%(b)) ++#undef __udivdi3 ++#define __udivdi3(a,b) ((a)/(b)) ++#endif ++ + #if !defined ASSEMBLER && !defined _ISOMAC && !defined __OPTIMIZE__ + # error "glibc cannot be compiled without optimization" + #endif +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/configure glibc-2.2.5/configure +--- ../glibc-2.2.5/configure 2002-01-08 23:16:44.000000000 +0100 ++++ glibc-2.2.5/configure 2018-06-07 20:47:26.608895319 +0200 +@@ -1530,7 +1530,7 @@ echo "configure:1530: checking version o + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Makeconfig glibc-2.2.5/Makeconfig +--- ../glibc-2.2.5/Makeconfig 2001-09-12 20:49:45.000000000 +0200 ++++ glibc-2.2.5/Makeconfig 2018-06-20 16:33:35.472167202 +0200 +@@ -400,7 +400,7 @@ ifndef +link + $(start-installed-name))\ + $(+preinit) $(link-extra-libs) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit) ++ $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit) -lc -lgcc2 + endif + # Command for statically linking programs with the C library. + ifndef +link-static +@@ -412,7 +412,7 @@ ifndef +link-static + $(start-installed-name))\ + $(+preinit) $(link-extra-libs-static) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) ++ $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) -lc -lgcc2 + endif + # Command for statically linking bounded-pointer programs with the C library. + ifndef +link-bounded +@@ -424,7 +424,7 @@ ifndef +link-bounded + $(start-installed-name))\ + $(+preinit) $(link-extra-libs-bounded) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit) ++ $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit) -lc -lgcc2 + endif + ifndef config-LDFLAGS + ifeq (yesyes,$(build-shared)$(elf)) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Makerules glibc-2.2.5/Makerules +--- ../glibc-2.2.5/Makerules 2001-11-16 02:02:19.000000000 +0100 ++++ glibc-2.2.5/Makerules 2018-06-10 15:03:42.390329860 +0200 +@@ -748,6 +748,18 @@ endef + installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ + $(inst_libdir)/$(patsubst %,$(libtype$o),\ + $(libprefix)$(libc-name))) ++ ++ifeq (yes,$(build-shared)) ++install-lib-all: $(inst_libdir)/libc.a \ ++ $(inst_slibdir)/libc.so$(libc.so-version) \ ++ $(inst_slibdir)/libc-$(version).so \ ++ $(inst_libdir)/libc.so \ ++ install-lib ++else ++install-lib-all: $(inst_libdir)/libc.a \ ++ install-lib ++endif ++ + install: $(installed-libcs) + $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) + $(make-target-directory) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/misc/syslog.c glibc-2.2.5/misc/syslog.c +--- ../glibc-2.2.5/misc/syslog.c 2001-08-31 01:13:49.000000000 +0200 ++++ glibc-2.2.5/misc/syslog.c 2018-06-09 09:01:20.008918690 +0200 +@@ -216,9 +216,11 @@ vsyslog(pri, fmt, ap) + + /* Prepare for multiple users. We have to take care: open and + write are cancellation points. */ ++#if _LIBC_REENTRANT + __libc_cleanup_region_start (1, (void (*) (void *)) cancel_handler, + &oldaction_ptr); + __libc_lock_lock (syslog_lock); ++#endif + + /* Prepare for a broken connection. */ + memset (&action, 0, sizeof (action)); +@@ -268,9 +270,11 @@ vsyslog(pri, fmt, ap) + if (sigpipe == 0) + __sigaction (SIGPIPE, &oldaction, (struct sigaction *) NULL); + ++#if _LIBC_REENTRANT + /* End of critical section. */ + __libc_cleanup_region_end (0); + __libc_lock_unlock (syslog_lock); ++#endif + + free (buf); + } +@@ -326,16 +330,20 @@ openlog_internal(const char *ident, int + void + openlog (const char *ident, int logstat, int logfac) + { ++#if _LIBC_REENTRANT + /* Protect against multiple users. */ + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, + &syslog_lock); + __libc_lock_lock (syslog_lock); ++#endif + + openlog_internal (ident, logstat, logfac); + ++#if _LIBC_REENTRANT + /* Free the lock. */ + __libc_cleanup_region_end (1); ++#endif + } + + static void +@@ -358,18 +366,22 @@ closelog_internal() + void + closelog () + { ++#if _LIBC_REENTRANT + /* Protect against multiple users. */ + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, + &syslog_lock); + __libc_lock_lock (syslog_lock); ++#endif + + closelog_internal (); + LogTag = NULL; + LogType = SOCK_DGRAM; /* this is the default */ + ++#if _LIBC_REENTRANT + /* Free the lock. */ + __libc_cleanup_region_end (1); ++#endif + } + + #ifdef _LIBC_REENTRANT +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Rules glibc-2.2.5/Rules +--- ../glibc-2.2.5/Rules 2001-08-30 00:44:35.000000000 +0200 ++++ glibc-2.2.5/Rules 2018-06-09 08:15:54.880683675 +0200 +@@ -218,7 +218,7 @@ endif + fopen_max=`sed -n 's/^#define OPEN_MAX //1p' $(@:st=hT)`; \ + filename_max=`sed -n 's/^#define PATH_MAX //1p' $(@:st=hT)`; \ + iov_max=`sed -n 's/^#define UIO_MAXIOV //p' $(@:st=hT)`; \ +- fopen_max=$${fopen_max:-16}; \ ++ fopen_max=$${fu_fopen_max:-16}; \ + filename_max=$${filename_max:-1024}; \ + if [ -z $$iov_max ]; then \ + define_iov_max="# undef IOV_MAX"; \ +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/stdio-common/perror.c glibc-2.2.5/stdio-common/perror.c +--- ../glibc-2.2.5/stdio-common/perror.c 2001-09-01 07:33:01.000000000 +0200 ++++ glibc-2.2.5/stdio-common/perror.c 2018-06-09 10:42:25.909899529 +0200 +@@ -48,6 +48,9 @@ perror_internal (FILE *fp, const char *s + } + + ++#if MES_BOOTSTRAP ++#define fileno_unlocked(x) 1 ++#endif + /* Print a line on stderr consisting of the text in S, a colon, a space, + a message describing the meaning of the contents of `errno' and a newline. + If S is NULL or "", the colon and space are omitted. */ +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c +--- ../glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c 2001-07-06 06:55:53.000000000 +0200 ++++ glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c 2018-06-09 09:45:13.363031424 +0200 +@@ -25,8 +25,10 @@ fetestexcept (int excepts) + { + int temp; + ++#if !MES_BOOTSTRAP + /* Get current exceptions. */ + __asm__ ("fnstsw %0" : "=a" (temp)); ++#endif + + return temp & excepts & FE_ALL_EXCEPT; + } +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/unix/make-syscalls.sh glibc-2.2.5/sysdeps/unix/make-syscalls.sh +--- ../glibc-2.2.5/sysdeps/unix/make-syscalls.sh 2001-09-13 00:19:30.000000000 +0200 ++++ glibc-2.2.5/sysdeps/unix/make-syscalls.sh 2018-06-20 15:16:01.813004453 +0200 +@@ -173,7 +173,7 @@ shared-only-routines += $file + done + + # And finally, pipe this all into the compiler. +- echo ' ) | $(COMPILE.S) -x assembler-with-cpp -o $@ -' ++ echo ' ) > stdin.c; $(COMPILE.S) -x assembler-with-cpp -o $@ stdin.c' + + case $weak in + *@*) +@@ -284,7 +284,7 @@ shared-only-routines += $file + echo "\ + echo ''; \\ + echo '#include '; \\ +- ) | \$(COMPILE.c) -x c -o \$@ -" ++ ) > stdin.c; \$(COMPILE.c) -x c -o \$@ stdin.c" + ### Use this for debugging intermediate output: + ### ) >\$(@:.ob=.c) + ### \$(subst -c,-E,\$(COMPILE.c)) -o \$(@:.ob=.ib) \$(@:.ob=.c) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h +--- ../glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h 2001-07-06 06:56:21.000000000 +0200 ++++ glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h 2018-06-09 20:09:07.713806647 +0200 +@@ -54,10 +54,12 @@ struct timex + long int errcnt; /* calibration errors (ro) */ + long int stbcnt; /* stability limit exceeded (ro) */ + ++#if !MES_BOOTSTRAP + /* ??? */ + int :32; int :32; int :32; int :32; + int :32; int :32; int :32; int :32; + int :32; int :32; int :32; int :32; ++#endif + }; + + /* Mode codes (timex.mode) */ +--- ../glibc-2.2.5/manual/Makefile 2001-08-28 10:05:40.000000000 +0200 ++++ glibc-2.2.5/manual/Makefile 2018-06-09 10:13:03.093633660 +0200 +@@ -247,7 +247,11 @@ + .PHONY: stubs + stubs: $(objpfx)stubs + endif +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: ++po/manual.pot $(objpfx)stubs: ++ $(make-target-directory) ++ touch $@ ++ ++$(objpfx)stamp%: + $(make-target-directory) + touch $@ + diff --git a/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch new file mode 100644 index 0000000000..936d592f1a --- /dev/null +++ b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch @@ -0,0 +1,30 @@ +We want to allow builds in chroots that lack /bin/sh. Thus, system(3) +and popen(3) need to be tweaked to use the right shell. For the bootstrap +glibc, we just use whatever `sh' can be found in $PATH. The final glibc +instead uses the hard-coded absolute file name of `bash'. + +--- a/sysdeps/posix/system.c ++++ b/sysdeps/posix/system.c +@@ -134,7 +134,7 @@ do_system (const char *line) + INIT_LOCK (); + + /* Exec the shell. */ +- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); ++ (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ); + _exit (127); + } + else if (pid < (pid_t) 0) + +--- a/libio/iopopen.c ++++ b/libio/iopopen.c +@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode) + _IO_close (fd); + } + +- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0); ++ execlp ("sh", "sh", "-c", command, (char *) 0); + _IO__exit (127); + } + _IO_close (child_end); + + diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch index 58dfc5a46b..30ee4645c2 100644 --- a/gnu/packages/patches/mes-nyacc-0.86.0.patch +++ b/gnu/packages/patches/mes-nyacc-0.86.0.patch @@ -1,3 +1,6 @@ +Two small patches off the current Mes `wip' branch, that enable using +Nyacc-0.86.0; and a fix for running ./check.sh. + From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 5 Sep 2018 20:28:06 +0200 @@ -195,3 +198,28 @@ index 9e341cba..c2efb32c 100644 -- 2.18.0 +From 20deefe6ea0d62a3338a8e2a9552d2a20b0f607e Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sun, 9 Sep 2018 07:11:50 +0200 +Subject: [PATCH] build: Oops, fix ./check.sh for bootstrap build. + +* build-aux/config.sh (top_builddir): Set default to `.'. +--- + build-aux/config.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build-aux/config.sh b/build-aux/config.sh +index a4b9fdef..4fa84441 100644 +--- a/build-aux/config.sh ++++ b/build-aux/config.sh +@@ -17,6 +17,7 @@ + # along with GNU Mes. If not, see . + + srcdir=${srcdir-.} ++top_builddir=${top_builddir-.} + if [ "$V" = 2 ]; then + echo $0 + echo srcdest=${srcdest} +-- +2.18.0 + diff --git a/gnu/packages/patches/tcc-boot-0.9.27.patch b/gnu/packages/patches/tcc-boot-0.9.27.patch new file mode 100644 index 0000000000..6f9d365788 --- /dev/null +++ b/gnu/packages/patches/tcc-boot-0.9.27.patch @@ -0,0 +1,26 @@ +From 1431ba3a99582e4c3d2693ac37e57f361858affd Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Mon, 11 Jun 2018 18:39:44 +0200 +Subject: [PATCH] bootstrappable: Force static link. + +--- + libtcc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libtcc.c b/libtcc.c +index 3448f44..02ab850 100644 +--- a/libtcc.c ++++ b/libtcc.c +@@ -735,6 +735,9 @@ LIBTCCAPI TCCState *tcc_new(void) + tcc_state = s; + ++nb_states; + ++#if BOOTSTRAP ++ s->static_link = 1; ++#endif + s->alacarte_link = 1; + s->nocommon = 1; + s->warn_implicit_function_declaration = 1; +-- +2.16.2 + -- cgit v1.2.3 From 56f45b7c785dd576d023c45c5603ab907da912fe Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 23:18:40 +0200 Subject: bootstrap: bison-boot0: Do not use `ranlib -D'. * gnu/packages/commencement.scm (bison-boot0): Do not use `ranlib -D' for i686-linux bootstrap. --- gnu/packages/commencement.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ea4d2de725..f107beff6f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1862,13 +1862,16 @@ exec " gcc "/bin/" program (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... (arguments - '(#:tests? #f ;... and thus disable tests + `(#:tests? #f ;... and thus disable tests ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) - #:make-flags '("ARFLAGS=crD" - "RANLIB=ranlib -D" + #:make-flags `("ARFLAGS=crD" + ,,(match (%current-system) + ;; ranlib: '-D': No such file + ("i686-linux" "RANLIB=ranlib") + (_ "RANLIB=ranlib -D")) "V=1")))))) (package (inherit (package-with-bootstrap-guile -- cgit v1.2.3 From cffe966dd5d3b412d31a4b1c7bf9f81a2697dd7b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 23:04:57 +0200 Subject: bootstrap: perl-boot0: Disable validate-runpath?. * gnu/packages/commencement.scm (perl-boot0): Add disable validate-runpath? to args, and actually pass args. --- gnu/packages/commencement.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f107beff6f..349dc32adf 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1820,23 +1820,25 @@ exec " gcc "/bin/" program (name "perl-boot0") (arguments ;; At the very least, this must not depend on GCC & co. - (let ((args `(#:disallowed-references + (let ((args `(#:validate-runpath? #f + #:disallowed-references ,(list %bootstrap-binutils)))) - (substitute-keyword-arguments (package-arguments perl) - ((#:phases phases) - `(modify-phases ,phases - ;; Pthread support is missing in the bootstrap compiler - ;; (broken spec file), so disable it. - (add-before 'configure 'disable-pthreads - (lambda _ - (substitute* "Configure" - (("^libswanted=(.*)pthread" _ before) - (string-append "libswanted=" before))) - #t)))) - ;; Do not configure with '-Dusethreads' since pthread - ;; support is missing. - ((#:configure-flags configure-flags) - `(delete "-Dusethreads" ,configure-flags)))))))) + `(,@args + ,@(substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + `(modify-phases ,phases + ;; Pthread support is missing in the bootstrap compiler + ;; (broken spec file), so disable it. + (add-before 'configure 'disable-pthreads + (lambda _ + (substitute* "Configure" + (("^libswanted=(.*)pthread" _ before) + (string-append "libswanted=" before))) + #t)))) + ;; Do not configure with '-Dusethreads' since pthread + ;; support is missing. + ((#:configure-flags configure-flags) + `(delete "-Dusethreads" ,configure-flags))))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl %boot0-inputs -- cgit v1.2.3 From d536c39e5490ab2a8d41e594f33483ee2946e610 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 14:53:48 +0200 Subject: bootstrap: Replace GNU toolchain seeds with Mes for i686-linux. * gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux]: Replace %bootstrap-gcc, %bootstrap-binutils, %bootstrap-glibc with %mescc-tools-seed, %mes-seed, %srfi-43 and %tinycc-seed. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[i686-linux]: Replace gcc-tarball, binutils-tarball, glibc-tarball with %mescc-tools-seed, %mes-seed, %srfi-43 and %tinycc-seed. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain)[i686-linux]: Add glibc-mesboot, binutils-mesboot, gcc-wrapper, gcc-mesboot. (file-boot0)[i686-linux]: Disable strip-binaries?, validate-runpath?. (libstdc++-boot0)[i686-linux]: Add libtool install workarourd: copy libstdc++.so.0.0.20 from gcc-mesboot. (gcc-boot0)[i686-linux]: Add libtool install workaround: touch libcc1.so.0.0.0, libcc1plugin.so.0.0.0. (perl-boot0): Disable validate-runpath?. (bison-boot0)[i686-linux]: Do not use ranlib -D. --- gnu/packages/bootstrap.scm | 13 ++++++++++--- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++++++++-- gnu/packages/make-bootstrap.scm | 11 ++++++++--- 3 files changed, 52 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 19995e629f..83dd2f860f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -655,9 +655,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. - `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("binutils" ,%bootstrap-binutils) + `(,@(match (%current-system) + ("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) + ("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-seed" ,%mes-seed) + ("srfi-43" ,%srfi-43 ) + ("tinycc-seed" ,%tinycc-seed))) + + (_ `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils)))) ("coreutils&co" ,%bootstrap-coreutils&co) ;; In gnu-build-system.scm, we rely on the availability of Bash. diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 349dc32adf..446129c4be 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1571,7 +1571,13 @@ exec " gcc "/bin/" program (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. - (%bootstrap-inputs)) + (append (match (%current-system) + ("i686-linux" `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot))) + (_ '())) + (%bootstrap-inputs))) (define gnu-make-boot0 (package-with-bootstrap-guile @@ -1716,7 +1722,23 @@ exec " gcc "/bin/" program ;; XXX: libstdc++.so NEEDs ld.so for some reason. #:validate-runpath? #f - ,@(package-arguments lib))) + ,@(match (%current-system) + ("i686-linux" + (substitute-keyword-arguments (package-arguments lib) + ((#:phases phases) + `(modify-phases ,phases + ;; FIXME: why doesn't this package build libstdc++.so.6.0.20, + ;; when gcc-mesboot builds it fine? + ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libstdc++.so.6.0.20 /gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20 + ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory + (add-after 'build 'copy-libstdc++- + (lambda* (#:key outputs #:allow-other-keys) + (let ((gcc (assoc-ref %build-inputs "gcc")) + (out (assoc-ref outputs "out"))) + (copy-file (string-append gcc "/lib/libstdc++.so.6.0.20") + (string-append "src/.libs/libstdc++.so.6.0.20")) + #t))))))) + (_ (package-arguments lib))))) (inputs (%boot0-inputs)) (native-inputs '())))) @@ -1786,6 +1808,16 @@ exec " gcc "/bin/" program ,(package-name lib))) (list gmp-6.0 mpfr mpc)) #t))) + ,(match (%current-system) + ("i686-linux" + '(add-after 'build 'libtool-workaround + (lambda _ + ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 + ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory + (system* "touch" + "libcc1/.libs/libcc1.so.0.0.0" + "libcc1/.libs/libcc1plugin.so.0.0.0")))) + (_ 'identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 6523f36d8d..3553737f1e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -728,9 +728,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ("gcc-tarball" ,%gcc-bootstrap-tarball) - ("binutils-tarball" ,%binutils-bootstrap-tarball) - ("glibc-tarball" ,(%glibc-bootstrap-tarball)) + ,@(match (%current-system) + ("i686-linux" `(("mescc-tools-seed" ,(@ (gnu packages bootstrap) %mescc-tools-seed)) + ("mes-seed" ,(@ (gnu packages bootstrap) %mes-seed)) + ("srfi-43" ,(@ (gnu packages bootstrap) %srfi-43)) + ("tinycc-seed" ,(@ (gnu packages bootstrap) %tinycc-seed)))) + (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) + ("binutils-tarball" ,%binutils-bootstrap-tarball) + ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) ("coreutils&co-tarball" ,%bootstrap-binaries-tarball))) (synopsis "Tarballs containing all the bootstrap binaries") (description synopsis) -- cgit v1.2.3 From eb4434598cbf8d04a3e5b1995be50fe3b44f0507 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Sep 2018 17:23:09 +0200 Subject: bootstrap: Reduced Binary Seed bootstrap for x86_64 too. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Replace %bootstrap-libc, %bootstrap-gcc, and %bootstrap-binutils with Mes seeds for x86_64 too. * gnu/packages/commencement.scm (tcc-boot0, tcc-boot, gcc-mesboot1, gcc-mesboot1-wrapper, m4-mesboot, %bootstrap-inputs+toolchain, libstdc++-boot0, gcc-boot0, bison-boot0): For x86_64-linux, use i686-linux glibc-dynamic-linker and Mes bootstrap settings. (gcc-boot0-intermediate-wrapped): New variable, extract from static-bash-for-glibc. (static-bash-for-glibc): Use it. (gcc-final): Copy gmp&co phase from gcc-boot0, inherit other arguments from gcc; avoid i686-linux impersonation from gcc-boot0. * doc/guix.texi (Bootstrapping, Reduced Binary Seed Bootstrap): Note x86_64-linux also as Reduced Binary Seed bootstrap. --- doc/guix.texi | 12 ++--- gnu/packages/bootstrap.scm | 19 +++---- gnu/packages/commencement.scm | 112 ++++++++++++++++++++++++++++-------------- 3 files changed, 91 insertions(+), 52 deletions(-) (limited to 'gnu/packages') diff --git a/doc/guix.texi b/doc/guix.texi index 55c1ac3102..a213a0324c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23554,8 +23554,8 @@ Binutils, libc, and the other packages mentioned above---the These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later). -For @code{i686-linux} the Guix bootstrap process is more elaborate, -@pxref{Reduced Binary Seed Bootstrap}. +For @code{i686-linux} and @code{x86_64-linux} the Guix bootstrap process is +more elaborate, @pxref{Reduced Binary Seed Bootstrap}. @unnumberedsubsec Preparing to Use the Bootstrap Binaries @@ -23725,10 +23725,10 @@ problem: the current combined size of these bootstrap binaries is about 250MB (@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or even inspecting these is next to impossible. -For @code{i686-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap -@footnote{We would like to say: ``Full Source Bootstrap'' and while we are -working towards that goal it would be hyperbole to use that term for what we -do now.}. +For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced +Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source +Bootstrap'' and while we are working towards that goal it would be hyperbole +to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 83dd2f860f..c52b4302e1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -656,15 +656,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. `(,@(match (%current-system) - ("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-seed" ,%mes-seed) - ("srfi-43" ,%srfi-43 ) - ("tinycc-seed" ,%tinycc-seed))) - - (_ `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("binutils" ,%bootstrap-binutils)))) + ((or "i686-linux" "x86_64-linux") + `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) + ("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-seed" ,%mes-seed) + ("srfi-43" ,%srfi-43 ) + ("tinycc-seed" ,%tinycc-seed))) + (_ + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils)))) ("coreutils&co" ,%bootstrap-coreutils&co) ;; In gnu-build-system.scm, we rely on the availability of Bash. diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 446129c4be..4c7a381349 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -383,7 +383,8 @@ (mescc-tools (assoc-ref %build-inputs "mescc-tools")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) (setenv "PATH" (string-append coreutils "/bin" @@ -488,7 +489,8 @@ (tcc (assoc-ref %build-inputs "tcc")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) ;; unpack (setenv "PATH" (string-append @@ -510,7 +512,8 @@ (tcc (assoc-ref %build-inputs "tcc")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) (invoke "tcc" "-vvv" @@ -1140,7 +1143,7 @@ ac_cv_c_float_format='IEEE (little-endian)' "-B" libc "/lib " "-Wl,-dynamic-linker " "-Wl," libc - ,(glibc-dynamic-linker)))) + ,(glibc-dynamic-linker "i686-linux")))) (list (string-append "LDFLAGS=" ldflags) (string-append "LDFLAGS_FOR_TARGET=" ldflags)))) ((#:phases phases) @@ -1267,7 +1270,8 @@ ac_cv_c_float_format='IEEE (little-endian)' (display (string-append "#! " bash "/bin/bash exec " gcc "/bin/" program " -Wl,--dynamic-linker" -" -Wl," libc ,(glibc-dynamic-linker) +;; also for x86_64-linux, we are still on i686-linux +" -Wl," libc ,(glibc-dynamic-linker "i686-linux") " -Wl,--rpath" " -Wl," libc "/lib" " \"$@\" @@ -1552,7 +1556,7 @@ exec " gcc "/bin/" program (sha256 (base32 "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw")))) - (supported-systems '("i686-linux")) + (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs `(("mes" ,mes-boot) ("tcc" ,tcc-boot))) (arguments @@ -1572,11 +1576,13 @@ exec " gcc "/bin/" program ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. (append (match (%current-system) - ("i686-linux" `(("libc" ,glibc-mesboot) - ("binutils" ,binutils-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gcc" ,gcc-mesboot))) - (_ '())) + ((or "i686-linux" "x86_64-linux") + `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot))) + (_ + '())) (%bootstrap-inputs))) (define gnu-make-boot0 @@ -1723,7 +1729,7 @@ exec " gcc "/bin/" program #:validate-runpath? #f ,@(match (%current-system) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") (substitute-keyword-arguments (package-arguments lib) ((#:phases phases) `(modify-phases ,phases @@ -1784,6 +1790,17 @@ exec " gcc "/bin/" program (remove (cut string-match "--(with-system-zlib|enable-languages.*)" <>) ,flags))) + ((#:make-flags flags) + `(let* ((libc (assoc-ref %build-inputs "libc")) + (libc-native (or (assoc-ref %build-inputs "libc-native") + libc))) + `(,(string-append "LDFLAGS=" + "-Wl,-rpath=" libc-native "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc-native ,(glibc-dynamic-linker + (match (%current-system) + ("x86_64-linux" "i686-linux") + (_ (%current-system)))))))) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'unpack-gmp&co @@ -1809,7 +1826,7 @@ exec " gcc "/bin/" program (list gmp-6.0 mpfr mpc)) #t))) ,(match (%current-system) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") '(add-after 'build 'libtool-workaround (lambda _ ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 @@ -1817,7 +1834,7 @@ exec " gcc "/bin/" program (system* "touch" "libcc1/.libs/libcc1.so.0.0.0" "libcc1/.libs/libcc1plugin.so.0.0.0")))) - (_ 'identity)) + (_ identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) @@ -1903,9 +1920,11 @@ exec " gcc "/bin/" program ;; do that (default is "cru".) #:make-flags `("ARFLAGS=crD" ,,(match (%current-system) - ;; ranlib: '-D': No such file - ("i686-linux" "RANLIB=ranlib") - (_ "RANLIB=ranlib -D")) + ;; ranlib: '-D': No such file + ((or "i686-linux" "x86_64-linux") + "RANLIB=ranlib") + (_ + "RANLIB=ranlib -D")) "V=1")))))) (package (inherit (package-with-bootstrap-guile @@ -2156,6 +2175,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("bash" ,bash))) (inputs '()))) +(define (gcc-boot0-intermediate-wrapped) + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash")))) + (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. (let ((bash (package @@ -2177,14 +2203,11 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (package-with-explicit-inputs bash (lambda _ - (let ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash"))))) - `(("gcc" ,gcc) - ("libc" ,glibc-final-with-bootstrap-bash) - ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete (%boot1-inputs) - '("gcc" "libc"))))) + `(("gcc" ,(gcc-boot0-intermediate-wrapped)) + ("libc" ,glibc-final-with-bootstrap-bash) + ("libc:static" ,glibc-final-with-bootstrap-bash "static") + ,@(fold alist-delete (%boot1-inputs) + '("gcc" "libc")))) (current-source-location) #:guile %bootstrap-guile)))) @@ -2344,17 +2367,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; positive, so turn it off. #:validate-runpath? #f - ;; Build again GMP & co. within GCC's build process, because it's hard - ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus - ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) - ,@(substitute-keyword-arguments (package-arguments gcc-boot0) - ((#:configure-flags boot-flags) - (let loop ((args (package-arguments gcc))) - (match args - ((#:configure-flags normal-flags _ ...) - normal-flags) - ((_ rest ...) - (loop rest))))) + ,@(substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. `(let ((zlib (assoc-ref %build-inputs "zlib"))) @@ -2366,8 +2379,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" zlib "/lib") flag)) ,flags))) + ;; Build again GMP & co. within GCC's build process, because it's hard + ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus + ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) ((#:phases phases) - `(alist-delete 'symlink-libgcc_eh ,phases))))) + `(modify-phases ,phases + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (invoke "tar" "xvf" source)) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-6.0 mpfr mpc)) + #t)))))))) ;; This time we want Texinfo, so we get the manual. Add ;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of -- cgit v1.2.3 From 345fe853c844e0d9b423c8c14b02715df86ad03d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 7 Oct 2018 00:35:23 +0200 Subject: gnu: mes: Update to 0.18. * gnu/packages/patches/mes-nyacc-0.86.0.patch: Removef file. * gnu/local.mk (dist_patch_DATA): Remove entry. * gnu/packages/mes.scm (mes): Update to 0.18. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 5 +- gnu/packages/patches/mes-nyacc-0.86.0.patch | 225 ---------------------------- 3 files changed, 2 insertions(+), 229 deletions(-) delete mode 100644 gnu/packages/patches/mes-nyacc-0.86.0.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 71d8e832fd..ba5dc0cc70 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,7 +960,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 880e140b80..6dc6dfb4cb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -63,15 +63,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.17.1") + (version "0.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) - (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 (base32 - "02g8zig53ffd0ai8kqhv2zj7bj2366a8hr6ydkwakmi2d1amyrna")))) + "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch deleted file mode 100644 index 30ee4645c2..0000000000 --- a/gnu/packages/patches/mes-nyacc-0.86.0.patch +++ /dev/null @@ -1,225 +0,0 @@ -Two small patches off the current Mes `wip' branch, that enable using -Nyacc-0.86.0; and a fix for running ./check.sh. - -From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 20:28:06 +0200 -Subject: [PATCH 1/2] mes: Support Nyacc 0.85.3: Add char-set-copy. - -* mes/module/srfi/srfi-14.mes (char-set-copy): New function> ---- - mes/module/srfi/srfi-14.mes | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mes/module/srfi/srfi-14.mes b/mes/module/srfi/srfi-14.mes -index 0be39b1e..a16d16ce 100644 ---- a/mes/module/srfi/srfi-14.mes -+++ b/mes/module/srfi/srfi-14.mes -@@ -52,3 +52,6 @@ - - (define (char-whitespace? c) - (char-set-contains? char-set:whitespace c)) -+ -+(define (char-set-copy cs) -+ (map identity cs)) --- -2.18.0 - -From b952bdf44f11edbfc277600dc35236aae1769b54 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 22:14:34 +0200 -Subject: [PATCH 2/2] mes: Support Nyacc 0.85.3: Integrate progress. - -* mes/module/nyacc/lang/sx-util.mes: New file. -* mes/module/nyacc/version.mes: New file. -* mes/module/nyacc/lang/c99/cpp.mes (nyacc): Include them. -* mes/module/nyacc/lang/c99/parser.mes (nyacc): Include them. -* module/mescc/preprocess.scm (need-progress): New function. -(progress): New function. -(insert-progress-monitors): Use them to Integrate progress. ---- - mes/module/mescc/preprocess.mes | 1 + - mes/module/nyacc/lang/c99/cpp.mes | 1 + - mes/module/nyacc/lang/c99/parser.mes | 1 + - mes/module/nyacc/lang/sx-util.mes | 27 +++++++++++++++++++++ - mes/module/nyacc/version.mes | 26 +++++++++++++++++++++ - module/mescc/preprocess.scm | 35 ++++++++++++++++++++++++++++ - 6 files changed, 91 insertions(+) - create mode 100644 mes/module/nyacc/lang/sx-util.mes - create mode 100644 mes/module/nyacc/version.mes - -diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes -index c7c5fcaa..022a372c 100644 ---- a/mes/module/mescc/preprocess.mes -+++ b/mes/module/mescc/preprocess.mes -@@ -24,4 +24,5 @@ - (mes-use-module (srfi srfi-13)) - (mes-use-module (srfi srfi-26)) - (mes-use-module (nyacc lang c99 parser)) -+(mes-use-module (nyacc version)) - (include-from-path "mescc/preprocess.scm") -diff --git a/mes/module/nyacc/lang/c99/cpp.mes b/mes/module/nyacc/lang/c99/cpp.mes -index fad1dc55..b25c4a93 100644 ---- a/mes/module/nyacc/lang/c99/cpp.mes -+++ b/mes/module/nyacc/lang/c99/cpp.mes -@@ -28,5 +28,6 @@ - - (mes-use-module (nyacc parse)) - (mes-use-module (nyacc lex)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (include-from-path "nyacc/lang/c99/cpp.scm") -diff --git a/mes/module/nyacc/lang/c99/parser.mes b/mes/module/nyacc/lang/c99/parser.mes -index c51552d6..1a9aaf73 100644 ---- a/mes/module/nyacc/lang/c99/parser.mes -+++ b/mes/module/nyacc/lang/c99/parser.mes -@@ -32,6 +32,7 @@ - - (mes-use-module (nyacc lex)) - (mes-use-module (nyacc parse)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (mes-use-module (nyacc lang c99 cpp)) - -diff --git a/mes/module/nyacc/lang/sx-util.mes b/mes/module/nyacc/lang/sx-util.mes -new file mode 100644 -index 00000000..41ac5b4a ---- /dev/null -+++ b/mes/module/nyacc/lang/sx-util.mes -@@ -0,0 +1,27 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes 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 Mes 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 Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(mes-use-module (srfi srfi-1)) -+(mes-use-module (srfi srfi-16)) -+(include-from-path "nyacc/lang/sx-util.scm") -diff --git a/mes/module/nyacc/version.mes b/mes/module/nyacc/version.mes -new file mode 100644 -index 00000000..b9db628e ---- /dev/null -+++ b/mes/module/nyacc/version.mes -@@ -0,0 +1,26 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes 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 Mes 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 Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(include-from-path "nyacc/version.scm") -+(display "nyacc version\n") -diff --git a/module/mescc/preprocess.scm b/module/mescc/preprocess.scm -index 9e341cba..c2efb32c 100644 ---- a/module/mescc/preprocess.scm -+++ b/module/mescc/preprocess.scm -@@ -26,9 +26,44 @@ - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc version) - #:use-module (mes guile) - #:export (c99-input->ast)) - -+(format (current-error-port) "*nyacc-version*=~a\n" *nyacc-version*) -+;; list of which rules you want progress reported -+(define need-progress -+ (assoc-ref -+ '(("0.85.3" (1 2 3)) -+ ("0.86.0" (1 2 3))) -+ *nyacc-version*)) -+ -+(define (progress o) -+ (when (and o (getenv "NYACC_DEBUG")) -+ (display " :" (current-error-port)) -+ (display o (current-error-port)) -+ (display "\n" (current-error-port)))) -+ -+(define (insert-progress-monitors act-v len-v) -+ (let ((n (vector-length act-v))) -+ (let loop ((ix 0)) -+ (when (< ix n) -+ (if (memq ix need-progress) -+ (vector-set -+ act-v ix -+ (lambda args -+ (progress (list-ref args (1- (vector-ref len-v ix)))) -+ (apply (vector-ref act-v ix) args)))) -+ (loop (1+ ix)))))) -+ -+(cond-expand -+ (guile -+ (insert-progress-monitors (@@ (nyacc lang c99 parser) c99-act-v) -+ (@@ (nyacc lang c99 parser) c99-len-v))) -+ (mes -+ (insert-progress-monitors c99-act-v c99-len-v))) -+ - (define (logf port string . rest) - (apply format (cons* port string rest)) - (force-output port) --- -2.18.0 - -From 20deefe6ea0d62a3338a8e2a9552d2a20b0f607e Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Sun, 9 Sep 2018 07:11:50 +0200 -Subject: [PATCH] build: Oops, fix ./check.sh for bootstrap build. - -* build-aux/config.sh (top_builddir): Set default to `.'. ---- - build-aux/config.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build-aux/config.sh b/build-aux/config.sh -index a4b9fdef..4fa84441 100644 ---- a/build-aux/config.sh -+++ b/build-aux/config.sh -@@ -17,6 +17,7 @@ - # along with GNU Mes. If not, see . - - srcdir=${srcdir-.} -+top_builddir=${top_builddir-.} - if [ "$V" = 2 ]; then - echo $0 - echo srcdest=${srcdest} --- -2.18.0 - -- cgit v1.2.3 From f7a331c06886ae47870eb93f388b1de0179dc60a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:26:09 +0200 Subject: gnu: %mescc-tools-seed: Update to 0.5.2. * gnu/packages/bootstrap.scm (%mescc-tools-seed): Update to 0.5.2. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c52b4302e1..2ba09c7175 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -611,7 +611,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (license gpl3+))) (define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ - (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) + (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" @@ -619,7 +619,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/mescc-tools-seed-" commit ".tar.gz")) (sha256 (base32 - "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) + "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) (define %mes-seed (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) -- cgit v1.2.3 From 1b306893439d1748d5176d6b1ee944c5602d8977 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:26:43 +0200 Subject: gnu: %mes-seed: Update to 0.18. * gnu/packages/bootstrap.scm (%mes-seed): Update to 0.18. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 2ba09c7175..389768c714 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -622,7 +622,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) (define %mes-seed - (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) + (let ((commit "057fd36735b5605fe582d6b3625f793a62922206")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed" @@ -630,7 +630,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 - "0k7iv9djcky18r8lm0zq96xj5nz8v5kg1clf7a2y8r47n6wzww8s"))))) + "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) (define %tinycc-seed (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) -- cgit v1.2.3 From a52b11a6678074be7aa73e4b405dcddc9e3e92e3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:27:18 +0200 Subject: gnu: %tinycc-seed: Update for mes 0.18. * gnu/packages/bootstrap.scm (%tinycc-seed): Update for mes 0.18. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 389768c714..82d2295695 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -633,7 +633,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) (define %tinycc-seed - (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) + (let ((commit "843d47ca682617f21333b50c67851797b8c3fd04")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed" @@ -641,7 +641,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/tinycc-seed-" commit ".tar.gz")) (sha256 (base32 - "0hzjd0iyghj4zphwn3ppyclq7k9qqg3xam9fj9hsrr2m0ibvr387"))))) + "0599wwv30js03l1rpmvzfclq3jadzvq04pi29j45nf6fyfg5hhqb"))))) (define %srfi-43 (origin -- cgit v1.2.3 From 189ac60eac6d7c187ecf9bff5107a68867ced81d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:27:53 +0200 Subject: gnu: mes-boot0: Update to 0.18 * gnu/packages/commencement.scm (mes-boot0): Update to 0.18. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4c7a381349..77909f0bd5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -85,8 +85,8 @@ ; for speed-up? (define mes-boot0 - (let ((version "0.17.1") - (revision "2") + (let ((version "0.18") + (revision "0") (commit #f)) (package (inherit mes) @@ -101,7 +101,7 @@ "/mes-" commit ".tar.gz")) (sha256 (base32 - "1dfnchrz3fb8x220bz28i6p3ql2xfahk9mzin3vk8lyw45s12r5g"))) + "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) (package-source mes))) (native-inputs '()) (propagated-inputs '())))) -- cgit v1.2.3 From fc4ff50f2d77d1ff20ebb5a1113b56487d34640f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:28:20 +0200 Subject: gnu: mescc-tools-boot: Update to 0.5.2. * gnu/packages/commencement.scm (mescc-tools-boot): Update to 0.5.2. * gnu/packages/patches/mescc-tools-boot.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 133 ++++++++--------- gnu/packages/patches/mescc-tools-boot.patch | 222 ++++++++++++++++++++++++++++ 3 files changed, 286 insertions(+), 70 deletions(-) create mode 100644 gnu/packages/patches/mescc-tools-boot.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index ba5dc0cc70..5740127571 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -961,6 +961,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ + %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 77909f0bd5..c7a2b03918 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -107,77 +107,70 @@ (propagated-inputs '())))) (define mescc-tools-boot - (let ((version "0.4") - (revision "1") - (commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5")) - (package-with-bootstrap-guile - (package - (inherit mescc-tools) - (name "mescc-tools-boot") - (version (string-append version "-" revision "." (string-take commit 7))) - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools" - "/-/archive/" commit - "/mescc-tools-" commit ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-source" ,(package-source mes-boot0)) + (package-with-bootstrap-guile + (package + (inherit mescc-tools) + (name "mescc-tools-boot") + (source (origin + (inherit (package-source mescc-tools)) + (patches (search-patches "mescc-tools-boot.patch")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-source" ,(package-source mes-boot0)) - ("coreutils" ,%bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed))) - (build-system gnu-build-system) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) - (mes-source (assoc-ref %build-inputs "mes-source")) - (out (assoc-ref %outputs "out"))) - (with-directory-excursion ".." - (and - (mkdir-p "mescc-tools-seed") - (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" - "-xvf" mescc-tools-seed) - (mkdir-p "mes-source") - (invoke "tar" "--strip=1" "-C" "mes-source" - "-xvf" mes-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed)))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (out (assoc-ref %outputs "out"))) - (setenv "PATH" (string-append coreutils "/bin" - ":" "../mescc-tools-seed")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (setenv "PREFIX" out) - (setenv "MES_PREFIX" "../mes-source") - (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" "../mes-seed") - #t))) - (replace 'build - (lambda _ - (invoke "sh" "build.sh"))) - (replace 'check - (lambda _ - (invoke "sh" "check.sh"))) - (replace 'install - (lambda _ - (invoke "sh" "install.sh")))))))))) + ("coreutils" ,%bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed))) + (build-system gnu-build-system) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (mes-source (assoc-ref %build-inputs "mes-source")) + (out (assoc-ref %outputs "out"))) + (with-directory-excursion ".." + (and + (mkdir-p "mescc-tools-seed") + (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" + "-xvf" mescc-tools-seed) + (mkdir-p "mes-source") + (invoke "tar" "--strip=1" "-C" "mes-source" + "-xvf" mes-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed)))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (out (assoc-ref %outputs "out"))) + (setenv "PATH" (string-append coreutils "/bin" + ":" "../mescc-tools-seed")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (setenv "PREFIX" out) + (setenv "MES_PREFIX" "../mes-source") + (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") + (setenv "MES_SEED" "../mes-seed") + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + ;; bootstrap build.sh lacks exec_enable, get_machine, and + ;; kaem_machine + ;; (invoke "sh" "check.sh") + #t)) + (replace 'install + (lambda _ + (invoke "sh" "install.sh"))))))))) (define nyacc-boot (let ((version "0.86.0") diff --git a/gnu/packages/patches/mescc-tools-boot.patch b/gnu/packages/patches/mescc-tools-boot.patch new file mode 100644 index 0000000000..2bce8a49c2 --- /dev/null +++ b/gnu/packages/patches/mescc-tools-boot.patch @@ -0,0 +1,222 @@ +From c184e95096881a13f29ebd7fc507fe305d3d8de5 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Thu, 4 Oct 2018 22:03:31 +0200 +Subject: [PATCH] build.sh: Update for mes 0.18. + +--- + build.sh | 92 +++++++++++++++++++++++++++++++++++++----------------- + install.sh | 6 ++-- + 2 files changed, 66 insertions(+), 32 deletions(-) + +diff --git a/build.sh b/build.sh +index 335a7bb..19a0029 100755 +--- a/build.sh ++++ b/build.sh +@@ -18,7 +18,8 @@ + # along with mescc-tools. If not, see . + + set -eux +-MES_SEED=${MES_SEED-../mescc-tools-seed/libs} ++MES_PREFIX=${MES_PREFIX-../mes} ++MES_SEED=${MES_SEED-../mes-seed} + MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed} + + ######################################### +@@ -32,15 +33,23 @@ MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed} + # blood-elf + # Create proper debug segment + $MESCC_TOOLS_SEED/blood-elf\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -o blood-elf-blood-elf-footer.M1 + + # Build + # M1-macro phase + $MESCC_TOOLS_SEED/M1 --LittleEndian --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -f blood-elf-blood-elf-footer.M1\ + -o blood-elf.hex2 +@@ -49,7 +58,7 @@ $MESCC_TOOLS_SEED/hex2\ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f blood-elf.hex2\ + --exec_enable\ + -o bin/blood-elf +@@ -65,9 +74,13 @@ $MESCC_TOOLS_SEED/hex2\ + $MESCC_TOOLS_SEED/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/M1.M1\ + -f M1-footer.M1\ + -o M1.hex2 +@@ -76,7 +89,7 @@ $MESCC_TOOLS_SEED/hex2 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f M1.hex2\ + --exec_enable\ + -o bin/M1 +@@ -92,9 +105,13 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/hex2.M1\ + -f hex2-footer.M1\ + -o hex2.hex2 +@@ -103,10 +120,10 @@ $MESCC_TOOLS_SEED/hex2 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f hex2.hex2\ + --exec_enable\ +- -o bin/hex2 ++ -o bin/hex2-0 + + ######################### + # Phase-1 Self-host # +@@ -123,18 +140,22 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -f blood-elf-blood-elf-footer.M1\ + -o blood-elf.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f blood-elf.hex2\ + --exec_enable\ + -o blood-elf +@@ -150,18 +171,22 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/M1.M1\ + -f M1-footer.M1\ + -o M1.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f M1.hex2\ + --exec_enable\ + -o bin/M1 +@@ -177,18 +202,27 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/hex2.M1\ + -f hex2-footer.M1\ + -o hex2.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f hex2.hex2\ + --exec_enable\ + -o bin/hex2 ++ ++# TODO ++touch bin/exec_enable ++touch bin/get_machine ++touch bin/kaem +diff --git a/install.sh b/install.sh +index e4dccff..29e58d6 100644 +--- a/install.sh ++++ b/install.sh +@@ -18,6 +18,6 @@ + PREFIX=${PREFIX-usr} + + mkdir -p "$PREFIX/bin" +-cp blood-elf "$PREFIX/bin/blood-elf" +-cp hex2 "$PREFIX/bin/hex2" +-cp M1 "$PREFIX/bin/M1" ++cp bin/blood-elf "$PREFIX/bin/blood-elf" ++cp bin/hex2 "$PREFIX/bin/hex2" ++cp bin/M1 "$PREFIX/bin/M1" +-- +2.18.0 + -- cgit v1.2.3 From 09c5a5680a06011f985a84aa26fb890b3be453bd Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:28:44 +0200 Subject: gnu: tcc-boot0: Update for mes 0.18. * gnu/packages/commencement.scm (tcc-boot0): Update for mes 0.18. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c7a2b03918..6fc39f7683 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -304,8 +304,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "3") - (commit "812e9343e4520ec90934fd7f47134416ad0dce07")) + (revision "4") + (commit "46ee3f18477575b189ac224eac853e96afd571e1")) (package-with-bootstrap-guile (package (inherit tcc) @@ -318,7 +318,7 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "0c68hmi6ryb3bmbmdrr5knhz61li3mlhkmxvji6khgkb199znlqc")))) + "0kq2si81piszpdcnp78w1lp5jd291srbx1f71fir08ybidiriw35")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) -- cgit v1.2.3 From f266199dc1e547dee2d7e946e9dd9a9bb17fca89 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Oct 2018 10:44:24 +0200 Subject: gnu: mes: Update to 0.18.0-08f04f55. This update is a preparation for the %bootstrap-mes package; due to some small problems it fails to build with plain mes-0.18. mes-boot0 stays at 0.18 only to avoid another rebuild world. %bootstrap-mes brings the building and packaging the Mes bootstrap seeds from manual operation into Guix. We will bump mes and mes-boot0 to a future 0.18.1 or 0.19 and regenerate %bootstrap-mes in a nex iteration. 08f04f55 build: Oops, remove stray lib/linux/x86_64-mes/crt1. 33f37f27 build: x86_64 bootstrap build fixes and workaround. 4ae2a111 doc: Release update. 5277669b mescc: Oops, delete wrong line of assembly. 44cc97a8 admin: Release update. * gnu/packages/mes.scm (mes): Update to 0.18.0-08f04f55. * gnu/packages/commencement.scm (mes-boot0): Stay at 0.18.0. --- gnu/packages/commencement.scm | 8 +++++++- gnu/packages/mes.scm | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6fc39f7683..61349337e0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -102,7 +102,13 @@ (sha256 (base32 "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (package-source mes))) + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf"))))) (native-inputs '()) (propagated-inputs '())))) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 6dc6dfb4cb..4f98cd24f0 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -60,17 +60,22 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((triplet "i686-unknown-linux-gnu")) + (let ((triplet "i686-unknown-linux-gnu") + (version "0.18") + (revision "0") + (commit "08f04f559670d9e8f57eb03bb9b13f4d0b81cedf")) (package (name "mes") - (version "0.18") + (version (string-append version "-" revision "." (string-take commit 7))) (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) + (uri (string-append + "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" + name "-" commit + ".tar.gz")) (sha256 (base32 - "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf")))) + "1b7wz9k38pfrz707pd4p8s54q903jr167q73ya7qkna89sxj3wna")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs @@ -93,10 +98,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries (synopsis "Scheme interpreter and C compiler for full source bootstrapping") (description - "GNU Mes [Maxwell Equations of Software] aims to create full source -bootstrapping for GuixSD. It consists of a mutual self-hosting [close to -Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in -[Guile] Scheme.") + "GNU Mes--Maxwell Equations of Software--brings the Reduced +Binary Seed bootstrap to GuixSD and aims to help create full source +bootstrapping for GNU/Linux distributions. It consists of a mutual +self-hosting Scheme interpreter in C and a Nyacc-based C compiler in +Scheme and is compatible with Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+)))) -- cgit v1.2.3 From 35dcf85157435be848bc03bc014bdf5eb18546e6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 20 Oct 2018 08:59:19 +0200 Subject: bootstrap: Add %mes-stripped, %mes-bootstrap-tarball. * gnu/packages/make-bootstrap.scm (%mes-stripped): New variable. (%mes-bootstrap-tarball): New variable. * gnu/packages/mes.scm: Oops, remove stray (gnu packages commencement) module include. --- gnu/packages/make-bootstrap.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/packages/mes.scm | 1 - 2 files changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 3553737f1e..7bfba3c14b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) + #:use-module (gnu packages mes) #:use-module (gnu packages multiprecision) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -47,6 +48,7 @@ %glibc-bootstrap-tarball %gcc-bootstrap-tarball %guile-bootstrap-tarball + %mes-bootstrap-tarball %bootstrap-tarballs %guile-static-stripped)) @@ -533,6 +535,35 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) +(define %mes-stripped + ;; The subset of Mes files needed for bootstrap. + (package + (inherit mes) + (name "mes-stripped") + (build-system trivial-build-system) + (source #f) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (srfi srfi-1) + (srfi srfi-26) + (guix build utils)) + + (setvbuf (current-output-port) _IOLBF) + (let* ((out (assoc-ref %outputs "out")) + (libdir (string-append out "/lib")) + (mes (assoc-ref %build-inputs "mes"))) + + (copy-recursively (string-append mes "/lib") libdir) + (copy-recursively (string-append mes "/share/mes/lib") libdir) + (for-each remove-store-references + (remove (lambda (file) (or (string-suffix? ".h" file) + (string-suffix? ".c" file))) + (find-files out ".*"))) + #t)))) + (inputs `(("mes" ,mes))))) + (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather @@ -700,6 +731,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked, relocatable Guile. (tarball-package %guile-static-stripped)) +(define %mes-bootstrap-tarball + ;; A tarball with Mes ASCII Seed and binary Mes C Library. + (tarball-package %mes-stripped)) + (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for ;; convenience. diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4f98cd24f0..c4cb118e35 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -21,7 +21,6 @@ (define-module (gnu packages mes) #:use-module (gnu packages) #:use-module (gnu packages base) - #:use-module (gnu packages commencement) #:use-module (gnu packages cross-base) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) -- cgit v1.2.3 From 668ffe1e4e67e22268c9565993c6d9d7a86ae72a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Oct 2018 23:39:43 +0200 Subject: bootstrap: Move use-modules to top of builder. * gnu/packages/bootstrap.scm (package-from-tarball): Move use-modules to top of builder. (%bootstrap-glibc): Likewise. (%bootstrap-gcc): Likewise. --- gnu/packages/bootstrap.scm | 182 +++++++++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 88 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 82d2295695..2614d73c2c 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -115,23 +115,25 @@ or false to signal an error." `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir "/binaries.tar")) - ,@(if snippet (list snippet) '()) - (or (not ,program-to-test) - (invoke (string-append "bin/" ,program-to-test) - "--version"))))))) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")) + ,@(if snippet (list snippet) '()) + (or (not ,program-to-test) + (invoke (string-append "bin/" ,program-to-test) + "--version")))))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -460,28 +462,30 @@ $out/bin/guile --version~%" `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir - "/binaries.tar")) - (chmod "lib" #o755) - - ;; Patch libc.so so it refers to the right path. - (substitute* "lib/libc.so" - (("/[^ ]+/lib/(libc|ld)" _ prefix) - (string-append out "/lib/" prefix))) - - #t))))) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir + "/binaries.tar")) + (chmod "lib" #o755) + + ;; Patch libc.so so it refers to the right path. + (substitute* "lib/libc.so" + (("/[^ ]+/lib/(libc|ld)" _ prefix) + (string-append out "/lib/" prefix))) + + #t)))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -531,39 +535,41 @@ $out/bin/guile --version~%" `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (bash (assoc-ref %build-inputs "bash")) - (libc (assoc-ref %build-inputs "libc")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils) (ice-9 popen)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd)) - (bindir (string-append out "/bin"))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir "/binaries.tar"))) - - (with-directory-excursion bindir - (chmod "." #o755) - (rename-file "gcc" ".gcc-wrapped") - (call-with-output-file "gcc" - (lambda (p) - (format p "#!~a + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (bash (assoc-ref %build-inputs "bash")) + (libc (assoc-ref %build-inputs "libc")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar"))) + + (with-directory-excursion bindir + (chmod "." #o755) + (rename-file "gcc" ".gcc-wrapped") + (call-with-output-file "gcc" + (lambda (p) + (format p "#!~a exec ~a/bin/.gcc-wrapped -B~a/lib \ -Wl,-rpath -Wl,~a/lib \ -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" - bash - out libc libc libc - ,(glibc-dynamic-linker)))) + bash + out libc libc libc + ,(glibc-dynamic-linker)))) - (chmod "gcc" #o555) - #t))))) + (chmod "gcc" #o555) + #t)))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -571,33 +577,33 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("libc" ,%bootstrap-glibc) ("tarball" ,(bootstrap-origin (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("armhf-linux" - "/20150101/gcc-4.8.4.tar.xz") - ("aarch64-linux" - "/20170217/gcc-5.4.0.tar.xz") - (_ - "/20131110/gcc-4.8.2.tar.xz"))) - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) - ("i686-linux" - (base32 - "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) - ("armhf-linux" - (base32 - "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")) - ("aarch64-linux" - (base32 - "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) - ("mips64el-linux" - (base32 - "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) + (method url-fetch) + (uri (map (cut string-append <> "/" (%current-system) + (match (%current-system) + ("armhf-linux" + "/20150101/gcc-4.8.4.tar.xz") + ("aarch64-linux" + "/20170217/gcc-5.4.0.tar.xz") + (_ + "/20131110/gcc-4.8.2.tar.xz"))) + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) + ("i686-linux" + (base32 + "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) + ("armhf-linux" + (base32 + "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")) + ("aarch64-linux" + (base32 + "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) + ("mips64el-linux" + (base32 + "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) (native-search-paths (list (search-path-specification (variable "CPATH") -- cgit v1.2.3 From 5f02c9b7d67cf6c1fedc64c9bd51367cd636a398 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 20 Oct 2018 09:02:39 +0200 Subject: bootstrap: Add %bootstrap-mes. Built with 668ffe1e4e67e22268c9565993c6d9d7a86ae72a bootstrap: Move use-modules to top of builder. Todo: host these on ftp.gnu.org/pub/guix/... * gnu/packages/bootstrap.scm (%bootstrap-mes): New variable. --- gnu/packages/bootstrap.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 2614d73c2c..3d4f1f5036 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -49,6 +49,7 @@ %bootstrap-gcc %bootstrap-glibc %bootstrap-inputs + %bootstrap-mes %mescc-tools-seed %mes-seed %srfi-43 @@ -616,6 +617,58 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %bootstrap-mes + ;; The initial Mes. Uses binaries from a tarball typically built by + ;; %MES-BOOTSTRAP-TARBALL. + (package + (name "bootstrap-mes") + (version "0") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 popen)) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")))))))) + (inputs + `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) + ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + ("tarball" ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "http://lilypond.org/janneke/mes/" + (match (%current-system) + ("x86_64-linux" "mes-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz") + ("i686-linux" "mes-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "1yhxqf1sm67gwjbkkc26m4lcscvpjfmi71bzy8rhysal4lcj1vc8")) + ("i686-linux" + (base32 + "1p116ya9n52852bryh34n7db4mhvi98qifmmwygl7nbyc4dz92jy"))))))))) + (synopsis "Bootstrap binaries of Mes") + (description synopsis) + (home-page #f) + (license gpl3+))) + (define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) (origin -- cgit v1.2.3 From 7cbf6f1ca268a7a179d715aaba2a451a8886ab44 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Oct 2018 08:20:20 +0200 Subject: gnu: mescc-tools: Update to 0.5.2-0.bb062b0d. * gnu/packages/mes.scm (mescc-tools): Update to 0.5.2-0.bb062b0d. mescc * gnu/packages/commencement.scm (mescc-tools-boot): Stay at 0.5.2 --- gnu/packages/commencement.scm | 13 +++++++++-- gnu/packages/mes.scm | 50 ++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 61349337e0..258655fbad 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -117,9 +117,18 @@ (package (inherit mescc-tools) (name "mescc-tools-boot") + (version "0.5.2") (source (origin - (inherit (package-source mescc-tools)) - (patches (search-patches "mescc-tools-boot.patch")))) + (method url-fetch) + (uri (string-append + "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-Release_" version + ".tar.gz")) + (patches (search-patches "mescc-tools-boot.patch")) + (file-name (string-append "mescc-tools" "-" version ".tar.gz")) + (sha256 + (base32 + "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) (inputs '()) (propagated-inputs '()) (native-inputs diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c4cb118e35..7f7caa7a6d 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -106,31 +106,33 @@ Scheme and is compatible with Guile.") (license gpl3+)))) (define-public mescc-tools - (package - (name "mescc-tools") - (version "0.5.2") - (source (origin - (method url-fetch) - (uri (string-append - "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" - name "-Release_" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) - (build-system gnu-build-system) - (supported-systems '("i686-linux" "x86_64-linux")) - (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (delete 'configure)))) - (synopsis "Tools for the full source bootstrapping process") - (description - "Mescc-tools is a collection of tools for use in a full source + (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") + (revision "0") + (version "0.5.2")) + (package + (name "mescc-tools") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-" commit + ".tar.gz")) + (sha256 + (base32 + "1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:test-target "test" + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Tools for the full source bootstrapping process") + (description + "Mescc-tools is a collection of tools for use in a full source bootstrapping process. It consists of the M1 macro assembler, the hex2 linker, the blood-elf symbol table generator, the kaem shell, exec_enable and get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") - (license gpl3+))) + (license gpl3+)))) -- cgit v1.2.3 From 1a99a9c45c9c8708b7b28979759e342e56424e4c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Oct 2018 19:30:11 +0200 Subject: bootstrap: Build with %bootstrap-mes. * gnu/packages/bootstrap.scm (%tinycc-seed): Remove. (%bootstrap-inputs): Use %bootstrap-mes instead of %mes-seed and %tinycc-seed. * gnu/packages/commencement.scm (mescc-tools-boot, mes-boot, tcc-boot0): Build with %bootstrap-mes instead of %mes-seed and %tinycc-seed. --- gnu/packages/bootstrap.scm | 31 +++-------------------- gnu/packages/commencement.scm | 57 ++++++++++++++++--------------------------- 2 files changed, 24 insertions(+), 64 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3d4f1f5036..7e6200c576 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -51,9 +51,7 @@ %bootstrap-inputs %bootstrap-mes %mescc-tools-seed - %mes-seed - %srfi-43 - %tinycc-seed)) + %srfi-43)) ;;; Commentary: ;;; @@ -680,28 +678,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (base32 "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) -(define %mes-seed - (let ((commit "057fd36735b5605fe582d6b3625f793a62922206")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/-/archive/" commit - "/mes-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) - -(define %tinycc-seed - (let ((commit "843d47ca682617f21333b50c67851797b8c3fd04")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed" - "/-/archive/" commit - "/tinycc-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0599wwv30js03l1rpmvzfclq3jadzvq04pi29j45nf6fyfg5hhqb"))))) - (define %srfi-43 (origin (method url-fetch) @@ -718,9 +694,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-seed" ,%mes-seed) - ("srfi-43" ,%srfi-43 ) - ("tinycc-seed" ,%tinycc-seed))) + ("mes" ,%bootstrap-mes) + ("srfi-43" ,%srfi-43 ))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 258655fbad..4def178a83 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -102,13 +102,7 @@ (sha256 (base32 "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) - (sha256 - (base32 - "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf"))))) + (package-source mes))) (native-inputs '()) (propagated-inputs '())))) @@ -135,8 +129,8 @@ `(("mescc-tools-seed" ,%mescc-tools-seed) ("mes-source" ,(package-source mes-boot0)) - ("coreutils" ,%bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed))) + ("bootstrap-mes" ,%bootstrap-mes) + ("coreutils" ,%bootstrap-coreutils&co))) (build-system gnu-build-system) (arguments `(#:implicit-inputs? #f @@ -148,7 +142,6 @@ (lambda* (#:key outputs #:allow-other-keys) (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) (mes-source (assoc-ref %build-inputs "mes-source")) (out (assoc-ref %outputs "out"))) (with-directory-excursion ".." @@ -159,12 +152,11 @@ (mkdir-p "mes-source") (invoke "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed)))))) + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes")) (out (assoc-ref %outputs "out"))) (setenv "PATH" (string-append coreutils "/bin" ":" "../mescc-tools-seed")) @@ -172,7 +164,7 @@ (setenv "PREFIX" out) (setenv "MES_PREFIX" "../mes-source") (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" "../mes-seed") + (setenv "MES_SEED" (string-append bootstrap-mes "/lib")) #t))) (replace 'build (lambda _ @@ -223,7 +215,7 @@ ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed) + ("bootstrap-mes" ,%bootstrap-mes) ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile `(("guile" ,%bootstrap-guile) ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick @@ -239,13 +231,12 @@ (let ((coreutils (assoc-ref %build-inputs "coreutils")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (mes-seed (assoc-ref %build-inputs "mes-seed"))) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." (and (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed) + (symlink (string-append bootstrap-mes "/lib") "mes-seed") (or (not srfi-43) (and (mkdir-p "srfi") (copy-file srfi-43 "srfi/srfi-43.scm") @@ -256,7 +247,7 @@ (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "GUILE_LOAD_PATH" "nyacc") (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile - (invoke "bash" "-x" "configure.sh" + (invoke "bash" "configure.sh" (string-append "--prefix=" out)) (setenv "MES" "src/mes") (setenv "MESCC" "scripts/mescc") @@ -286,15 +277,16 @@ (replace 'check (lambda _ (when ,%fake-bootstrap? - ;; breaks with guile-2.0 + ;; break with guile-2.0 (delete-file "scaffold/boot/50-primitive-load.scm") (delete-file "scaffold/boot/51-module.scm")) (and (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") - (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") - (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") - (invoke "sh" "-x" "check.sh")))) + ;; fail fast tests + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "check.sh")))) (replace 'install (lambda _ (invoke "sh" "install.sh")))))) @@ -319,8 +311,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "4") - (commit "46ee3f18477575b189ac224eac853e96afd571e1")) + (revision "5") + (commit "c7b3f59d1a71e71b470f859b20f0cfe840f3954d")) (package-with-bootstrap-guile (package (inherit tcc) @@ -333,19 +325,18 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "0kq2si81piszpdcnp78w1lp5jd291srbx1f71fir08ybidiriw35")))) + "1agz5w5q6dm51n63hsxii33hxdghmdiacbb5zzxzac3aarfxjb2m")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("mes-seed" ,%mes-seed) ("mescc-tools" ,mescc-tools-boot) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) - ("tinycc-seed" ,%tinycc-seed) + ("bootstrap-mes" ,%bootstrap-mes) ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile `(("guile" ,%bootstrap-guile) ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick @@ -361,8 +352,7 @@ (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) - (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (setenv "PATH" (string-append coreutils "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) @@ -371,12 +361,7 @@ (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed) - (mkdir-p "tinycc-seed") - (invoke "tar" "--strip=1" "-C" "tinycc-seed" - "-xvf" tinycc-seed) + (symlink (string-append bootstrap-mes "/lib") "mes-seed") (or (not srfi-43) (and (mkdir-p "srfi") (copy-file srfi-43 "srfi/srfi-43.scm") -- cgit v1.2.3 From 1b9fb043d9c2fbd047ab17209ca4a3de5293edee Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:16:46 +0900 Subject: gnu: glibc: Export supported locales. Debian and Archlinux (at least) force the installation of the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. * gnu/packages/patches/glibc-supported-locales.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc/linux): Add the previous patch, (glibc-2.28): ditto. --- gnu/local.mk | 1 + gnu/packages/base.scm | 6 +++-- gnu/packages/patches/glibc-supported-locales.patch | 31 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-supported-locales.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4ba49e86a4..798b1e9209 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -763,6 +763,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ %D%/packages/patches/glibc-2.28-git-fixes.patch \ + %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3a1186673e..a6ece07ad9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -604,7 +604,8 @@ store.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -901,7 +902,8 @@ GLIBC/HURD for a Hurd host" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))))) (define-public glibc-2.26 (package diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch new file mode 100644 index 0000000000..f1c8a88871 --- /dev/null +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -0,0 +1,31 @@ +This patch is taken from debian's glibc package (generate-supported.mk). + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. -- cgit v1.2.3 From 421ec86532041eb17cdfd250f481430179ea8d20 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Nov 2018 18:57:08 +0900 Subject: gnu: glibc: Update supported locale patch description. gnu/packages/patches/glibc-supported-locales.patch: Update description. --- gnu/packages/patches/glibc-supported-locales.patch | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index f1c8a88871..2888052bb8 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -1,4 +1,6 @@ This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. diff --git a/localedata/Makefile.old b/localedata/Makefile index 34877c0..a61d9b9 100644 -- cgit v1.2.3 From 5b01b6034aeab32a5011c5757f18bd9772d3497d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 1 Nov 2018 21:18:41 -0500 Subject: python: Honor '--cores=...' in tests. * gnu/packages/python.scm (python-2.7)[arguments]: Add #:make-flags. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2b6a0647fd..46ce0dde40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -190,6 +190,9 @@ "--enable-unicode=ucs4" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) + ;; With no -j argument tests use all available cpus, so provide one. + #:make-flags + (list (format #f "EXTRATESTOPTS=-j~d" (parallel-job-count))) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) -- cgit v1.2.3 From fae3c0d953a7b0b552b4ce654ed9b5a51186f491 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 19:29:55 +0100 Subject: bootstrap: Add mescc-tools-static, mescc-tools-static-tarball. * gnu/packages/make-bootstrap.scm (%mescc-tools-static, %mescc-tools-bootstrap-tarball): New variable. --- gnu/packages/make-bootstrap.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7bfba3c14b..36a5f6904c 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -48,6 +48,7 @@ %glibc-bootstrap-tarball %gcc-bootstrap-tarball %guile-bootstrap-tarball + %mescc-tools-bootstrap-tarball %mes-bootstrap-tarball %bootstrap-tarballs @@ -535,6 +536,16 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) +(define %mescc-tools-static + ;; A statically linked MesCC Tools for bootstrap. + (package + (inherit mescc-tools) + (name "mescc-tools-static") + (arguments + (substitute-keyword-arguments (package-arguments mescc-tools) + ((#:make-flags flags) + `(cons "CC=gcc -static" ,flags)))))) + (define %mes-stripped ;; The subset of Mes files needed for bootstrap. (package @@ -731,6 +742,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked, relocatable Guile. (tarball-package %guile-static-stripped)) +(define %mescc-tools-bootstrap-tarball + ;; A tarball with MesCC binary seed. + (tarball-package %mescc-tools-static)) + (define %mes-bootstrap-tarball ;; A tarball with Mes ASCII Seed and binary Mes C Library. (tarball-package %mes-stripped)) -- cgit v1.2.3 From 02d83c247931045cf899433223e1b1a51f605a9f Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 2 Nov 2018 17:56:32 +0100 Subject: gnu: libgcrypt: Update to 1.8.4. Update libgcrypt and remove reproducibility patch, it is now built-in. See https://dev.gnupg.org/T4102 * gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.4. [source]: Remove patch. * gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: Delete file. * gnu/local.mk(dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 7 ++--- .../libgcrypt-make-yat2m-reproducible.patch | 32 ---------------------- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 798b1e9209..773d55ff18 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -886,7 +886,6 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ - %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 3d6727bbde..0b8d3e578e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,16 +98,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")) - (patches - (search-patches "libgcrypt-make-yat2m-reproducible.patch")))) + "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch deleted file mode 100644 index 3056f0baad..0000000000 --- a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making -the build reproducible. - -This was already fixed upstream in GnuPG: -https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb - -and in libgpg-error: -https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64 - - ---- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100 -+++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200 -@@ -1475,6 +1484,7 @@ - main (int argc, char **argv) - { - int last_argc = -1; -+ const char *s; - - opt_source = "GNU"; - opt_release = ""; -@@ -1608,6 +1618,11 @@ - if (argc > 1) - die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n"); - -+ /* Take care of supplied timestamp for reproducible builds. See -+ * https://reproducible-builds.org/specs/source-date-epoch/ */ -+ if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s) -+ opt_date = s; -+ - /* Start processing. */ - if (argc && strcmp (*argv, "-")) - { -- cgit v1.2.3 From a647da364ac494b409114a52e48dc0dab03cbf4f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 18 Nov 2018 13:41:18 +0100 Subject: bootstrap: Add %mes-minimal. %mes-minimal introduces a Mes for bootstrap that does not depend on graphviz, perl, and texinfo and thus does not build any documentation. This removes ~100 dependencies from bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%mes-minimal): New variable. (%mes-minmal-stripped): Rename from %mes-stripped. (%mes-bootstrap-tarball): Update. --- gnu/packages/make-bootstrap.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 36a5f6904c..1897a6d12b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -546,11 +546,36 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ((#:make-flags flags) `(cons "CC=gcc -static" ,flags)))))) -(define %mes-stripped +(define %mes-minimal + ;; A minimal Mes without documentation dependencies, for bootstrap. + (let ((triplet "i686-unknown-linux-gnu")) + (package + (inherit mes) + (name "mes-minimal") + (native-inputs + `(("guile" ,guile-2.2) + ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) + (%current-system)))) + ;; Use cross-compiler rather than #:system "i686-linux" to get + ;; MesCC 64 bit .go files installed ready for use with Guile. + `(("i686-linux-binutils" ,(cross-binutils triplet)) + ("i686-linux-gcc" ,(cross-gcc triplet))) + '()))) + (arguments + `(#:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'optional-dot + (lambda _ + (substitute* "configure" + (("#:version-option \"-V\"" all) + (string-append all "#:optional? #t"))))))))))) + +(define-public %mes-minimal-stripped ;; The subset of Mes files needed for bootstrap. (package - (inherit mes) - (name "mes-stripped") + (inherit %mes-minimal) + (name "mes-minimal-stripped") (build-system trivial-build-system) (source #f) (arguments @@ -573,7 +598,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (string-suffix? ".c" file))) (find-files out ".*"))) #t)))) - (inputs `(("mes" ,mes))))) + (inputs `(("mes" ,%mes-minimal))))) (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search @@ -748,7 +773,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %mes-bootstrap-tarball ;; A tarball with Mes ASCII Seed and binary Mes C Library. - (tarball-package %mes-stripped)) + (tarball-package %mes-minimal-stripped)) (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for -- cgit v1.2.3 From b00a95be28b7c663cf8f82ef03b385d32ca51ae9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:30:00 +0100 Subject: bootstrap: Add %bootstrap-mescc-tools. Built with a647da364ac494b409114a52e48dc0dab03cbf4f bootstrap: Add %mes-minimal. * gnu/packages/bootstrap.scm (%bootstrap-mescc-tools): New variable. --- gnu/packages/bootstrap.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 7e6200c576..3cc43934fb 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -49,6 +49,7 @@ %bootstrap-gcc %bootstrap-glibc %bootstrap-inputs + %bootstrap-mescc-tools %bootstrap-mes %mescc-tools-seed %srfi-43)) @@ -615,6 +616,54 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %bootstrap-mescc-tools + ;; The initial MesCC tools. Uses binaries from a tarball typically built by + ;; %MESCC-TOOLS-BOOTSTRAP-TARBALL. + (package + (name "bootstrap-mescc-tools") + (version "0.5.2") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 popen)) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")))))))) + (inputs + `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) + ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + ("tarball" ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "http://lilypond.org/janneke/mes/" + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz")))) + (sha256 + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + (base32 "0dkwl8mjmmizx7gba9spiq9sp8c5fqv7370qakggy5nxpply59jh"))))))))) + (synopsis "Bootstrap binaries of MesCC Tools") + (description synopsis) + (home-page #f) + (license gpl3+))) + (define %bootstrap-mes ;; The initial Mes. Uses binaries from a tarball typically built by ;; %MES-BOOTSTRAP-TARBALL. -- cgit v1.2.3 From 562c37c7beaea9e6912d5ae1c7f7dc8d2a2a3a64 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 18 Nov 2018 16:12:56 +0100 Subject: bootstrap: Update %bootstrap-mes. Built with b00a95be28b7c663cf8f82ef03b385d32ca51ae9 bootstrap: Add %bootstrap-mescc-tools. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3cc43934fb..620f888eb0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -701,16 +701,13 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (uri (string-append "http://lilypond.org/janneke/mes/" (match (%current-system) - ("x86_64-linux" "mes-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz") - ("i686-linux" "mes-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) + ((or "i686-linux" "x86_64-linux") + "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) (sha256 (match (%current-system) - ("x86_64-linux" - (base32 - "1yhxqf1sm67gwjbkkc26m4lcscvpjfmi71bzy8rhysal4lcj1vc8")) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") (base32 - "1p116ya9n52852bryh34n7db4mhvi98qifmmwygl7nbyc4dz92jy"))))))))) + "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From 4fd4efc812b18c11a2ed22a13befc630f5b95434 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:30:28 +0100 Subject: bootstrap: Replace %mescc-tools-seed with %bootstrap-mescc-tools. * gnu/packages/bootstrap.scm (%mescc-tools-seed): Remove. (%bootstrap-inputs): Replace %mescc-tools-seed with %bootstrap-mescc-tools. * gnu/packages/commencement.scm (mes-boot): Likewise. (tcc-boot0): Likewise. (mescc-tools-boot): Remove. --- gnu/packages/bootstrap.scm | 14 +------- gnu/packages/commencement.scm | 78 ++----------------------------------------- 2 files changed, 3 insertions(+), 89 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 620f888eb0..93e9d8ddbd 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -51,7 +51,6 @@ %bootstrap-inputs %bootstrap-mescc-tools %bootstrap-mes - %mescc-tools-seed %srfi-43)) ;;; Commentary: @@ -713,17 +712,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ - (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" - "/-/archive/" commit - "/mescc-tools-seed-" commit ".tar.gz")) - (sha256 - (base32 - "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) - (define %srfi-43 (origin (method url-fetch) @@ -739,7 +727,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ `(,@(match (%current-system) ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("mescc-tools-seed" ,%mescc-tools-seed) + ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) ("mes" ,%bootstrap-mes) ("srfi-43" ,%srfi-43 ))) (_ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4def178a83..ed8a429c23 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -106,79 +106,6 @@ (native-inputs '()) (propagated-inputs '())))) -(define mescc-tools-boot - (package-with-bootstrap-guile - (package - (inherit mescc-tools) - (name "mescc-tools-boot") - (version "0.5.2") - (source (origin - (method url-fetch) - (uri (string-append - "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" - name "-Release_" version - ".tar.gz")) - (patches (search-patches "mescc-tools-boot.patch")) - (file-name (string-append "mescc-tools" "-" version ".tar.gz")) - (sha256 - (base32 - "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-source" ,(package-source mes-boot0)) - - ("bootstrap-mes" ,%bootstrap-mes) - ("coreutils" ,%bootstrap-coreutils&co))) - (build-system gnu-build-system) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-source (assoc-ref %build-inputs "mes-source")) - (out (assoc-ref %outputs "out"))) - (with-directory-excursion ".." - (and - (mkdir-p "mescc-tools-seed") - (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" - "-xvf" mescc-tools-seed) - (mkdir-p "mes-source") - (invoke "tar" "--strip=1" "-C" "mes-source" - "-xvf" mes-source) - #t))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes")) - (out (assoc-ref %outputs "out"))) - (setenv "PATH" (string-append coreutils "/bin" - ":" "../mescc-tools-seed")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (setenv "PREFIX" out) - (setenv "MES_PREFIX" "../mes-source") - (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" (string-append bootstrap-mes "/lib")) - #t))) - (replace 'build - (lambda _ - (invoke "sh" "build.sh"))) - (replace 'check - (lambda _ - ;; bootstrap build.sh lacks exec_enable, get_machine, and - ;; kaem_machine - ;; (invoke "sh" "check.sh") - #t)) - (replace 'install - (lambda _ - (invoke "sh" "install.sh"))))))))) - (define nyacc-boot (let ((version "0.86.0") (revision "0") @@ -211,7 +138,7 @@ (inputs '()) (propagated-inputs '()) (native-inputs - `(("mescc-tools" ,mescc-tools-boot) + `(("mescc-tools" ,%bootstrap-mescc-tools) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) @@ -332,7 +259,7 @@ (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("mescc-tools" ,mescc-tools-boot) + ("mescc-tools" ,%bootstrap-mescc-tools) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) @@ -393,7 +320,6 @@ (setenv "OBJDUMP" "true") (setenv "ONE_SOURCE" "1") (setenv "PREPROCESS" "1") - (setenv "MES_DEBUG" "1") (setenv "MES_ARENA" "70000000") (setenv "MES_MAX_ARENA" "70000000") -- cgit v1.2.3 From d9ed0a46301e259c3082fcc67678e72ceae19a2d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:58:37 +0100 Subject: bootstrap: Update %bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs): Update to use %mescc-tools-bootstrap-tarball, %mes-bootstrap-tarball, %linux-libre-headers-bootstrap-tarball. --- gnu/packages/make-bootstrap.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 1897a6d12b..fa3914cde7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -804,10 +804,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) ,@(match (%current-system) - ("i686-linux" `(("mescc-tools-seed" ,(@ (gnu packages bootstrap) %mescc-tools-seed)) - ("mes-seed" ,(@ (gnu packages bootstrap) %mes-seed)) - ("srfi-43" ,(@ (gnu packages bootstrap) %srfi-43)) - ("tinycc-seed" ,(@ (gnu packages bootstrap) %tinycc-seed)))) + ((or "i686-linux" "x86_64-linux") + `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) + ("bootstrap-mes" ,%mes-bootstrap-tarball) + ("bootstrap-linux-libre-headers" + ,%linux-libre-headers-bootstrap-tarball))) (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) ("binutils-tarball" ,%binutils-bootstrap-tarball) ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) -- cgit v1.2.3 From da91723cc5bba433f59ac40ee669d97e4cbc0e45 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 20 Nov 2018 08:12:09 +0100 Subject: bootstrap: Force i686-linux for bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%mescc-tools-static): Force i686-linux for bootstrap-tarballs. (%mes-minimal): Likewise. Remove i686-linux cross-compiler dependency. * gnu/packages/commencement.scm (mes-boot): Support strict i686-linux build on x86_64. --- gnu/packages/commencement.scm | 2 ++ gnu/packages/make-bootstrap.scm | 19 +++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ed8a429c23..3d3f8e6650 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -174,6 +174,8 @@ (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "GUILE_LOAD_PATH" "nyacc") (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile + (substitute* "configure.sh" + (("^arch=.*") "arch=i686\n")) (invoke "bash" "configure.sh" (string-append "--prefix=" out)) (setenv "MES" "src/mes") diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index fa3914cde7..761420af67 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -542,9 +542,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inherit mescc-tools) (name "mescc-tools-static") (arguments - (substitute-keyword-arguments (package-arguments mescc-tools) - ((#:make-flags flags) - `(cons "CC=gcc -static" ,flags)))))) + `(#:system "i686-linux" + ,@(substitute-keyword-arguments (package-arguments mescc-tools) + ((#:make-flags flags) + `(cons "CC=gcc -static" ,flags))))))) (define %mes-minimal ;; A minimal Mes without documentation dependencies, for bootstrap. @@ -553,16 +554,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inherit mes) (name "mes-minimal") (native-inputs - `(("guile" ,guile-2.2) - ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) - (%current-system)))) - ;; Use cross-compiler rather than #:system "i686-linux" to get - ;; MesCC 64 bit .go files installed ready for use with Guile. - `(("i686-linux-binutils" ,(cross-binutils triplet)) - ("i686-linux-gcc" ,(cross-gcc triplet))) - '()))) + `(("guile" ,guile-2.2))) (arguments - `(#:strip-binaries? #f + `(#:system "i686-linux" + #:strip-binaries? #f #:phases (modify-phases %standard-phases (add-before 'configure 'optional-dot -- cgit v1.2.3 From f4bf64138c9628114173e999f080c4fad3fec975 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:08:02 +0200 Subject: gnu: Remove gcc-for-libstdc++. * gnu/packages/commencement.scm (gcc-for-libstdc++): Remove variable. (libstdc++-boot0): Inherit GCC-4.9 instead. --- gnu/packages/commencement.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3d3f8e6650..015211f493 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1620,25 +1620,12 @@ exec " gcc "/bin/" program ,cf))))) (inputs (%boot0-inputs))))) -;; Use a "fixed" package source for this early libstdc++ variant so we can -;; update GCC 4.9 without triggering a full rebuild. -(define gcc-for-libstdc++ - (package - (inherit gcc-4.9) - (source (origin - (inherit (package-source gcc-4.9)) - (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" - "gcc-arm-bug-71399.patch" - "gcc-asan-missing-include.patch" - "gcc-libvtv-runpath.patch" - "gcc-fix-texi2pod.patch")))))) - (define libstdc++-boot0 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; C++14 features missing in some of our bootstrap compilers. - (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-for-libstdc++)))) + (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) (package (inherit lib) (name "libstdc++-boot0") -- cgit v1.2.3 From a6facf94828b7215566c724822f00feee36f60a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:13:06 +0200 Subject: gnu: libstdc++-boot0: Improve gcc-wrapper workaround. * gnu/packages/commencement.scm (libstdc++-boot0): Adjust the configure script instead of copying libstdc++.so from %BOOT0-INPUTS. --- gnu/packages/commencement.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 015211f493..467a1585ff 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1641,17 +1641,13 @@ exec " gcc "/bin/" program (substitute-keyword-arguments (package-arguments lib) ((#:phases phases) `(modify-phases ,phases - ;; FIXME: why doesn't this package build libstdc++.so.6.0.20, - ;; when gcc-mesboot builds it fine? - ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libstdc++.so.6.0.20 /gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20 - ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory - (add-after 'build 'copy-libstdc++- - (lambda* (#:key outputs #:allow-other-keys) - (let ((gcc (assoc-ref %build-inputs "gcc")) - (out (assoc-ref outputs "out"))) - (copy-file (string-append gcc "/lib/libstdc++.so.6.0.20") - (string-append "src/.libs/libstdc++.so.6.0.20")) - #t))))))) + (add-after 'unpack 'workaround-wrapper-bug + ;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to + ;; fail, which in turn confuses the configure script. + (lambda _ + (substitute* "libstdc++-v3/configure" + (("g\\+\\+ -v") "true")) + #t)))))) (_ (package-arguments lib))))) (inputs (%boot0-inputs)) (native-inputs '())))) -- cgit v1.2.3 From 77e02d948c9e16ae894ea0eba2c1e706d03d09e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:16:08 +0200 Subject: gnu: gcc-boot0: Improve gcc-wrapper workarounds. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Adjust the libcc1 build scripts instead of copying libcc1.so from %BOOT0-INPUTS. --- gnu/packages/commencement.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 467a1585ff..f9770425a8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1731,13 +1731,18 @@ exec " gcc "/bin/" program #t))) ,(match (%current-system) ((or "i686-linux" "x86_64-linux") - '(add-after 'build 'libtool-workaround - (lambda _ - ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 - ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory - (system* "touch" - "libcc1/.libs/libcc1.so.0.0.0" - "libcc1/.libs/libcc1plugin.so.0.0.0")))) + '(add-before 'configure 'fix-libcc1 + (lambda* (#:key inputs #:allow-other-keys) + ;; libcc1.so NEEDs libgcc_s.so, so provide one here + ;; to placate the 'validate-runpath' phase. + (substitute* "libcc1/Makefile.in" + (("la_LDFLAGS =") + (string-append "la_LDFLAGS = -Wl,-rpath=" + (assoc-ref inputs "gcc") "/lib"))) + ;; XXX: "g++ -v" is broken (see also libstdc++ above). + (substitute* "libcc1/configure" + (("g\\+\\+ -v") "true")) + #t))) (_ identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 4ae7dc7b9af64794081b1913740b97acd89c91bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 16:06:35 +0200 Subject: gnu: Remove duplicate linux-libre-headers package from bootstrap inputs. GLIBC-FINAL already propagates linux-libre-headers, so drop the bootstrap input. * gnu/packages/commencement.scm (%boot2-inputs): Remove %BOOTSTRAP-LINUX-LIBRE-HEADERS. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f9770425a8..70b9b8176f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2195,7 +2195,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("gcc" ,(gcc-boot0-wrapped)) - ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) + ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" "linux-libre-headers")))) (define binutils-final (package-with-bootstrap-guile -- cgit v1.2.3 From e66c6eb2bc71736df5aaad23eaf2778be46fd88f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 5 Dec 2018 20:03:54 +0000 Subject: gnu: python: Update to 3.7.1. Remove the replacement, as version 3.7.1 includes the fix for this issue. * gnu/packages/python.scm (python-3.7): Update to 3.7.1. (python-3/fixed): Remove this. --- gnu/packages/python.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 46ce0dde40..176bbb9416 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -341,8 +341,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.0") - (replacement python-3/fixed) + (version "3.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -355,7 +354,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3")) + "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps")) (snippet '(begin (for-each delete-file @@ -414,14 +413,6 @@ data types.") ;; Current 3.x version. (define-public python-3 python-3.7) -(define python-3/fixed - (package - (inherit python-3) - (source (origin - (inherit (package-source python-3)) - (patches (append (origin-patches (package-source python-3)) - (search-patches "python-CVE-2018-14647.patch"))))))) - ;; Current major version. (define-public python python-3) -- cgit v1.2.3 From 99ff4b102c82d27a7d0bd3054f97226d28dfc8eb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Nov 2018 16:21:03 +0100 Subject: bootstrap: mes-boot: Use mes-boot0 version. * gnu/packages/commencement.scm (mes-boot): Use mes-boot0 version. --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 70b9b8176f..c46aeed04a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -133,6 +133,7 @@ (package-with-bootstrap-guile (package (inherit mes) + (version (package-version mes-boot0)) (source (package-source mes-boot0)) (name "mes-boot") (inputs '()) -- cgit v1.2.3 From da3c6a7f19ef1243af725f63c16c8fd92fde33b4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 24 Nov 2018 08:49:48 +0100 Subject: bootstrap: Switch to official bootstrap urls. Built with 4ae7dc7b9af64794081b1913740b97acd89c91bc gnu: Remove duplicate linux-libre-headers package from bootstrap inputs. * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Switch to official bootstrap urls. (%bootstrap-mescc-tools): Likewise. (%bootstrap-mes): Likewise. --- gnu/packages/bootstrap.scm | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 93e9d8ddbd..eac729f785 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -405,14 +405,13 @@ $out/bin/guile --version~%" (lambda (system) (origin (method url-fetch) - (uri (match system - ((or "i686-linux" - "x86_64-linux") - "http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.14.26-i686-linux.tar.xz") - (_ (error "linux-libre-headers-bootstrap: system not supported")))) + (uri (map (cute string-append <> + "/i686-linux/20181020/" + "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (base32 - "0nwspwydn089xbd28nnas762iwl6l9ymbcz170qvfi50ywgim1ma")))) + "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s")))) #f ; no program to test "Bootstrap linux-libre-headers")) @@ -646,18 +645,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/" - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz")))) - (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 "0dkwl8mjmmizx7gba9spiq9sp8c5fqv7370qakggy5nxpply59jh"))))))))) + ("tarball" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") + %bootstrap-base-urls)) + (sha256 + (base32 + "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz"))))))) (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) @@ -694,19 +693,20 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/" - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) - (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 - "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) + ("tarball" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + (base32 + "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From f9e51e9737a6ccb8efb5074a2b4e66f7c0fcb2ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:50:30 +0100 Subject: gnu: libgc: Update to 7.6.8. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.8. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index c7491f845f..a5130f5e85 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -30,14 +30,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.6") + (version "7.6.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79")))) + "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 2b4a4e8e47f5cd5cdb5e8cadc7a4fc4b9d15e719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:50:56 +0100 Subject: gnu: libatomic-ops: Update to 7.6.8. * gnu/packages/bdw-gc.scm (libatomic-ops): Update to 7.6.8. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index a5130f5e85..d816b66615 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.6") + (version "7.6.8") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr")))) + "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") -- cgit v1.2.3 From 9abbfd3ca6025a9142c53de6247a82864b3bf643 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:55:09 +0100 Subject: gnu: perl: Update to 5.28.1. * gnu/packages/perl.scm (perl): Update to 5.28.1. --- 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 8c854e88df..4dcc4bea66 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -62,14 +62,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.0") + (version "5.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky")) + "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From c4ac237f0898a56bcbb21e739ed4fdd51f9ac66f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 23:03:27 +0100 Subject: gnu: bison: Update to 3.2.2. * gnu/packages/bison.scm (bison): Update to 3.2.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 71de47762d..c1323d83ec 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -30,7 +30,7 @@ (define-public bison (package (name "bison") - (version "3.0.5") + (version "3.2.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07")))) + "1yps7xyhllbg9rbb9mii1z736w85yh26vqvhr1y5qx6hwhj0z5bg")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From d52680eec04c83c9350ebedebea19f9aa67ac1e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 23:27:09 +0100 Subject: gnu: libxml2: Don't reference libxml2.a in the default output. * gnu/packages/xml.scm (libxml2)[arguments]: Add substitution for libxml2.la. --- gnu/packages/xml.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index fd4c3fea2c..b85064ed7f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -145,6 +145,12 @@ hierarchical form with variable field lengths.") (rename-file ar (string-append dst "/" (basename ar)))) (find-files src "\\.a$")) + + ;; Remove reference to the static library from the .la + ;; file such that Libtool does the right thing when both + ;; the shared and static variants are available. + (substitute* (string-append src "/libxml2.la") + (("^old_library='libxml2.a'") "old_library=''")) #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") -- cgit v1.2.3 From 5b2da2a659bea9a442a36c89be241a1d6c820d45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 20:08:28 +0100 Subject: gnu: xz: Move liblzma.a to separate output. * gnu/packages/compression.scm (xz)[arguments, outputs]: New fields. * gnu/packages/make-bootstrap.scm (%static-inputs)[xz]: Don't inherit outputs. --- gnu/packages/compression.scm | 17 +++++++++++++++++ gnu/packages/make-bootstrap.scm | 1 + 2 files changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e8a50c676c..69f72906b6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -425,6 +425,23 @@ compressed with pbzip2 can be decompressed with bzip2).") (base32 "0ibi2zsfaz6l756spjwc5rayf4ckgc9hwmy8qinppcyk4svz64mm")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-static-lib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (rename-file (string-append out "/lib/liblzma.a") + (string-append static "/lib/liblzma.a")) + ;; Remove reference to the static library from the .la file + ;; so Libtool does the right thing when both the shared and + ;; static library is available. + (substitute* (string-append out "/lib/liblzma.la") + (("^old_library='liblzma.a'") "old_library=''")) + #t)))))) + (outputs '("out" "static")) (synopsis "General-purpose data compression") (description "XZ Utils is free general-purpose data compression software with high diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 761420af67..d0f8d62f2f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -159,6 +159,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "LDFLAGS = -static")) #t)))))))) (xz (package (inherit xz) + (outputs '("out")) (arguments `(#:strip-flags '("--strip-all") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From fafa78969eb9a3b5ebaaededc91cab8fc1c208d4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 13 Dec 2018 13:57:25 +0100 Subject: gnu: llvm-rtti: Remove it. This reverts commit f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d. It sounds from the comment that this should be removed now, as it's been a while since this change was made. * gnu/packages/llvm.scm (llvm-without-rtti): Remove it. * gnu/packages/gl.scm (mesa)[inputs]: Switch to using llvm rather than llvm-without-rtti. --- gnu/packages/gl.scm | 3 +-- gnu/packages/llvm.scm | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d7c112928f..5313a74e5c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -255,8 +255,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - ;; FIXME: Change to 'llvm' in the next rebuild cycle. - `(("llvm" ,llvm-without-rtti))) + `(("llvm" ,llvm))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8a9d1d312b..4be86f3d21 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,26 +95,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 -;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of -;; this in the next rebuild cycle. -(define-public llvm-without-rtti - (package - (inherit llvm) - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_ENABLE_FFI:BOOL=TRUE" - "-DLLVM_INSTALL_UTILS=ON") - #:build-type "Release" - #:phases (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t))))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package -- cgit v1.2.3 From efa1ea20e6010e71257076cfa4fd7ca0fe2b825c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 12 Dec 2018 15:55:54 +0100 Subject: bootstrap: mes-minimal-stripped: Do not strip bin. * gnu/packages/make-bootstrap.scm (%mes-minimal-stripped): Do not strip bin. --- gnu/packages/make-bootstrap.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d0f8d62f2f..7ce05fe611 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -584,9 +584,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (setvbuf (current-output-port) _IOLBF) (let* ((out (assoc-ref %outputs "out")) + (bindir (string-append out "/bin")) (libdir (string-append out "/lib")) (mes (assoc-ref %build-inputs "mes"))) + (copy-recursively (string-append mes "/bin") bindir) (copy-recursively (string-append mes "/lib") libdir) (copy-recursively (string-append mes "/share/mes/lib") libdir) (for-each remove-store-references -- cgit v1.2.3 From 464baaf7359a5c0192ade7e435f7384a335679e6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 18:24:21 +0100 Subject: gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. core: Support \xNN in reader. Fixes tcc-boot running on Mes. * gnu/packages/mes.scm (mes): Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. --- gnu/packages/mes.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7f7caa7a6d..844c130383 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -61,8 +61,8 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public mes (let ((triplet "i686-unknown-linux-gnu") (version "0.18") - (revision "0") - (commit "08f04f559670d9e8f57eb03bb9b13f4d0b81cedf")) + (revision "1") + (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) (package (name "mes") (version (string-append version "-" revision "." (string-take commit 7))) @@ -74,7 +74,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") ".tar.gz")) (sha256 (base32 - "1b7wz9k38pfrz707pd4p8s54q903jr167q73ya7qkna89sxj3wna")))) + "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs -- cgit v1.2.3 From f8067e0329d2fca96abbae8988913d6bfa8bcfd3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 02:27:05 +0100 Subject: bootstrap: bootstrap-mes: Update. Built with 464baaf7359a5c0192ade7e435f7384a335679e6 gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index eac729f785..59fd2784f2 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -697,16 +697,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (map - (cute string-append <> - "/i686-linux/20181020/" - "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") - %bootstrap-base-urls)) + (uri (string-append + "http://lilypond.org/janneke/guix/20181214/" + "mes-minimal-stripped-0.18-1.a155a0a-i686-linux.tar.xz")) (sha256 (match (%current-system) ((or "i686-linux" "x86_64-linux") (base32 - "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) + "06nzpryzh1blldlfdg256176cs3g1qyn3qs9yabzlbx7ps5pq3h3"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From cdd3bcf03883d129581a79e6d6611b2afd3b277b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 02:29:28 +0100 Subject: bootstrap: Do not fake, use Mes instead of Guile. * gnu/packages/commencement.scm (%fake-bootstrap?): Do not fake, use Mes instead of Guile. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c46aeed04a..06bf2144dd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,7 +81,7 @@ ;;; ;;; Code: -(define %fake-bootstrap? #t) ; cheat using Guile (instead of Mes) in MesCC +(define %fake-bootstrap? #f) ; cheat using Guile (instead of Mes) in MesCC ; for speed-up? (define mes-boot0 -- cgit v1.2.3 From 9c14fd07708e0824c493f273a236747631799261 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 14:08:14 +0100 Subject: bootstrap: Remove development hacks. * gnu/packages/commencement.scm (%fake-bootstrap?): Remove. Update users to always keep true bootstrap; i.e., do not use %bootstrap-guile. (mes-boot0): Remove. Update users. (nyacc-boot): Likewise. --- gnu/packages/commencement.scm | 113 +++--------------------------------------- 1 file changed, 7 insertions(+), 106 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 06bf2144dd..108db5a75d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,73 +81,19 @@ ;;; ;;; Code: -(define %fake-bootstrap? #f) ; cheat using Guile (instead of Mes) in MesCC - ; for speed-up? - -(define mes-boot0 - (let ((version "0.18") - (revision "0") - (commit #f)) - (package - (inherit mes) - (name "mes-boot0") - (version (if commit (string-append version "-" revision "." (string-take commit 7)) - version)) - (source (if commit - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes" - "/-/archive/" commit - "/mes-" commit ".tar.gz")) - (sha256 - (base32 - "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (package-source mes))) - (native-inputs '()) - (propagated-inputs '())))) - -(define nyacc-boot - (let ((version "0.86.0") - (revision "0") - (commit #f)) - (package - (inherit nyacc) - (name "nyacc-boot") - (version - (if commit - (string-append version "-" revision "." (string-take commit 7)) - version)) - (source - (if commit - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/nyacc" - "/-/archive/" commit - "/nyacc-" commit ".tar.gz")) - (sha256 - (base32 - "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"))) - (package-source nyacc)))))) - (define mes-boot (package-with-bootstrap-guile (package (inherit mes) - (version (package-version mes-boot0)) - (source (package-source mes-boot0)) (name "mes-boot") (inputs '()) (propagated-inputs '()) (native-inputs `(("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc-boot)) + ("nyacc-source" ,(package-source nyacc)) ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes) - ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile - `(("guile" ,%bootstrap-guile) - ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick - '()))) + ("bootstrap-mes" ,%bootstrap-mes))) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -181,35 +127,12 @@ (string-append "--prefix=" out)) (setenv "MES" "src/mes") (setenv "MESCC" "scripts/mescc") - (when ,%fake-bootstrap? ; Cheat using Guile+Nyacc+MesCC; ~30 times faster - (let ((dir (with-directory-excursion ".." (getcwd))) - (guile (assoc-ref %build-inputs "guile")) - (srfi-43 (assoc-ref %build-inputs "srfi-43"))) - (setenv "MES" "guile") - (setenv "GUILE_AUTO_COMPILE" "1") - (setenv "GUILE_LOAD_COMPILED_PATH" - (string-append guile "/lib/guile/2.0/ccache")) - (setenv "GUILE_LOAD_PATH" - (string-append (string-append dir "/nyacc-source/module") - ":" dir - ":" guile "/share/guile/2.0/")) - ;; these fail with guile-2.0 - (when srfi-43 - (delete-file "tests/srfi-9.test") - (delete-file "tests/srfi-43.test")) - ;; give auto-compile a home -- massive speed-up - (mkdir-p "/tmp/home") - (setenv "HOME" "/tmp/home"))) #t))) (replace 'build (lambda _ (invoke "sh" "build.sh"))) (replace 'check (lambda _ - (when ,%fake-bootstrap? - ;; break with guile-2.0 - (delete-file "scaffold/boot/50-primitive-load.scm") - (delete-file "scaffold/boot/51-module.scm")) (and (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") @@ -263,14 +186,10 @@ (native-inputs `(("mes" ,mes-boot) ("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc-boot)) + ("nyacc-source" ,(package-source nyacc)) ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes) - ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile - `(("guile" ,%bootstrap-guile) - ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick - '()))) + ("bootstrap-mes" ,%bootstrap-mes))) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -325,27 +244,9 @@ (setenv "PREPROCESS" "1") (setenv "MES_ARENA" "70000000") (setenv "MES_MAX_ARENA" "70000000") - - (if ,%fake-bootstrap? - (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster - (setenv "MES" "guile") - (setenv "GUILE_AUTO_COMPILE" "1") - (setenv "GUILE_LOAD_COMPILED_PATH" - (string-append guile "/lib/guile/2.0/ccache")) - (setenv "GUILE_LOAD_PATH" - (string-append dir - ":" guile "/share/guile/2.0/" - ":" dir "/nyacc-source/module" - ":" mes "/share/mes/guile")) - - ;; give auto-compile a home -- massive speed-up - (mkdir-p "/tmp/home") - (setenv "HOME" "/tmp/home")) - - (begin ; True bootstrap build with Mes+Nyacc+MesCC - (setenv "MES" "mes") - (setenv "GUILE_LOAD_PATH" "nyacc") - (symlink (string-append "../nyacc-source/module") "nyacc"))) + (setenv "MES" "mes") + (setenv "GUILE_LOAD_PATH" "nyacc") + (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "sh" "configure" "--prefix=$PREFIX" (string-append "--elfinterp=" interpreter) -- cgit v1.2.3 From c994177155db71fad9312441043fd8790af9092d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 18:52:35 +0100 Subject: gnu: mes: Update to 0.19. * gnu/packages/mes.scm (mes): Update to 0.19. --- gnu/packages/mes.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 844c130383..9aff59ab1d 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -59,22 +59,17 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((triplet "i686-unknown-linux-gnu") - (version "0.18") - (revision "1") - (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) + (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version (string-append version "-" revision "." (string-take commit 7))) + (version "0.19") (source (origin (method url-fetch) - (uri (string-append - "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" - name "-" commit - ".tar.gz")) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) (sha256 (base32 - "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn")))) + "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs @@ -97,11 +92,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries (synopsis "Scheme interpreter and C compiler for full source bootstrapping") (description - "GNU Mes--Maxwell Equations of Software--brings the Reduced -Binary Seed bootstrap to GuixSD and aims to help create full source -bootstrapping for GNU/Linux distributions. It consists of a mutual -self-hosting Scheme interpreter in C and a Nyacc-based C compiler in -Scheme and is compatible with Guile.") + "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed +bootstrap to Guix and aims to help create full source bootstrapping for +GNU/Linux distributions. It consists of a mutual self-hosting Scheme +interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with +Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+)))) -- cgit v1.2.3 From 20dd94b82fc60918d9fdabb609e30ed4414aba95 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 15 Dec 2018 09:01:53 +0100 Subject: bootstrap: Merge mes-minimal into mes-minimal-stripped. * gnu/packages/make-bootstrap.scm (%mes-minimal): Remove. (%mes-minimal-stripped): Configure using --mes. Strip installation. --- gnu/packages/make-bootstrap.scm | 50 +++++++++++------------------------------ 1 file changed, 13 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7ce05fe611..ff0523babc 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -548,55 +548,31 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ((#:make-flags flags) `(cons "CC=gcc -static" ,flags))))))) -(define %mes-minimal +(define-public %mes-minimal-stripped ;; A minimal Mes without documentation dependencies, for bootstrap. (let ((triplet "i686-unknown-linux-gnu")) (package (inherit mes) - (name "mes-minimal") + (name "mes-minimal-stripped") (native-inputs `(("guile" ,guile-2.2))) (arguments `(#:system "i686-linux" #:strip-binaries? #f + #:configure-flags '("--mes") #:phases (modify-phases %standard-phases - (add-before 'configure 'optional-dot + (add-after 'install 'strip-install (lambda _ - (substitute* "configure" - (("#:version-option \"-V\"" all) - (string-append all "#:optional? #t"))))))))))) - -(define-public %mes-minimal-stripped - ;; The subset of Mes files needed for bootstrap. - (package - (inherit %mes-minimal) - (name "mes-minimal-stripped") - (build-system trivial-build-system) - (source #f) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (srfi srfi-1) - (srfi srfi-26) - (guix build utils)) - - (setvbuf (current-output-port) _IOLBF) - (let* ((out (assoc-ref %outputs "out")) - (bindir (string-append out "/bin")) - (libdir (string-append out "/lib")) - (mes (assoc-ref %build-inputs "mes"))) - - (copy-recursively (string-append mes "/bin") bindir) - (copy-recursively (string-append mes "/lib") libdir) - (copy-recursively (string-append mes "/share/mes/lib") libdir) - (for-each remove-store-references - (remove (lambda (file) (or (string-suffix? ".h" file) - (string-suffix? ".c" file))) - (find-files out ".*"))) - #t)))) - (inputs `(("mes" ,%mes-minimal))))) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (delete-file-recursively (string-append out "/lib/guile")) + (delete-file-recursively (string-append share "/guile")) + (delete-file-recursively (string-append share "/mes/scaffold")) + (for-each + delete-file + (find-files (string-append share "/mes/lib") + "\\.(h|c)"))))))))))) (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search -- cgit v1.2.3 From ef809e3ac036eccc5f9c9edd8fb661d14ae15f2f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 19:21:59 +0100 Subject: bootstrap: Add mes-boot0; decouple mes-boot from Mes. * gnu/packages/commencement.scm (mes-boot0): New variable. (mes-boot): Use it. --- gnu/packages/commencement.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 108db5a75d..babad13e5f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,11 +81,36 @@ ;;; ;;; Code: +(define mes-boot0 + (let ((version "0.18") + (revision "1") + (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) + (package + (inherit mes) + (name "mes-boot0") + (version (if commit (string-append version "-" revision "." (string-take commit 7)) + version)) + (source (if commit + (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" + "mes" "-" commit + ".tar.gz")) + (sha256 + (base32 + "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn"))) + (package-source mes))) + (native-inputs '()) + (propagated-inputs '())))) + (define mes-boot (package-with-bootstrap-guile (package (inherit mes) (name "mes-boot") + (version (package-version mes-boot0)) + (source (package-source mes-boot0)) (inputs '()) (propagated-inputs '()) (native-inputs -- cgit v1.2.3 From c89bbcccb2cb5449bc609c1229f1638ac72aeea3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 15 Dec 2018 09:25:39 +0100 Subject: bootstrap: bootstrap-mes: Update. Built with ef809e3ac036eccc5f9c9edd8fb661d14ae15f2f bootstrap: Add mes-boot0; decouple mes-boot from Mes. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 59fd2784f2..760344ba5a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -697,14 +697,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/guix/20181214/" - "mes-minimal-stripped-0.18-1.a155a0a-i686-linux.tar.xz")) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mes-minimal-stripped-0.19-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (match (%current-system) ((or "i686-linux" "x86_64-linux") (base32 - "06nzpryzh1blldlfdg256176cs3g1qyn3qs9yabzlbx7ps5pq3h3"))))))))) + "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From df2242a462559d57b1362793f50667a81b2475d3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Dec 2018 21:16:29 +0100 Subject: bootstrap: mes-boot: Update for mes 0.19. * gnu/packages/commencement.scm (mes-boot): Update for mes 0.19. (mes-boot0): Remove. --- gnu/packages/commencement.scm | 58 +++++++++++-------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index babad13e5f..dfb9fee4c2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,36 +81,11 @@ ;;; ;;; Code: -(define mes-boot0 - (let ((version "0.18") - (revision "1") - (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) - (package - (inherit mes) - (name "mes-boot0") - (version (if commit (string-append version "-" revision "." (string-take commit 7)) - version)) - (source (if commit - (origin - (method url-fetch) - (uri (string-append - "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" - "mes" "-" commit - ".tar.gz")) - (sha256 - (base32 - "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn"))) - (package-source mes))) - (native-inputs '()) - (propagated-inputs '())))) - (define mes-boot (package-with-bootstrap-guile (package (inherit mes) (name "mes-boot") - (version (package-version mes-boot0)) - (source (package-source mes-boot0)) (inputs '()) (propagated-inputs '()) (native-inputs @@ -126,40 +101,35 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (srfi-43 (assoc-ref %build-inputs "srfi-43")) - (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (lambda _ + (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." (and (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/lib") "mes-seed") - (or (not srfi-43) - (and (mkdir-p "srfi") - (copy-file srfi-43 "srfi/srfi-43.scm") - #t))))))) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) - (symlink (string-append "../nyacc-source/module") "nyacc") + (setenv "GUILE" "mes") + (setenv "GUILE_EFFECTIVE_VERSION" "2.2") (setenv "GUILE_LOAD_PATH" "nyacc") - (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile - (substitute* "configure.sh" - (("^arch=.*") "arch=i686\n")) + (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "bash" "configure.sh" - (string-append "--prefix=" out)) - (setenv "MES" "src/mes") - (setenv "MESCC" "scripts/mescc") - #t))) + (string-append "--prefix=" out))))) (replace 'build (lambda _ - (invoke "sh" "build.sh"))) + (let ((mes (assoc-ref %build-inputs "bootstrap-mes"))) + (setenv "MES_PREFIX" (string-append mes "/share/mes")) + (setenv "MES_ARENA" "100000000") + (setenv "MES_MAX_ARENA" "100000000") + (setenv "MES_STACK" "10000000") + (invoke "sh" "bootstrap.sh")))) (replace 'check (lambda _ (and - (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") ;; fail fast tests ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") -- cgit v1.2.3 From b02dc758a5316a8ba164d65f3d0c19fc2e21b408 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Dec 2018 21:17:14 +0100 Subject: bootstrap: tcc-boot0: Update for mes 0.19. * gnu/packages/commencement.scm (tcc-boot0): Update for mes 0.19. --- gnu/packages/commencement.scm | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dfb9fee4c2..bbcc5ac589 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -159,8 +159,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "5") - (commit "c7b3f59d1a71e71b470f859b20f0cfe840f3954d")) + (revision "6") + (commit "c004e9a34fb026bb44d211ab98bb768e79900eef")) (package-with-bootstrap-guile (package (inherit tcc) @@ -173,7 +173,7 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "1agz5w5q6dm51n63hsxii33hxdghmdiacbb5zzxzac3aarfxjb2m")))) + "1hmzn1pq0x22ppd80hyrn5qzqq94mxd0ychzj6vrr2vnj2frjv5b")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) @@ -194,7 +194,6 @@ (add-after 'unpack 'unpack-seeds (lambda* (#:key outputs #:allow-other-keys) (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (setenv "PATH" (string-append @@ -205,17 +204,13 @@ (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/lib") "mes-seed") - (or (not srfi-43) - (and (mkdir-p "srfi") - (copy-file srfi-43 "srfi/srfi-43.scm") - #t))))))) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (dir (with-directory-excursion ".." (getcwd))) (coreutils (assoc-ref %build-inputs "coreutils")) - (guile (assoc-ref %build-inputs "guile")) (mes (assoc-ref %build-inputs "mes")) (mescc-tools (assoc-ref %build-inputs "mescc-tools")) (libc (assoc-ref %build-inputs "libc")) @@ -226,22 +221,18 @@ (setenv "PATH" (string-append coreutils "/bin" ":" mes "/bin" - (if guile (string-append ":" guile "/bin") - "") ":" mescc-tools "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (setenv "PREFIX" out) - (setenv "MESCC" (string-append mes "/bin/mescc")) (symlink (string-append mes "/share/mes") "mes") + (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "MES_PREFIX" "mes") - (setenv "OBJDUMP" "true") - (setenv "ONE_SOURCE" "1") - (setenv "PREPROCESS" "1") - (setenv "MES_ARENA" "70000000") - (setenv "MES_MAX_ARENA" "70000000") + (setenv "MES_ARENA" "100000000") + (setenv "MES_MAX_ARENA" "100000000") + (setenv "MES_STACK" "10000000") (setenv "MES" "mes") (setenv "GUILE_LOAD_PATH" "nyacc") - (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "sh" "configure" "--prefix=$PREFIX" (string-append "--elfinterp=" interpreter) @@ -249,10 +240,13 @@ "--tccdir=.")))) (replace 'build (lambda _ - (invoke "sh" "build.sh"))) + (substitute* "bootstrap.sh" + (("^ cmp") "# cmp")) + (invoke "sh" "bootstrap.sh"))) (replace 'check (lambda _ (setenv "DIFF" "diff.scm") + (setenv "OBJDUMP" "true") ;; fail fast tests ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") -- cgit v1.2.3 From 03a45a40227d97ccafeb49c4eb0fc7539f4d2127 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 17 Dec 2018 07:41:23 +0100 Subject: bootstrap: srfi-43: Remove. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Remove srfi-43. (srfi-43): Remove. --- gnu/packages/bootstrap.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 760344ba5a..72e3d0847f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -50,8 +50,7 @@ %bootstrap-glibc %bootstrap-inputs %bootstrap-mescc-tools - %bootstrap-mes - %srfi-43)) + %bootstrap-mes)) ;;; Commentary: ;;; @@ -712,15 +711,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %srfi-43 - (origin - (method url-fetch) - (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") - (file-name "srfi-43.scm") - (sha256 - (base32 - "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) - (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. @@ -728,8 +718,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) - ("mes" ,%bootstrap-mes) - ("srfi-43" ,%srfi-43 ))) + ("mes" ,%bootstrap-mes))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) -- cgit v1.2.3 From ea8be005d409658dea4f4356e9279784ce0a5a39 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2018 19:57:28 +0100 Subject: gnu: Use i686-linux bootstrap binaries on x86_64-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This saves 4.4 MB on the installed Guix. * gnu/packages/bootstrap/x86_64-linux: Remove directory. * gnu/local.mk (bootstrap_x86_64_linuxdir) (dist_bootstrap_x86_64_linux_DATA): Remove. * gnu/packages.scm (search-bootstrap-binary): When SYSTEM is "x86_64-linux", use "i686-linux" instead. --- gnu/local.mk | 7 ------- gnu/packages.scm | 18 +++++++++++------- gnu/packages/bootstrap/x86_64-linux/bash | Bin 1425560 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/mkdir | Bin 792448 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/tar | Bin 1369912 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/xz | Bin 927264 -> 0 bytes 6 files changed, 11 insertions(+), 14 deletions(-) delete mode 100755 gnu/packages/bootstrap/x86_64-linux/bash delete mode 100755 gnu/packages/bootstrap/x86_64-linux/mkdir delete mode 100755 gnu/packages/bootstrap/x86_64-linux/tar delete mode 100755 gnu/packages/bootstrap/x86_64-linux/xz (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9cf690e0f1..7c970dc47c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1287,18 +1287,11 @@ MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap -bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux -dist_bootstrap_x86_64_linux_DATA = \ - %D%/packages/bootstrap/x86_64-linux/bash \ - %D%/packages/bootstrap/x86_64-linux/mkdir \ - %D%/packages/bootstrap/x86_64-linux/tar \ - %D%/packages/bootstrap/x86_64-linux/xz - dist_bootstrap_i686_linux_DATA = \ %D%/packages/bootstrap/i686-linux/bash \ %D%/packages/bootstrap/i686-linux/mkdir \ diff --git a/gnu/packages.scm b/gnu/packages.scm index 532297239d..333b18f9f0 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -102,14 +102,18 @@ FILE-NAME found in %PATCH-PATH." (define (search-bootstrap-binary file-name system) "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not found." - (or (search-path (%bootstrap-binaries-path) - (string-append system "/" file-name)) - (raise (condition - (&message - (message - (format #f (G_ "could not find bootstrap binary '~a' \ + ;; On x86_64 always use the i686 binaries. + (let ((system (match system + ("x86_64-linux" "i686-linux") + (_ system)))) + (or (search-path (%bootstrap-binaries-path) + (string-append system "/" file-name)) + (raise (condition + (&message + (message + (format #f (G_ "could not find bootstrap binary '~a' \ for system '~a'") - file-name system))))))) + file-name system)))))))) (define %distro-root-directory ;; Absolute file name of the module hierarchy. Since (gnu packages …) might diff --git a/gnu/packages/bootstrap/x86_64-linux/bash b/gnu/packages/bootstrap/x86_64-linux/bash deleted file mode 100755 index b9c410b7cf..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/mkdir b/gnu/packages/bootstrap/x86_64-linux/mkdir deleted file mode 100755 index f8250ae693..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/tar b/gnu/packages/bootstrap/x86_64-linux/tar deleted file mode 100755 index 90e492f89d..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/xz b/gnu/packages/bootstrap/x86_64-linux/xz deleted file mode 100755 index 6bfe3c6d96..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/xz and /dev/null differ -- cgit v1.2.3 From ef5821093adfddf80ec472652b6b00439412fa47 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Dec 2018 20:02:03 +0100 Subject: gnu: glibc: Inline Hurd "pid/…" magic lookup patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/base.scm (glibc)[source](patches): Add "glibc-hurd-magic-pid.patch". [arguments]: Remove 'apply-hurd-patch' phase. [native-inputs]: Remove "hurd-magic-pid-patch". * gnu/packages/cross-base.scm (cross-libc)[arguments]: Remove 'apply-hurd-patch' phase. [native-inputs]: Remove "hurd-magic-pid-patch". --- gnu/packages/base.scm | 17 ++--------------- gnu/packages/cross-base.scm | 21 +-------------------- 2 files changed, 3 insertions(+), 35 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 64f60a928e..127ac7a75f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -607,6 +607,7 @@ store.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" + "glibc-hurd-magic-pid.patch" "glibc-supported-locales.patch")))) (build-system gnu-build-system) @@ -682,18 +683,6 @@ store.") #:tests? #f ; XXX #:phases (modify-phases %standard-phases - ,@(if (hurd-target?) - `((add-after 'unpack 'apply-hurd-patch - (lambda* (#:key inputs native-inputs - #:allow-other-keys) - ;; TODO: Move this to 'patches' field. - (let ((patch (or (assoc-ref native-inputs - "hurd-magic-pid-patch") - (assoc-ref inputs - "hurd-magic-pid-patch")))) - (invoke "patch" "-p1" "--force" "--input" - patch))))) - '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs native-inputs outputs @@ -819,9 +808,7 @@ store.") ,@(if (hurd-target?) `(("mig" ,mig) - ("perl" ,perl) - ("hurd-magic-pid-patch" - ,(search-patch "glibc-hurd-magic-pid.patch"))) + ("perl" ,perl)) '()))) (native-search-paths diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bb3d6d916a..2fcb7fb36b 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -454,23 +454,6 @@ XBINUTILS and the cross tool chain." flags))) ((#:phases phases) `(modify-phases ,phases - ;; XXX: The hack below allows us to make sure the - ;; 'apply-hurd-patch' phase gets added in the first - ;; cross-libc, but does *not* get added twice subsequently - ;; when cross-building another libc. - ,@(if (and (hurd-triplet? target) - (not (hurd-target?))) - `((add-after 'unpack 'apply-hurd-patch - (lambda* (#:key inputs native-inputs - #:allow-other-keys) - ;; TODO: Move this to 'patches' field. - (let ((patch (or (assoc-ref native-inputs - "hurd-magic-pid-patch") - (assoc-ref inputs - "hurd-magic-pid-patch")))) - (invoke "patch" "-p1" "--force" "--input" - patch))))) - '()) (add-before 'configure 'set-cross-kernel-headers-path (lambda* (#:key inputs #:allow-other-keys) (let* ((kernel (assoc-ref inputs "kernel-headers")) @@ -494,9 +477,7 @@ XBINUTILS and the cross tool chain." ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig")) - ("hurd-magic-pid-patch" - ,(search-patch "glibc-hurd-magic-pid.patch"))) + "cross-mig"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc))))))) -- cgit v1.2.3 From b659e97adc462b221692696b641602a5873902b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Dec 2018 01:39:17 +0100 Subject: gnu: grep: Update to 3.3. * gnu/packages/base.scm (grep): Update to 3.3. [arguments]: Remove 'disable-failing-tests' phase. --- gnu/packages/base.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 127ac7a75f..663d3d8692 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -87,14 +87,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "3.1") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv")) + "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r")) (patches (search-patches "grep-timing-sensitive-test.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it @@ -102,15 +102,6 @@ command-line arguments, multiple languages, and so on.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-failing-tests - (lambda _ - ;; These tests are expected to fail due to a glibc bug which has - ;; been fixed in 2.28, so they are unexpectedly passing. They - ;; should be fixed for grep versions > 3.1. - (substitute* "tests/Makefile.in" - (("^[[:blank:]]+backref-alt[[:blank:]]+\\\\") "\\") - (("^[[:blank:]]+triple-backref[[:blank:]]+\\\\") "\\")) - #t)) (add-after 'install 'fix-egrep-and-fgrep ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; absolute file name instead of searching for it in $PATH. -- cgit v1.2.3 From dad2e7dc79112733dd5e1086ba77aa1daddb0c49 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Dec 2018 01:39:52 +0100 Subject: gnu: sed: Update to 4.7. * gnu/packages/base.scm (sed): Update to 4.7. [arguments]: Remove. --- gnu/packages/base.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 663d3d8692..2c5e7c6455 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -128,28 +128,16 @@ including, for example, recursive directory searching.") (define-public sed (package (name "sed") - (version "4.5") + (version "4.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/sed/sed-" version ".tar.xz")) (sha256 (base32 - "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs")))) + "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198")))) (build-system gnu-build-system) (synopsis "Stream editor") - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'dont-rebuild-sed.1 - (lambda _ - ;; Make sure we do not attempt to rebuild 'doc/sed.1', which does - ;; not work when cross-compiling because we cannot run 'sed'. - ;; This is fixed upstream as commit a0a25e3. - (substitute* "Makefile.in" - (("^doc/sed\\.1:.*") - "doc/sed.1:\n")) - #t))))) (native-inputs `(("perl" ,perl))) ;for tests (description -- cgit v1.2.3 From 0b07f22728488f2f85624b716e5398bbb3a4165d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 25 Dec 2018 02:16:25 +0100 Subject: gnu: bootstrap: Add missing 'supported-systems', remove extra 'match'. Previously evaluation would fail for armhf, aarch64, and mips64el. * gnu/packages/bootstrap.scm (%bootstrap-mescc-tools)[supported-systems]: New field. (%bootstrap-mes)[supported-systems]: New field. [inputs]: Remove 'match' form on %current-system, which would fail on non-Intel platforms. --- gnu/packages/bootstrap.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 72e3d0847f..d9570a32f5 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -659,6 +659,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) + (supported-systems '("i686-linux" "x86_64-linux")) (license gpl3+))) (define %bootstrap-mes @@ -702,10 +703,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "mes-minimal-stripped-0.19-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 - "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))))) + (base32 + "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))) + (supported-systems '("i686-linux" "x86_64-linux")) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From 5fe2c549b48771bd461b32545325e321456a24ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 11:43:13 +0200 Subject: gnu: gcc-boot0: Fix build on non-Intel systems. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Fix 'match case for alternate systems so a 'phase is added. --- gnu/packages/commencement.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bbcc5ac589..dc05e047d1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; @@ -1634,7 +1634,8 @@ exec " gcc "/bin/" program (substitute* "libcc1/configure" (("g\\+\\+ -v") "true")) #t))) - (_ identity)) + (_ '(add-before 'configure 'return-true + (lambda _ #t)))) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) -- cgit v1.2.3 From 17f43346225d2d73ed366047e9d05059dbe59539 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 15:44:49 +0200 Subject: gnu: tar: Update to 1.31. * gnu/packages/base.scm (tar): Update to 1.31. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2c5e7c6455..d4d3317b98 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -152,14 +152,14 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.30") + (version "1.31") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi")) + "1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp")) (patches (search-patches "tar-skip-unreliable-tests.patch" "tar-remove-wholesparse-check.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From e992d56669aac6e4e5a2c46d27902a882f3d1bc6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 15:45:48 +0200 Subject: gnu: diffutils: Update to 3.7. * gnu/packages/base.scm (diffutils): Update to 3.7. [source]: Remove patch. [native-inputs]: Add perl. * gnu/packages/commencement.scm (diffutils-boot0)[native-inputs]: Don't add perl. * gnu/packages/patches/diffutils-getopt.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/base.scm | 6 ++-- gnu/packages/commencement.scm | 1 + gnu/packages/patches/diffutils-getopt.patch | 44 ----------------------------- 4 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/diffutils-getopt.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 7c970dc47c..d87d0b598d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -657,7 +657,6 @@ dist_patch_DATA = \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ - %D%/packages/patches/diffutils-getopt.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d4d3317b98..aa85662a0c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -245,16 +245,16 @@ differences.") (define-public diffutils (package (name "diffutils") - (version "3.6") + (version "3.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/diffutils/diffutils-" version ".tar.xz")) (sha256 (base32 - "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn")) - (patches (search-patches "diffutils-getopt.patch")))) + "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")))) (build-system gnu-build-system) + (native-inputs `(("perl" ,perl))) (synopsis "Comparing and merging files") (description "GNU Diffutils is a package containing tools for finding the diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dc05e047d1..79246a0c5d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1430,6 +1430,7 @@ exec " gcc "/bin/" program #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") + (native-inputs `()) (arguments `(#:tests? #f ; the test suite needs diffutils ,@(package-arguments p))))))) diff --git a/gnu/packages/patches/diffutils-getopt.patch b/gnu/packages/patches/diffutils-getopt.patch deleted file mode 100644 index 05c2504adf..0000000000 --- a/gnu/packages/patches/diffutils-getopt.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit e3461d1c21a99bcef1b8826f710434e0ffb5adea -Author: Paul Eggert -Date: Sun Jun 11 15:53:09 2017 -0700 - - getopt-posix: port to glibc 2.25.90 - - Problem reported by Daniel P. Berrange in: - http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html - * lib/getopt-pfx-core.h (_GETOPT_CORE_H): - * lib/getopt-pfx-ext.h (_GETOPT_EXT_H): - #undef if __GETOPT_PREFIX is defined. - -diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h -index 155c11612..6ad0da683 100644 ---- a/lib/getopt-pfx-core.h -+++ b/lib/getopt-pfx-core.h -@@ -47,6 +47,11 @@ - # define opterr __GETOPT_ID (opterr) - # define optind __GETOPT_ID (optind) - # define optopt __GETOPT_ID (optopt) -+ -+/* The system's getopt.h may have already included getopt-core.h to -+ declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that -+ getopt-core.h declares them with prefixes. */ -+# undef _GETOPT_CORE_H - #endif - - #include -diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h -index d960bb34e..c5ac52202 100644 ---- a/lib/getopt-pfx-ext.h -+++ b/lib/getopt-pfx-ext.h -@@ -45,6 +45,11 @@ - # define getopt_long_only __GETOPT_ID (getopt_long_only) - # define option __GETOPT_ID (option) - # define _getopt_internal __GETOPT_ID (getopt_internal) -+ -+/* The system's getopt.h may have already included getopt-ext.h to -+ declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that -+ getopt-ext.h declares them with prefixes. */ -+# undef _GETOPT_EXT_H - #endif - - /* Standalone applications get correct prototypes for getopt_long and -- cgit v1.2.3 From 3526c72c5ef0568c698f116c2aa4b614d47d77e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:44:51 +0200 Subject: gnu: bison: Update to 3.2.4. * gnu/packages/bison.scm (bison): Update to 3.2.4. --- gnu/packages/bison.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index c1323d83ec..70d5e08d4a 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.2.2") + (version "3.2.4") (source (origin (method url-fetch) @@ -38,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1yps7xyhllbg9rbb9mii1z736w85yh26vqvhr1y5qx6hwhj0z5bg")))) + "0d2ny1kmvvlmj4h9gdyqsx4bf01lgdfcjh1pa2385xjdkx0l8gaj")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From 07c95566a4dfdc92e587ea90c41e788db2a5ae7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:45:18 +0200 Subject: gnu: gzip: Update to 1.10. * gnu/packages/compression.scm (gzip): Update to 1.10. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 69f72906b6..ef68b2bf44 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice @@ -202,14 +202,14 @@ adding and extracting files to/from a tar archive.") (define-public gzip (package (name "gzip") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gzip/gzip-" version ".tar.xz")) (sha256 (base32 - "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f")))) + "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4")))) (build-system gnu-build-system) (synopsis "General file (de)compression (using lzw)") (arguments -- cgit v1.2.3 From f478ff860545bcea474da96b4d7f7e8ac1602218 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:45:41 +0200 Subject: gnu: ed: Update to 1.15. * gnu/packages/ed.scm (ed): Update to 1.15. --- gnu/packages/ed.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index d30d7bcfa8..c2198763ef 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2013, 2014 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm")))) + "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From 0559a4c2ca5b2573d5086c8b64794a634fc3e799 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:46:01 +0200 Subject: gnu: groff: Update to 1.22.4. * gnu/packages/groff.scm (groff): Update to 1.22.4. [source]: Remove patch. (groff-minimal)[arguments]: Update configure flags to skip documentation. * gnu/packages/patches/groff-source-date-epoch.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/groff.scm | 8 +- gnu/packages/patches/groff-source-date-epoch.patch | 299 --------------------- 3 files changed, 4 insertions(+), 304 deletions(-) delete mode 100644 gnu/packages/patches/groff-source-date-epoch.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d87d0b598d..f487f357e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -790,7 +790,6 @@ dist_patch_DATA = \ %D%/packages/patches/gpsbabel-minizip.patch \ %D%/packages/patches/gpsbabel-qstring.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ - %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-binutils-compat.patch \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 77728a5d78..9bf8662b9f 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +37,13 @@ (define-public groff (package (name "groff") - (version "1.22.3") + (version "1.22.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/groff/groff-" version ".tar.gz")) (sha256 (base32 - "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s")) - (patches (search-patches "groff-source-date-epoch.patch")))) + "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;12MiB of PS, PDF, HTML, and examples @@ -91,7 +91,7 @@ is usually the formatter of \"man\" documentation pages.") (arguments `(#:disallowed-references (,perl) - #:configure-flags '("--docdir=/tmp/trash/doc") + #:configure-flags '("--with-doc=no") ,@(substitute-keyword-arguments (package-arguments groff) ((#:phases phases) diff --git a/gnu/packages/patches/groff-source-date-epoch.patch b/gnu/packages/patches/groff-source-date-epoch.patch deleted file mode 100644 index 53c590b049..0000000000 --- a/gnu/packages/patches/groff-source-date-epoch.patch +++ /dev/null @@ -1,299 +0,0 @@ -Adds support for the environment variable SOURCE_DATE_EPOCH. - -See: https://sources.debian.net/patches/groff/1.22.3-9/source-date-epoch.patch/ - -From abc23bc9245e18468817f2838361c3a08f7521e2 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Thu, 5 Nov 2015 11:47:34 +0000 -Subject: Implement `SOURCE_DATE_EPOCH' for reproducible builds. - -Author: Colin Watson -Forwarded: yes -Last-Update: 2015-11-05 - -Patch-Name: source-date-epoch.patch ---- - doc/groff.texinfo | 6 +++++ - src/devices/grohtml/grohtml.man | 7 ++++++ - src/devices/grohtml/post-html.cpp | 5 ++-- - src/devices/gropdf/gropdf.man | 7 ++++++ - src/devices/gropdf/gropdf.pl | 3 ++- - src/devices/grops/grops.man | 7 ++++++ - src/devices/grops/ps.cpp | 3 ++- - src/include/curtime.h | 23 ++++++++++++++++++ - src/libs/libgroff/Makefile.sub | 2 ++ - src/libs/libgroff/curtime.cpp | 51 +++++++++++++++++++++++++++++++++++++++ - src/roff/troff/input.cpp | 3 ++- - 11 files changed, 112 insertions(+), 5 deletions(-) - create mode 100644 src/include/curtime.h - create mode 100644 src/libs/libgroff/curtime.cpp - -diff --git a/doc/groff.texinfo b/doc/groff.texinfo -index 066b5274..1d3c7a9f 100644 ---- a/doc/groff.texinfo -+++ b/doc/groff.texinfo -@@ -1453,6 +1453,12 @@ default directory (on Unix and GNU/Linux systems, this is usually - @item GROFF_TYPESETTER - @tindex GROFF_TYPESETTER@r{, environment variable} - The default output device. -+ -+@item SOURCE_DATE_EPOCH -+@tindex SOURCE_DATE_EPOCH@r{, environment variable} -+A timestamp (expressed as seconds since the Unix epoch) to use in place of -+the current time when initializing time-based built-in registers such as -+@code{\n[seconds]}. - @end table - - Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons, -diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.man -index 51eae224..4be4abbc 100644 ---- a/src/devices/grohtml/grohtml.man -+++ b/src/devices/grohtml/grohtml.man -@@ -419,6 +419,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH BUGS - .\" -------------------------------------------------------------------- -diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp -index fefbf014..b5fc5167 100644 ---- a/src/devices/grohtml/post-html.cpp -+++ b/src/devices/grohtml/post-html.cpp -@@ -28,6 +28,7 @@ along with this program. If not, see . */ - #include "html.h" - #include "html-text.h" - #include "html-table.h" -+#include "curtime.h" - - #include - -@@ -5013,7 +5014,7 @@ void html_printer::do_file_components (void) - .put_string(Version_string) - .end_comment(); - -- t = time(0); -+ t = current_time(); - html.begin_comment("CreationDate: ") - .put_string(ctime(&t), strlen(ctime(&t))-1) - .end_comment(); -@@ -5126,7 +5127,7 @@ html_printer::~html_printer() - .put_string(Version_string) - .end_comment(); - -- t = time(0); -+ t = current_time(); - html.begin_comment("CreationDate: ") - .put_string(ctime(&t), strlen(ctime(&t))-1) - .end_comment(); -diff --git a/src/devices/gropdf/gropdf.man b/src/devices/gropdf/gropdf.man -index 3bbace6a..cc0c82f1 100644 ---- a/src/devices/gropdf/gropdf.man -+++ b/src/devices/gropdf/gropdf.man -@@ -1029,6 +1029,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH FILES - .\" -------------------------------------------------------------------- -diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl -index 035d1238..c25c4c67 100644 ---- a/src/devices/gropdf/gropdf.pl -+++ b/src/devices/gropdf/gropdf.pl -@@ -239,13 +239,14 @@ elsif (exists($ppsz{$papersz})) - @defaultmb=@mediabox=(0,0,$ppsz{$papersz}->[0],$ppsz{$papersz}->[1]); - } - --my (@dt)=localtime(time); -+my (@dt)=localtime($ENV{SOURCE_DATE_EPOCH} || time); - my $dt=PDFDate(\@dt); - - my %info=('Creator' => "(groff version $cfg{GROFF_VERSION})", - 'Producer' => "(gropdf version $cfg{GROFF_VERSION})", - 'ModDate' => "($dt)", - 'CreationDate' => "($dt)"); -+ - while (<>) - { - chomp; -diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.man -index 99fb7486..272c2d18 100644 ---- a/src/devices/grops/grops.man -+++ b/src/devices/grops/grops.man -@@ -1419,6 +1419,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH FILES - .\" -------------------------------------------------------------------- -diff --git a/src/devices/grops/ps.cpp b/src/devices/grops/ps.cpp -index 745a503b..03e65372 100644 ---- a/src/devices/grops/ps.cpp -+++ b/src/devices/grops/ps.cpp -@@ -28,6 +28,7 @@ along with this program. If not, see . */ - #include "cset.h" - #include "nonposix.h" - #include "paper.h" -+#include "curtime.h" - - #include "ps.h" - #include -@@ -1390,7 +1391,7 @@ ps_printer::~ps_printer() - #else - time_t - #endif -- t = time(0); -+ t = current_time(); - fputs(ctime(&t), out.get_file()); - } - for (font_pointer_list *f = font_list; f; f = f->next) { -diff --git a/src/include/curtime.h b/src/include/curtime.h -new file mode 100644 -index 00000000..a4105196 ---- /dev/null -+++ b/src/include/curtime.h -@@ -0,0 +1,23 @@ -+/* Copyright (C) 2015 Free Software Foundation, Inc. -+ -+This file is part of groff. -+ -+groff 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 2 of the License, or -+(at your option) any later version. -+ -+groff 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. -+ -+The GNU General Public License version 2 (GPL2) is available in the -+internet at . */ -+ -+#ifdef LONG_FOR_TIME_T -+long -+#else -+time_t -+#endif -+current_time(); -diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub -index 840d9934..4cb4937a 100644 ---- a/src/libs/libgroff/Makefile.sub -+++ b/src/libs/libgroff/Makefile.sub -@@ -32,6 +32,7 @@ OBJS=\ - cmap.$(OBJEXT) \ - color.$(OBJEXT) \ - cset.$(OBJEXT) \ -+ curtime.$(OBJEXT) \ - device.$(OBJEXT) \ - errarg.$(OBJEXT) \ - error.$(OBJEXT) \ -@@ -82,6 +83,7 @@ CCSRCS=\ - $(srcdir)/cmap.cpp \ - $(srcdir)/color.cpp \ - $(srcdir)/cset.cpp \ -+ $(srcdir)/curtime.cpp \ - $(srcdir)/device.cpp \ - $(srcdir)/errarg.cpp \ - $(srcdir)/error.cpp \ -diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp -new file mode 100644 -index 00000000..00821b7f ---- /dev/null -+++ b/src/libs/libgroff/curtime.cpp -@@ -0,0 +1,51 @@ -+/* Copyright (C) 2015 Free Software Foundation, Inc. -+ -+This file is part of groff. -+ -+groff 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 2 of the License, or -+(at your option) any later version. -+ -+groff 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. -+ -+The GNU General Public License version 2 (GPL2) is available in the -+internet at . */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "errarg.h" -+#include "error.h" -+ -+#ifdef LONG_FOR_TIME_T -+long -+#else -+time_t -+#endif -+current_time() -+{ -+ char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ -+ if (source_date_epoch) { -+ errno = 0; -+ char *endptr; -+ long epoch = strtol(source_date_epoch, &endptr, 10); -+ -+ if ((errno == ERANGE && (epoch == LONG_MAX || epoch == LONG_MIN)) || -+ (errno != 0 && epoch == 0)) -+ fatal("$SOURCE_DATE_EPOCH: strtol: %1", strerror(errno)); -+ if (endptr == source_date_epoch) -+ fatal("$SOURCE_DATE_EPOCH: no digits found: %1", endptr); -+ if (*endptr != '\0') -+ fatal("$SOURCE_DATE_EPOCH: trailing garbage: %1", endptr); -+ return epoch; -+ } else -+ return time(0); -+} -diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp -index 9594f074..f7d2c18a 100644 ---- a/src/roff/troff/input.cpp -+++ b/src/roff/troff/input.cpp -@@ -36,6 +36,7 @@ along with this program. If not, see . */ - #include "input.h" - #include "defs.h" - #include "unicode.h" -+#include "curtime.h" - - // Needed for getpid() and isatty() - #include "posix.h" -@@ -8138,7 +8139,7 @@ static void init_registers() - #else /* not LONG_FOR_TIME_T */ - time_t - #endif /* not LONG_FOR_TIME_T */ -- t = time(0); -+ t = current_time(); - // Use struct here to work around misfeature in old versions of g++. - struct tm *tt = localtime(&t); - set_number_reg("seconds", int(tt->tm_sec)); -- cgit v1.2.3 From 2cb4f940f2a18d68b14b0bb7a8ddaf766d8024ab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 8 Jan 2019 18:13:43 +0200 Subject: gnu: readline: Update to 8.0. * gnu/packages/readline.scm (readline): Update to 8.0. [source]: Remove patch series %patch-series-7.0. (readline-7): New variable. --- gnu/packages/readline.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 59fa8af8af..57d550d67f 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -55,18 +55,15 @@ (define-public readline (package (name "readline") - (version (string-append "7.0." - (number->string (length %patch-series-7.0)))) + (version "8.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/readline/readline-" (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm")) - (patches (append - %patch-series-7.0 - (search-patches "readline-link-ncurses.patch"))) + "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3")) + (patches (search-patches "readline-link-ncurses.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) @@ -101,6 +98,23 @@ comfortable for anyone.") (license gpl3+) (home-page "https://savannah.gnu.org/projects/readline/"))) +(define-public readline-7 + (package (inherit readline) + (name "readline") + (version (string-append "7.0." + (number->string (length %patch-series-7.0)))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/readline/readline-" + (version-major+minor version) ".tar.gz")) + (sha256 + (base32 + "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm")) + (patches (append + %patch-series-7.0 + (search-patches "readline-link-ncurses.patch"))) + (patch-flags '("-p0")))))) + (define-public readline-6.2 (package (inherit readline) (version "6.2") -- cgit v1.2.3 From 847ffe88526ccf1209ff0292fbdae9c557cf5d3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 8 Jan 2019 18:18:55 +0200 Subject: gnu: bash: Update to 5.0. * gnu/packages/bash.scm (bash): Update to 5.0. [source]: Remove patches. (patch-url seqno): Prepare for bash-5.0 patches. (%patch-series-4.4): Rename %patch-series-5.0, remove patches. --- gnu/packages/bash.scm | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index fb4e3f4be3..9fd4b30e62 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -44,7 +44,7 @@ (define (patch-url seqno) "Return the URL of Bash patch number SEQNO." - (format #f "mirror://gnu/bash/bash-4.4-patches/bash44-~3,'0d" seqno)) + (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) (define (bash-patch seqno sha256) "Return the origin of Bash patch SEQNO, with expected hash SHA256" @@ -57,33 +57,11 @@ (list (bash-patch seqno (base32 hash)) ...)) -(define %patch-series-4.4 - ;; This is the current patches series for 4.4, generated using +(define %patch-series-5.0 + ;; This is the current patches series for 5.0, generated using ;; 'download-patches' below. (patch-series - (1 "03vzy7qwjdd5qvl3ydg99naazas2qmyd0yhnrflgjbbm64axja1y") - (2 "0lrwq6vyqism3yqv9s7kzaf3dsl4q5w9r5svcqz279qp7qca083h") - (3 "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi") - (4 "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d") - (5 "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2") - (6 "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka") - (7 "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y") ;CVE-2017-5932 - (8 "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546") - (9 "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb") - (10 "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4") - (11 "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx") - (12 "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps") - (13 "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v") - (14 "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7") - (15 "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk") - (16 "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh") - (17 "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp") - (18 "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v") - (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7") - (20 "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q") - (21 "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx") - (22 "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5") - (23 "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g"))) + )) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of @@ -119,7 +97,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." " -Wl,-rpath -Wl," (assoc-ref %build-inputs "ncurses") "/lib"))) - (version "4.4")) + (version "5.0")) (package (name "bash") (source (origin @@ -128,11 +106,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "mirror://gnu/bash/bash-" version ".tar.gz")) (sha256 (base32 - "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq")) - (patch-flags '("-p0")) - (patches %patch-series-4.4))) - (version (string-append version "." - (number->string (length %patch-series-4.4)))) + "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")))) + (version version) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From a9883939977f5fb0bd62d1dccb1ab0a772a4b720 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 13 Jan 2019 22:43:20 +0000 Subject: gnu: python-2.7: Fix build. The -j flag is passed in through #:make-flags and EXTRATESTOPTS. This is combined with the TESTOPTS, and in Python 2, that includes the -l flag by default. The -l flag, is for finding memory leaks in tests, and is incompatible with the -j flag, and the build previously failed at the start of the 'check phase. Therefore, remove the -l flag from the Python 2 testsuite, as it doesn't sound like a useful thing to do when building the package for Guix. * gnu/packages/python.scm (python-2.7): Add 'remove-findleaks-from-testopts phase. --- gnu/packages/python.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9b43f465cc..2971dfe779 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -200,6 +200,14 @@ (guix build utils) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-findleaks-from-testopts + (lambda _ + (substitute* "Makefile.pre.in" + ;; -l which is short for --findleaks isn't compatible with the + ;; -j flag added through the #:make-flags, therefore remove + ;; it. This only affects python-2.7. + (("TESTOPTS= -l ") "TESTOPTS= ")) + #t)) (add-before 'configure 'patch-lib-shells (lambda _ -- cgit v1.2.3 From 2df4f7020d2c49110900f786af7700d170c3035c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 13 Jan 2019 01:03:24 -0600 Subject: gnu: groff: Fix doc installation. * gnu/packages/groff.scm (groff)[arguments]: Add 'fix-docdir phase. --- gnu/packages/groff.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 9bf8662b9f..a8a31337c8 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,7 +66,11 @@ (add-after 'unpack 'setenv (lambda _ (setenv "GS_GENERATE_UUIDS" "0") - #t))))) + #t)) + (add-after 'unpack 'fix-docdir + (lambda _ ;see https://savannah.gnu.org/bugs/index.php?55461 + (substitute* "Makefile.in" + (("^docdir =.*") "docdir = @docdir@\n"))))))) (synopsis "Typesetting from plain text mixed with formatting commands") (description "Groff is a typesetting package that reads plain text and produces -- cgit v1.2.3 From 974537fc4cd8045bcdce68c5ce79df35b0e17ec3 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 13 Jan 2019 21:08:48 -0600 Subject: gnu: python-pycodestyle: Fix build with Python 3.7. * gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-pycodestyle)[source]: Use it. --- gnu/local.mk | 1 + .../python-pycodestyle-stdlib-tokenize-fix.patch | 35 ++++++++++++++++++++++ gnu/packages/python.scm | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f487f357e9..23ba0d48f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1108,6 +1108,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ + %D%/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch new file mode 100644 index 0000000000..16388c8dba --- /dev/null +++ b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pycodestyle.py ++++ b/pycodestyle.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): + """ + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" + + + @register_check diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2971dfe779..c0ed19e16c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3974,7 +3974,8 @@ as the original project seems to have been abandoned circa 2007.") (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")))) + "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")) + (patches (search-patches "python-pycodestyle-stdlib-tokenize-fix.patch")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From cff1927f30c00e6df5a3be5bd7cb769cd1345873 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 10 Jan 2019 07:35:38 -0500 Subject: gnu: dbus: Build documentation (manpages and html). * gnu/packages/glib.scm (dbus)[native-inputs]: Add docbook-xml-4.4, docbook-xsl, doxygen, xmlto, libxml2, libxslt and yelp-tools. [outputs]: Add a "doc" output to hold the large HTML documentation. --- gnu/packages/glib.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cd9b48caff..946ed2ba19 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages docbook) + #:use-module (gnu packages documentation) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -118,14 +121,21 @@ "sysconfdir=/tmp/dummy" "install")))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; Dependencies to generate the doc. + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) + ("doxygen" ,doxygen) + ("xmlto" ,xmlto) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("libxslt" ,libxslt) + ("yelp-tools" ,yelp-tools))) (inputs `(("expat" ,expat) - ;; Add a dependency on libx11 so that 'dbus-launch' has support for ;; '--autolaunch'. ("libx11" ,libx11))) - + (outputs '("out" "doc")) ;22 MiB of HTML doc (home-page "https://www.freedesktop.org/wiki/Software/dbus/") (synopsis "Message bus for inter-process communication (IPC)") (description -- cgit v1.2.3 From cbd833750a57ae0596e80d06c74b02bccddf6197 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 15 Jan 2019 08:39:39 -0600 Subject: gnu: mariadb: Disable "main.mysqldump" test. * gnu/packages/databases.scm (mariadb)[arguments]: Add "main.mysqldump" to disabled-tests in 'adjust-tests' phase. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 07c6006c3b..b995de2a53 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -707,6 +707,9 @@ Language.") "main.stat_tables_innodb" "roles.acl_statistics" + ;; FIXME: Fixed in mysql, but we have no patch. See + ;; https://bugs.mysql.com/bug.php?id=93778 + "main.mysqldump" ;; FIXME: This test fails on i686: ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) -- cgit v1.2.3 From 4929ee9b196b7e3f0e4e217865ca4d6dfd22c853 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 17 Jan 2019 22:10:02 -0600 Subject: gnu: rcs: disable buggy test t810. * gnu/packages/version-control.scm (rcs)[arguments]: New field. Add 'disable-t810' phase. --- gnu/packages/version-control.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2eaf0c69f4..399453200b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2014, 2016 Eric Bavier +;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus @@ -1384,6 +1384,15 @@ projects, from individuals to large-scale enterprise operations.") (patches (search-patches "rcs-5.9.4-noreturn.patch")))) (build-system gnu-build-system) (native-inputs `(("ed" ,ed))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-t810 + ;; See https://savannah.gnu.org/bugs/index.php?52288 + ;; Back-porting the fix is non-trivial, so disable for now. + (lambda _ + (substitute* "tests/Makefile" + ((" t810 \\\\\n") "")) + #t))))) (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") (description -- cgit v1.2.3 From d453b0e11d3f001a8160a7d126fdbf40e45d5042 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 3 Jan 2019 20:47:39 +0000 Subject: gnu: python-2.7: Include /lib/python.../test/support. Don't remove the support directory from the /lib/python.../test/ directory, as this is used from the test_support module. /gnu/store/...-python2-2.7.15/lib/python2.7/test/test_support.py:2: in import test.support E ImportError: No module named support * gnu/packages/python.scm (python-2.7)[arguments]: Change the 'remove-tests phase to not remove the support directory. --- gnu/packages/python.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c0ed19e16c..d13d7dbd8d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -271,12 +271,9 @@ (scandir testdir (match-lambda ((or "." "..") #f) + ("support" #f) (file (not - ;; FIXME: Add the 'support' directory - ;; in the next rebuild cycle, since it - ;; moved in 2.7.14. See also - ;; python2-futures below. (string-prefix? "test_support." file)))))) (call-with-output-file "__init__.py" (const #t)) -- cgit v1.2.3 From 85e457946917004cf1ae4f01ea2d51e028884333 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 3 Jan 2019 21:06:44 +0000 Subject: gnu: python-futures: Enable tests. Re-enable the tests, as the python-2 package now has the support directory. Also, switch to running the tests via the test_futures.py script to avoid errors like: AttributeError: 'AsCompletedTests' object has no attribute 'executor' * gnu/packages/python.scm (python2-futures)[arguments]: Run the test_futures.py script to run the tests. --- gnu/packages/python.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d13d7dbd8d..e8706ff688 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7899,11 +7899,14 @@ otherwise matches 3.2’s API.") (base32 "0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y")))) (build-system python-build-system) - (arguments `(#:python ,python-2 - ;; FIXME: Python 2.7.14 moved the test.support library, - ;; but our package has not yet been adjusted. Enable - ;; tests when the python2 package has been fixed. - #:tests? #f)) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "test_futures.py") + #t))))) (home-page "https://github.com/agronholm/pythonfutures") (synopsis "Backport of the concurrent.futures package from Python 3.2") -- cgit v1.2.3 From 32922190977f701694880254a71feb2752222f94 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 22 Jan 2019 22:00:50 -0600 Subject: gnu: python2: Fix test flags. Reverts a9883939977f5fb0bd62d1dccb1ab0a772a4b720 in favor of a cleaner approach. * gnu/packages/python.scm (python-2.7)[arguments]: 'EXTRATESTOPTS' -> 'TESTOPTS'. This overrides the default '-l' argument for memory leak checks which is not compatible with the -j for parallelism. --- gnu/packages/python.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e8706ff688..4dfc95d301 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2014, 2017 Eric Bavier +;;; Copyright © 2014, 2017, 2019 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault @@ -194,20 +194,12 @@ (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. #:make-flags - (list (format #f "EXTRATESTOPTS=-j~d" (parallel-job-count))) + (list (format #f "TESTOPTS=-j~d" (parallel-job-count))) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-findleaks-from-testopts - (lambda _ - (substitute* "Makefile.pre.in" - ;; -l which is short for --findleaks isn't compatible with the - ;; -j flag added through the #:make-flags, therefore remove - ;; it. This only affects python-2.7. - (("TESTOPTS= -l ") "TESTOPTS= ")) - #t)) (add-before 'configure 'patch-lib-shells (lambda _ -- cgit v1.2.3 From 4bdd41bb839e52876fdc03011bed0aa450c92263 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 22 Jan 2019 23:33:21 -0600 Subject: gnu: handbrake: Upgrade to 1.2.0. * gnu/packages/patches/handbrake-opt-in-nvenc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (handbrake)[source]: Upgrade to 1.2.0. Use patch. [native-inputs]: Add cmake. [inputs]: Add speex. [arguments]: Disable runtime update checks via #:configure-flags. --- gnu/local.mk | 1 + gnu/packages/patches/handbrake-opt-in-nvenc.patch | 14 ++++++++++++++ gnu/packages/video.scm | 14 +++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/handbrake-opt-in-nvenc.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 38076259e3..f55907731b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ + %D%/packages/patches/handbrake-opt-in-nvenc.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/patches/handbrake-opt-in-nvenc.patch b/gnu/packages/patches/handbrake-opt-in-nvenc.patch new file mode 100644 index 0000000000..2b34aaa427 --- /dev/null +++ b/gnu/packages/patches/handbrake-opt-in-nvenc.patch @@ -0,0 +1,14 @@ +Require opt-in for NVEnc support. Otherwise the default is true with no way +to disable it. + +--- HandBrake-1.2.0/make/configure.py.orig 1969-12-31 18:00:00.000000000 -0600 ++++ HandBrake-1.2.0/make/configure.py 2019-01-22 23:22:46.186959060 -0600 +@@ -1320,7 +1320,7 @@ + grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' ) + + h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value +- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h ) ++ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=False, action='store_true', help=h ) + + + cli.add_option_group( grp ) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c327c9bc5c..4ac1b68077 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016, 2018 Eric Bavier +;;; Copyright © 2016, 2018, 2019 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -2430,14 +2430,14 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "1.1.2") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://download.handbrake.fr/releases/" version "/HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "0bny0hwlr55g2c69rsamv0xvwmfh1s4a582b9vq20xv5ly84m6ms")) + "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for @@ -2451,11 +2451,13 @@ supported players in addition to this package.") ;; which would lead to fetching and building of these ;; libraries. Use our own instead. (("MODULES \\+= contrib") "# MODULES += contrib")) - #t)))) + #t)) + (patches (search-patches "handbrake-opt-in-nvenc.patch")))) (build-system glib-or-gtk-build-system) (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) + ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) @@ -2488,12 +2490,14 @@ supported players in addition to this package.") ("libvpx" ,libvpx) ("libxml2" ,libxml2) ("libx264" ,libx264) + ("speex" ,speex) ("x265" ,x265) ("zlib" ,zlib))) (arguments `(#:tests? #f ;tests require Ruby and claim to be unsupported #:configure-flags - (list (string-append "CPPFLAGS=-I" + (list "--disable-gtk-update-checks" + (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "libxml2") "/include/libxml2") "LDFLAGS=-lx265") -- cgit v1.2.3 From cc43d807c08af02d31770a011881990d46428737 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:28:38 +0100 Subject: gnu: file: Incorporate grafted changes. * gnu/packages/file.scm (file)[replacement]: Remove. [source](patches): New field. (file/fixed): Remove variable. --- gnu/packages/file.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 4518c8d3dc..24ed37a9d2 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -31,11 +31,11 @@ (package (name "file") (version "5.33") - (replacement file/fixed) (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) + (patches (search-patches "file-CVE-2018-10360.patch")) (sha256 (base32 "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) @@ -53,10 +53,3 @@ extensions to tell you the type of a file, but looks at the actual contents of the file. This package provides the libmagic library.") (license bsd-2) (home-page "https://www.darwinsys.com/file/"))) - -(define file/fixed - (package - (inherit file) - (source - (origin (inherit (package-source file)) - (patches (search-patches "file-CVE-2018-10360.patch")))))) -- cgit v1.2.3 From 0293b353bdde6b9593138a48fc78a500423fda0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:26:47 +0100 Subject: gnu: sqlite: Remove graft for 3.26.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.26.0. [replacement]: Remove. (sqlite-3.26.0): Remove variable. --- gnu/packages/sqlite.scm | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 5e5bbd8fb6..d40fc119e0 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,8 +46,7 @@ (define-public sqlite (package (name "sqlite") - (replacement sqlite-3.26.0) - (version "3.24.0") + (version "3.26.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -63,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) + "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -83,26 +82,6 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) -(define-public sqlite-3.26.0 - (package (inherit sqlite) - (version "3.26.0") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))))) - ;; This is used by Tracker. (define-public sqlite-with-fts5 (package/inherit sqlite -- cgit v1.2.3 From 027250f1a65f5500a68687a32e444f424bda7fda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:22:21 +0100 Subject: gnu: python2: Incorporate grafted changes. * gnu/packages/python.scm (python-2.7)[source](patches): Add python2-CVE-2018-14647.patch and python2-CVE-2018-1000802.patch. [replacement]: Remove field. (python-2/fixed): Remove variable. --- gnu/packages/python.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 69b8b3fd4d..87b80f9c40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -95,7 +95,6 @@ (package (name "python2") (version "2.7.15") - (replacement python-2/fixed) (source (origin (method url-fetch) @@ -108,7 +107,9 @@ "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch")) + "python-2.7-adjust-tests.patch" + "python2-CVE-2018-14647.patch" + "python2-CVE-2018-1000802.patch")) (modules '((guix build utils))) ;; suboptimal to delete failing tests here, but if we delete them in the ;; arguments then we need to make sure to strip out that phase when it @@ -266,16 +267,6 @@ data types.") ;; Current 2.x version. (define-public python-2 python-2.7) -(define python-2/fixed - (package - (inherit python-2) - (source (origin - (inherit (package-source python-2)) - (patches (append - (origin-patches (package-source python-2)) - (search-patches "python2-CVE-2018-14647.patch" - "python2-CVE-2018-1000802.patch"))))))) - (define-public python2-called-python ;; Both 2.x and 3.x used to be called "python". In commit ;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the -- cgit v1.2.3 From a5be549e393962764a9df590dc5ba6a314bfe866 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:31:23 +0100 Subject: gnu: libarchive: Remove graft for 3.3.3. * gnu/packages/patches/libarchive-CVE-2017-14166.patch, gnu/packages/patches/libarchive-CVE-2017-14502.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/backup.scm (libarchive): Update to 3.3.3. [source](patches): Adjust for 3.3.3. [replacement]: Remove field. (libarchive-3.3.3): Remove variable. --- gnu/local.mk | 2 - gnu/packages/backup.scm | 26 +++---------- .../patches/libarchive-CVE-2017-14166.patch | 45 ---------------------- .../patches/libarchive-CVE-2017-14502.patch | 40 ------------------- 4 files changed, 5 insertions(+), 108 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-CVE-2017-14166.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2017-14502.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9544297f17..45f108e768 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,8 +943,6 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ - %D%/packages/patches/libarchive-CVE-2017-14166.patch \ - %D%/packages/patches/libarchive-CVE-2017-14502.patch \ %D%/packages/patches/libarchive-CVE-2018-1000877.patch \ %D%/packages/patches/libarchive-CVE-2018-1000878.patch \ %D%/packages/patches/libarchive-CVE-2018-1000880.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c312f23c1a..45b1be2413 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -197,18 +197,18 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (replacement libarchive-3.3.3) - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (string-append "https://libarchive.org/downloads/libarchive-" version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2017-14166.patch" - "libarchive-CVE-2017-14502.patch")) + (patches (search-patches "libarchive-CVE-2018-1000877.patch" + "libarchive-CVE-2018-1000878.patch" + "libarchive-CVE-2018-1000880.patch")) (sha256 (base32 - "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd")))) + "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) @@ -274,22 +274,6 @@ archive. In particular, note that there is currently no built-in support for random access nor for in-place modification.") (license license:bsd-2))) -(define-public libarchive-3.3.3 - (package - (inherit libarchive) - (version "3.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2018-1000877.patch" - "libarchive-CVE-2018-1000878.patch" - "libarchive-CVE-2018-1000880.patch")) - (sha256 - (base32 - "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))))) - (define-public rdup (package (name "rdup") diff --git a/gnu/packages/patches/libarchive-CVE-2017-14166.patch b/gnu/packages/patches/libarchive-CVE-2017-14166.patch deleted file mode 100644 index a122848440..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2017-14166.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2017-14166: - -https://github.com/libarchive/libarchive/issues/935 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14166 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/fa7438a0ff4033e4741c807394a9af6207940d71 - -From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Tue, 5 Sep 2017 18:12:19 +0200 -Subject: [PATCH] Do something sensible for empty strings to make fuzzers - happy. - ---- - libarchive/archive_read_support_format_xar.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c -index 7a22beb9d..93eeacc5e 100644 ---- a/libarchive/archive_read_support_format_xar.c -+++ b/libarchive/archive_read_support_format_xar.c -@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) - uint64_t l; - int digit; - -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - digit = *p - '0'; - while (digit >= 0 && digit < 10 && char_cnt-- > 0) { -@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) - { - int64_t l; - int digit; -- -+ -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - while (char_cnt-- > 0) { - if (*p >= '0' && *p <= '7') diff --git a/gnu/packages/patches/libarchive-CVE-2017-14502.patch b/gnu/packages/patches/libarchive-CVE-2017-14502.patch deleted file mode 100644 index 8e0508afb5..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2017-14502.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix CVE-2017-14502: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14502 -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=573 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/5562545b5562f6d12a4ef991fae158bf4ccf92b6 - -From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Sat, 9 Sep 2017 17:47:32 +0200 -Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR - archives. - -Reported-By: OSS-Fuzz issue 573 ---- - libarchive/archive_read_support_format_rar.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index cbb14c32..751de697 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, - return (ARCHIVE_FATAL); - } - filename[filename_size++] = '\0'; -- filename[filename_size++] = '\0'; -+ /* -+ * Do not increment filename_size here as the computations below -+ * add the space for the terminating NUL explicitly. -+ */ -+ filename[filename_size] = '\0'; - - /* Decoded unicode form is UTF-16BE, so we have to update a string - * conversion object for it. */ --- -2.15.1 - -- cgit v1.2.3 From 4ee5482a0801015f81914f1ef08b5583dc174190 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:43:47 +0100 Subject: gnu: bison: Update to 3.3.2. * gnu/packages/bison.scm (bison): Update to 3.3.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 70d5e08d4a..ae37a8f80c 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.2.4") + (version "3.3.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "0d2ny1kmvvlmj4h9gdyqsx4bf01lgdfcjh1pa2385xjdkx0l8gaj")))) + "016qp59wxakz3ckxwyrmzxk406q0h286ydz8ww1m0pnrc5dy97h3")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From e34ae707881f3bfb09036f9461b1527336057c7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:44:24 +0100 Subject: gnu: mpfr: Update to 4.0.2. * gnu/packages/multiprecision.scm (mpfr): Update to 4.0.2. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index c17321a9b3..9f434dabe3 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -93,13 +93,13 @@ algebra.") (define-public mpfr (package (name "mpfr") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7")))) + "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx")))) (build-system gnu-build-system) (outputs '("out" "debug")) (propagated-inputs `(("gmp" ,gmp))) ; refers to -- cgit v1.2.3 From dfc941a9437160303ee141604d0d69bfcada99ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:45:16 +0100 Subject: gnu: binutils: Update to 2.32. * gnu/packages/base.scm (binutils): Update to 2.32. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3db0cc056b..96739b4de9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -439,14 +439,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.31.1") + (version "2.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z")) + "0b8767nyal1bc4cyzg5h9iis8kpkln1i3wkamig75cifj1fb2f6y")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 28a873f2084db159ebf1d9a03d86884ed971a810 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:15:29 +0100 Subject: gnu: libpng: Update to 1.6.36. * gnu/packages/image.scm (libpng): Update to 1.6.36. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index adec68a084..5975fc10ae 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -86,7 +86,7 @@ (define-public libpng (package (name "libpng") - (version "1.6.34") + (version "1.6.36") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" @@ -99,7 +99,7 @@ "/libpng16/libpng-" version ".tar.xz"))) (sha256 (base32 - "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig")))) + "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc")))) (build-system gnu-build-system) ;; libpng.la says "-lz", so propagate it. -- cgit v1.2.3 From 596c54c9672011a7d54c3aee25b1ab2a3e7c1e59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:01 +0100 Subject: gnu: mit-krb5: Update to 1.17. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.17. --- gnu/packages/kerberos.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index f52bb62c23..7cf61c8d0f 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -49,7 +49,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.16.1") + (version "1.17") (source (origin (method url-fetch) (uri (list @@ -61,7 +61,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "05qis9l93hhxaknbp0a2v5cr24fsy52fqx20aqqcgl1s9qwzwkr1")))) + "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From d9464ca53ab66a92d1d223738227a23e8ad1b86b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:26 +0100 Subject: gnu: pcre2: Update to 10.32. * gnu/packages/pcre.scm (pcre2): Update to 10.32. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 564a23d012..f46f7e3775 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,7 +89,7 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.31") + (version "10.32") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" @@ -97,7 +97,7 @@ POSIX regular expression API.") (sha256 (base32 - "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0")))) + "0bkwp2czcckvvbdls7b331cad11rxsm020aqhrbz84z8bp68k7pj")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From 28ae145ba6e9556513b774bdc1636e500995cda7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:58 +0100 Subject: gnu: python: Update to 3.7.2. * gnu/packages/python.scm (python-3.7): Update to 3.7.2. --- 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 87b80f9c40..5c74e8fde7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -279,7 +279,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.1") + (version "3.7.2") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -292,7 +292,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps")) + "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) (snippet '(begin (for-each delete-file -- cgit v1.2.3 From 85559eb88b9a5c9d0c44eaadd83c9ec565c4d4e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:17:19 +0100 Subject: gnu: openssl: Update to 1.0.2q. * gnu/packages/tls.scm (openssl): Update to 1.0.2q. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b398d6f8c5..f00886d8c2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -264,7 +264,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2p") + (version "1.0.2q") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -276,7 +276,7 @@ required structures.") "/" name "-" version ".tar.gz"))) (sha256 (base32 - "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah")) + "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 723c356d806223c0e1ecf921f6cf15af83387fb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:18:28 +0100 Subject: gnu: libxml2: Update to 2.9.9. * gnu/packages/xml.scm (libxml2): Update to 2.9.9. --- 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 f15c24243a..b6d6bf8034 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -123,14 +123,14 @@ hierarchical form with variable field lengths.") (define-public libxml2 (package (name "libxml2") - (version "2.9.8") + (version "2.9.9") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" version ".tar.gz")) (sha256 (base32 - "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b")))) + "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl")))) (build-system gnu-build-system) (outputs '("out" "static")) (arguments -- cgit v1.2.3 From df2bf40eec54f8aa143015d2ae452fcc847e7dcd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:18:52 +0100 Subject: gnu: libxslt: Update to 1.1.33. * gnu/packages/xml.scm (libxslt): Update to 1.1.33. --- 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 b6d6bf8034..322fc4ec3e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -205,14 +205,14 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (version "1.1.32") + (version "1.1.33") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) (sha256 (base32 - "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj")) + "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf")) (patches (search-patches "libxslt-generated-ids.patch")))) (build-system gnu-build-system) (home-page "http://xmlsoft.org/XSLT/index.html") -- cgit v1.2.3 From d41f63942b5df85223f5fae110253bc30869653b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 10:24:11 +0100 Subject: gnu: python-2.7: Rebuild bytecode. Fixes . * gnu/packages/python.scm (python-2.7)[arguments]: Add phase "rebuild-bytecode". (python-3.7)[arguments]: Replace "rebuild-bytecode" phase; remove outdated comment. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c74e8fde7..ce2e344880 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -215,6 +215,28 @@ file)))))) (call-with-output-file "__init__.py" (const #t)) #t))))))) + (add-after 'remove-tests 'rebuild-bytecode + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") + (for-each + (lambda (opt) + (format #t "Compiling with optimization level: ~a\n" + (if (null? opt) "none" (car opt))) + (for-each (lambda (file) + (apply invoke + `(,(string-append out "/bin/python") + ,@opt + "-m" "compileall" + "-f" ; force rebuild + ;; Don't build lib2to3, because it contains Python 3 code. + "-x" "lib2to3/.*" + ,file))) + (find-files out "\\.py$"))) + (list '() '("-O") '("-OO"))) + #t))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so @@ -316,10 +338,7 @@ data types.") (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) (add-after 'check 'reset-SOURCE_DATE_EPOCH (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) - ;; FIXME: Without this phase we have close to 400 files that - ;; differ across different builds of this package. With this phase - ;; there are 44 files left that differ. - (add-after 'remove-tests 'rebuild-bytecode + (replace 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Disable hash randomization to ensure the generated .pycs -- cgit v1.2.3 From f73f2e17d9f9e43c6d8842bce497006851537934 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 17:54:21 +0100 Subject: gnu: sqlite: Update to 3.27.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.27.1. --- gnu/packages/sqlite.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 794c030385..e6beef63b8 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.26.0") + (version "3.27.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -58,11 +58,11 @@ (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" + (string-append "https://sqlite.org/2019/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 - "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))) + "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 46d5a7e33d672d302c88292a9c297a9823f67a2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 19:37:33 +0100 Subject: gnu: sqlite: Enable FTS3 support. This is no longer enabled by default since 3.25.0. * gnu/packages/sqlite.scm (sqlite)[arguments]: Add "-DSQLITE_ENABLE_FTS3" to #:configure-flags. --- gnu/packages/sqlite.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index e6beef63b8..caa98c0861 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -67,10 +67,12 @@ (inputs `(("readline" ,readline))) (arguments `(#:configure-flags - ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and - ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse - ;; to use the system SQLite unless these options are enabled. + ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_FTS3, + ;; -DSQLITE_ENABLE_UNLOCK_NOTIFY and -DSQLITE_ENABLE_DBSTAT_VTAB + ;; to CFLAGS. GNU Icecat will refuse to use the system SQLite + ;; unless these options are enabled. (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB")))) (home-page "https://www.sqlite.org/") -- cgit v1.2.3 From b5a72640d72fa8b4bc52cc24845eb23983f5f377 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:28:51 +0100 Subject: gnu: Tcl/Tk: Update to 8.6.9. * gnu/packages/tcl.scm (tcl): Update to 8.6.9. (tk): Update to 8.6.9.1. [source](uri): Use VERSION-PREFIX to take only the first three components. --- gnu/packages/tcl.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index b8c85eb844..368a80ab57 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -40,14 +40,14 @@ (define-public tcl (package (name "tcl") - (version "8.6.8") + (version "8.6.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" version "/tcl" version "-src.tar.gz")) (sha256 (base32 - "0sprsg7wnraa4cbwgbcliylm6p0rspfymxn8ww02pr4ca70v0g64")))) + "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -135,14 +135,15 @@ X11 GUIs.") (define-public tk (package (name "tk") - (version "8.6.8") + (version "8.6.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" - version "/tk" version "-src.tar.gz")) + (version-prefix version 3) "/tk" + version "-src.tar.gz")) (sha256 (base32 - "0cvvznjwfn0i9vj9cw3wg8svx25ha34gg57m4xd1k5fyinhbrrs9")) + "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg")) (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8dd1fce66e93bebceeacfa2dc398a76b10bc8e39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:08 +0100 Subject: gnu: python-py: Update to 1.7.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34126c1fe1..afffdb7d33 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1521,14 +1521,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.5.4") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z")))) + "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From 850926439fb3d853c7f50d8be9580b1599ad47c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:39 +0100 Subject: gnu: python-setuptools-scm: Update to 3.2.0. * gnu/packages/python-xyz.scm (python-setuptools-scm): Update to 3.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afffdb7d33..38241c67f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4263,13 +4263,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i")))) + "0n3knn3p1sqlx31k2lahn7z9bacvlv8nhlfidj77vz50bxqlgasj")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") -- cgit v1.2.3 From 5b972c3256eff3588ad516b6ae64f2b948cac7c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:13:22 +0100 Subject: gnu: python-hypothesis: Update to 4.5.3. * gnu/packages/check.scm (python-hypothesis): Update to 4.5.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7550586c1f..afb3b96aba 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1447,13 +1447,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.70.3") + (version "4.5.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b")))) + "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) (build-system python-build-system) (native-inputs `(;; FIXME: Change to python-flake8 in the next rebuild cycle. -- cgit v1.2.3 From ac63cf0a6995fb9de6121e648b401167895b2c9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 17:45:51 +0100 Subject: gnu: Remove python-flake8@3.5. * gnu/packages/python-xyz.scm (python-flake8-3.5): Rename to ... (python-flake8): ... this. Update to 3.6.0. Remove previous variant. [arguments]: Remove phases 'delete-broken-test' and 'fix-problem-with-pycodestyle'. [properties]: Adjust for renamed variable. (python2-flake8-3.5): Rename to ... (python2-flake8): ... this. Remove previous variable. * gnu/packages/check.scm (python-hypothesis)[native-inputs]: Adjust accordingly. --- gnu/packages/check.scm | 3 +-- gnu/packages/python-xyz.scm | 65 ++++++++------------------------------------- 2 files changed, 12 insertions(+), 56 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index afb3b96aba..02ee9b136b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1456,8 +1456,7 @@ instantly.") "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) (build-system python-build-system) (native-inputs - `(;; FIXME: Change to python-flake8 in the next rebuild cycle. - ("python-flake8" ,python-flake8-3.5) + `(("python-flake8" ,python-flake8) ("python-pytest" ,python-pytest-bootstrap))) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38241c67f8..b92bed542f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5556,35 +5556,20 @@ complexity of Python source code.") (define-public python2-pyflakes-0.8.1 (package-with-python2 python-pyflakes-0.8.1)) -;; This package is used by hypothesis which has thousands of dependent packages. -;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle. -(define-public python-flake8-3.5 +(define-public python-flake8 (package (name "python-flake8") - (version "3.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj")))) + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Two errors don't seem to have assigned codes. - (add-after 'unpack 'delete-broken-test - (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t)) - (add-after 'unpack 'fix-problem-with-pycodestyle - (lambda _ - ;; See https://gitlab.com/pycqa/flake8/merge_requests/230 - ;; This should no longer be needed with the next release. - (substitute* "setup.py" - (("PEP8_PLUGIN\\('break_around_binary_operator'\\),") - "PEP8_PLUGIN('break_after_binary_operator'),\ -PEP8_PLUGIN('break_before_binary_operator'),")) - #t)) (delete 'check) (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) @@ -5604,45 +5589,17 @@ PEP8_PLUGIN('break_before_binary_operator'),")) "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") - (properties `((python2-variant . ,(delay python2-flake8-3.5)))) + (properties `((python2-variant . ,(delay python2-flake8)))) (license license:expat))) -(define-public python2-flake8-3.5 - (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5)))) +(define-public python2-flake8 + (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) -;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need -;; this newer version. Keep it as a separate variable for now to avoid -;; rebuilding "python-hypothesis"; this should be removed in the next -;; rebuild cycle. -(define-public python-flake8 - (package - (inherit python-flake8-3.5) - (version "3.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) - (arguments - (substitute-keyword-arguments (package-arguments python-flake8-3.5) - ((#:phases phases) - `(modify-phases ,phases - (delete 'delete-broken-test) - (delete 'fix-problem-with-pycodestyle))))) - (properties `((python2-variant . ,(delay python2-flake8)))))) - -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) - (package (inherit base) - (propagated-inputs - (package-propagated-inputs python2-flake8-3.5))))) - ;; python-hacking requires flake8 <2.6.0. (define-public python-flake8-2.5 (package -- cgit v1.2.3 From d16ef28b8037664ad08af5fb825811e9f46bb64c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:43:42 +0100 Subject: gnu: python-pycodestyle: Update to 2.5.0. * gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.5.0. [source](patches): Remove. --- gnu/local.mk | 1 - .../python-pycodestyle-stdlib-tokenize-fix.patch | 35 ---------------------- gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 41f81d0d0b..9df65b9d21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,7 +1171,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch deleted file mode 100644 index 16388c8dba..0000000000 --- a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 -From: Michael Hudson-Doyle -Date: Tue, 25 Sep 2018 14:58:57 +1200 -Subject: [PATCH] Keep compability with stdlib tokenize.py changes - -https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 -is not yet part of any release of Python but has been backported to all -versions in Git (includeing 2.7!). It causes the tokenize.py module to -emit a synthetic NEWLINE token for files that do not in fact end with a -newline, which confuses pycodestyle's checks for blank lines at the end -of a file. Fortunately the synthetic NEWLINE tokens are easy to detect -(the token text is ""). - -Fixes #786 ---- - pycodestyle.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pycodestyle.py b/pycodestyle.py -index 0d725d27..fbc3dca3 100755 ---- a/pycodestyle.py -+++ b/pycodestyle.py -@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): - """ - if line_number == total_lines: - stripped_last_line = physical_line.rstrip() -- if not stripped_last_line: -+ if physical_line and not stripped_last_line: - return 0, "W391 blank line at end of file" - if stripped_last_line == physical_line: -- return len(physical_line), "W292 no newline at end of file" -+ return len(lines[-1]), "W292 no newline at end of file" - - - @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b92bed542f..9d80531296 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3593,15 +3593,14 @@ as the original project seems to have been abandoned circa 2007.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")) - (patches (search-patches "python-pycodestyle-stdlib-tokenize-fix.patch")))) + "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From 1bfb53c025fc68bb81ec06a9614f4da163c784f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:46:07 +0100 Subject: gnu: python-coverage: Update to 4.5.2. * gnu/packages/check.scm (python-coverage): Update to 4.5.2. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 02ee9b136b..c7c3ec0640 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1177,14 +1177,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "4.4.1") + (version "4.5.2") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "097l4s3ssxm1vncsn0nw3a1pbzah28773q36c1ab9wz01r04973s")))) + "1d5zlyl3h39d3xlvkpsn4g5gpvdci9arplil2cnz2cs8wsgms8xb")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From 14f10479d0c9705dda371b2b17708b63cdf28ada Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:46:43 +0100 Subject: gnu: python-atomicwrites: Update to 1.3.0. * gnu/packages/python-xyz.scm (python-atomicwrites): Update to 1.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d80531296..c24caa836c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7169,13 +7169,13 @@ tables.") (define-public python-atomicwrites (package (name "python-atomicwrites") - (version "1.1.5") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "atomicwrites" version)) (sha256 (base32 - "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214")))) + "19ngcscdf3jsqmpcxn6zl5b6anmsajb6izp1smcd1n02midl9abm")))) (build-system python-build-system) (synopsis "Atomic file writes in Python") (description "Library for atomic file writes using platform dependent tools -- cgit v1.2.3 From 81ed0980a50ee1846c3a1c812e72fbb94c61c8f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:47:19 +0100 Subject: gnu: python-pluggy: Update to 0.8.1. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c24caa836c..1fd3e8bb27 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7607,14 +7607,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm")))) + "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 54da6f9f9b7badb6c957e598e71652af9e86c0e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:07 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.3. * gnu/packages/python-xyz.scm (python2-pathlib2): Update to 2.3.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fd3e8bb27..f2ef078cf3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8300,13 +8300,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf")))) + "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695")))) (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 -- cgit v1.2.3 From 84127f8c300b6485d1fc476ccb2a0bf06cea683e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:46 +0100 Subject: gnu: python-configparser: Update to 3.7.1. * gnu/packages/python-xyz.scm (python-configparser): Update to 3.7.1. [source](uri): Use PYPI-URI. --- gnu/packages/python-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2ef078cf3..89a1ec0172 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11348,17 +11348,14 @@ of @code{functools.lru_cache} from python 3.3.") (define-public python-configparser (package (name "python-configparser") - (version "3.5.0") + (version "3.7.1") (source (origin (method url-fetch) - (uri (string-append - "https://bitbucket.org/ambv/configparser/get/" - version ".tar.bz2")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "configparser" version)) (sha256 (base32 - "0waq40as14abwzbb321hfz4vr1fi363nscy32ga14qvfygrg96wa")))) + "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav")))) (build-system python-build-system) (home-page "https://github.com/jaraco/configparser/") (synopsis "Backport of configparser from python 3.5") -- cgit v1.2.3 From 16e03a521e3d4a0b0415cacb87d66d88a5463f67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:50:33 +0100 Subject: gnu: python-more-itertools: Update to 5.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 5.0.0. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 89a1ec0172..3c9da320cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13560,29 +13560,15 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.3.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) (build-system python-build-system) - (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("armhf" "i686")) - '(#:phases - (modify-phases %standard-phases - ;; This is required for 32-bit hardware. - ;; TODO: Try to remove this when upgrading. - (add-after 'unpack 'patch-test - (lambda _ - (substitute* "more_itertools/tests/test_more.py" - (("10 \\*\\* 10") "9 ** 9")) - #t)))) - '()))) (propagated-inputs `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") -- cgit v1.2.3 From b3ca2b45d1be73f5d0a843c6e3721e7209f1c89d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 19:10:48 +0100 Subject: gnu: python-setuptools: Update to 40.8.0. * gnu/packages/python-xyz.scm (python-setuptools): Update to 40.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3c9da320cc..28618bc6bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -613,14 +613,14 @@ encoded).") (define-public python-setuptools (package (name "python-setuptools") - (version "40.0.0") + (version "40.8.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools" version ".zip")) (sha256 (base32 - "0pq116lr14gnc62v76nk0npkm6krb2mpp7p9ab369zgv4n7dnah1")) + "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b2b96d536782d00d5f2c0e3ae15ab9fc87091bb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 23:53:54 +0100 Subject: gnu: python-freezegun: Update to 0.3.11. * gnu/packages/check.scm (python-freezegun): Update to 0.3.11. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c7c3ec0640..3932f4c305 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1974,14 +1974,14 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.10") + (version "0.3.11") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 (base32 - "08m6b42yxb9hk5lv747v9n2qsxyadmkb0k6yg0gxdanwap0slg3h")))) + "1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 59bd5a4a09f0f43f5cd7f86a4ee61d2351f93d99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:37:58 +0100 Subject: gnu: python-fonttools: Update to 3.37.3. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.37.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 28618bc6bc..0147abff98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5826,13 +5826,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.28.0") + (version "3.37.3") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) + "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 94295903939471314e5c89f4eff73bee28b9def6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:38:23 +0100 Subject: gnu: python-packaging: Update to 19.0. * gnu/packages/python-xyz.scm (python-packaging): Update to 19.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0147abff98..b4ebf46d1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11711,14 +11711,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "18.0") + (version "19.0") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8")))) + "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From de92ab21c162e69bd15b7215ade61bc47603c8bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:56:37 +0100 Subject: gnu: python-dateutil: Update to 2.8.0. * gnu/packages/time.scm (python-dateutil): Update to 2.8.0. [arguments]: New field. [native-inputs]: Add PYTHON-PYTEST. --- gnu/packages/time.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 948d2b995c..e67960db0d 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -145,17 +145,31 @@ Pendulum instances.") (define-public python-dateutil (package (name "python-dateutil") - (version "2.7.3") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) (sha256 (base32 - "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72")))) + "17nsfhy4xdz1khrfxa61vd7pmvd5z0wa3zb6v4gb4kfnykv0b668")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Delete tests that depend on "freezegun" to avoid a + ;; circular dependency. + (delete-file "dateutil/test/test_utils.py") + (delete-file "dateutil/test/test_rrule.py") + + ;; XXX: Fails to get timezone from /etc/localtime. + (delete-file "dateutil/test/test_tz.py") + + (invoke "pytest" "-vv")))))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm))) + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://dateutil.readthedocs.io/en/stable/") -- cgit v1.2.3 From 01e8263febb9634564b4b73af49b81a36567a11b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 19:56:30 +0200 Subject: gnu: Use GCC 7 as the default compiler. * gnu/packages/cross-base.scm (%gcc-cross-include-paths): Remove CROSS_C_INCLUDE_PATH & co in favor of CROSS_CPATH. * gnu/build/cross-toolchain.scm (%gcc-cross-include-paths): Likewise. (cross-gcc-build-phases): Set CROSS_C_INCLUDE_PATH and CROSS_CPLUS_INCLUDE_PATH when building the cross GCC. * gnu/packages/commencement.scm (libstdc++): Add "--disable-libstdcxx-dual-abi" to #:configure-flags. (gcc-boot0)[arguments]: Add "--disable-libmpx" to #:configure-flags. (gcc-final): Add phase to set C_INCLUDE_PATH and CPLUS_INCLUDE_PATH before building GCC. (gcc-toolchain-5): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-7): Change to GCC-TOOLCHAIN. * gnu/packages/gcc.scm (gcc): Change from GCC-5 to GCC-7. (gfortran): Change to GFORTRAN-7. (gcc-objc): Change to GCC-OBJC-7. (gcc-objc++): Change to GCC-OBJC++-7. * gnu/packages/rust.scm (rust-1.19.0)[native-search-paths]: Change from C_INCLUDE_PATH & co to CPATH. --- gnu/build/cross-toolchain.scm | 18 +++++++++++++----- gnu/packages/commencement.scm | 22 +++++++++++++++++----- gnu/packages/cross-base.scm | 7 ++----- gnu/packages/gcc.scm | 8 ++++---- gnu/packages/rust.scm | 5 +---- 5 files changed, 37 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index d430b8afc4..0b5450d1b4 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,11 +37,8 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'CPATH'. - '("C_INCLUDE_PATH" - "CPLUS_INCLUDE_PATH" - "OBJC_INCLUDE_PATH" - "OBJCPLUS_INCLUDE_PATH")) + ;; Note: See for why not 'C_INCLUDE_PATH' & co. + '("CPATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. @@ -171,6 +169,16 @@ a target triplet." (if (string-contains target "mingw") set-cross-path/mingw set-cross-path)) + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (when libc + ;; For GCC6 and later, make sure Glibc is treated as a "system + ;; header" such that #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) + #t))) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) (replace 'install install-strip))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 79246a0c5d..92a67acede 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -1578,6 +1579,7 @@ exec " gcc "/bin/" program "--disable-libsanitizer" "--disable-libitm" "--disable-libgomp" + "--disable-libmpx" "--disable-libcilkrts" "--disable-libvtv" "--disable-libssp" @@ -2118,6 +2120,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; except for the configure-flags. ,@(package-arguments lib) #:configure-flags `("--disable-shared" + "--disable-libstdcxx-dual-abi" "--disable-libstdcxx-threads" "--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" @@ -2207,6 +2210,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" char-set:letter) ,(package-name lib))) (list gmp-6.0 mpfr mpc)) + #t))) + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + ;; Make sure Glibc is treated as a "system header" so + ;; #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)))))))) ;; This time we want Texinfo, so we get the manual. Add @@ -2455,23 +2467,23 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.") ("libc-debug" ,glibc-final "debug") ("libc-static" ,glibc-final "static"))))) +(define-public gcc-toolchain + (make-gcc-toolchain gcc-final)) + (define-public gcc-toolchain-4.8 (make-gcc-toolchain gcc-4.8)) (define-public gcc-toolchain-4.9 (make-gcc-toolchain gcc-4.9)) -(define-public gcc-toolchain - (make-gcc-toolchain gcc-final)) - (define-public gcc-toolchain-5 - gcc-toolchain) + (make-gcc-toolchain gcc-5)) (define-public gcc-toolchain-6 (make-gcc-toolchain gcc-6)) (define-public gcc-toolchain-7 - (make-gcc-toolchain gcc-7)) + gcc-toolchain) (define-public gcc-toolchain-8 (make-gcc-toolchain gcc-8)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2fcb7fb36b..8fe9d5b6d6 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -51,11 +51,8 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'CPATH'. - '("C_INCLUDE_PATH" - "CPLUS_INCLUDE_PATH" - "OBJC_INCLUDE_PATH" - "OBJCPLUS_INCLUDE_PATH")) + ;; Note: See for why not 'C_INCLUDE_PATH' & co. + '("CPATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1f1e80dde8..3b6c540221 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -522,7 +522,7 @@ It also includes runtime support libraries for these languages."))) ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions and the gfortran definition ;; accordingly. -(define-public gcc gcc-5) +(define-public gcc gcc-7) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when @@ -660,7 +660,7 @@ as the 'native-search-paths' field." ;; (custom-gcc gcc "fortran" …) because that would lead to a package object ;; that is not 'eq?' with GFORTRAN-5, and thus 'fold-packages' would ;; report two gfortran@5 that are in fact identical. - gfortran-5) + gfortran-7) (define-public gccgo-4.9 (custom-gcc gcc-4.9 "gccgo" '("go") @@ -724,7 +724,7 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) -(define-public gcc-objc gcc-objc-5) +(define-public gcc-objc gcc-objc-7) (define-public gcc-objc++-4.8 (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") @@ -780,7 +780,7 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) -(define-public gcc-objc++ gcc-objc++-5) +(define-public gcc-objc++ gcc-objc++-7) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC." diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..6e3ea79845 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -406,10 +406,7 @@ test = { path = \"../libtest\" } ;; modules (see ). (native-search-paths (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") + (variable "CPATH") (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") -- cgit v1.2.3 From 3670ea70e2e932969a3ffc0acf75a714c7b42540 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 19 Jan 2019 19:02:47 +0200 Subject: gnu: glibc-final-with-bootstrap-bash: Don't enable obsolete rpc. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash) [arguments]: Remove 'enable-obsolete-rpc' configure flag. This brings this glibc package in line with the other glibc packages which are also built without the pre-2.14 glibc RPC functions. These functions cause build failures on armhf-linux and aarch64-linux. --- gnu/packages/commencement.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 92a67acede..a76867f426 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1874,11 +1874,7 @@ the bootstrap environment." ((#:configure-flags flags) `(append (list ,(string-append "--host=" (boot-triplet)) ,(string-append "--build=" - (nix-system->gnu-triplet)) - - ;; Build Sun/ONC RPC support. In particular, - ;; install rpc/*.h. - "--enable-obsolete-rpc") + (nix-system->gnu-triplet))) ,flags)) ((#:phases phases) `(modify-phases ,phases -- cgit v1.2.3 From a1635de0ce12979d74ba3796d460c01e58b198f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 20:46:57 +0200 Subject: gnu: python: Fix FTBFS with GCC >= 6. * gnu/packages/patches/python-3-search-paths.patch: s/C_INCLUDE_PATH/CPATH. * gnu/packages/patches/python-2.7-search-paths.patch: Ditto. --- gnu/packages/patches/python-2.7-search-paths.patch | 4 ++-- gnu/packages/patches/python-3-search-paths.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index ba7235df27..a012bc8fe0 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 @@ -9,7 +9,7 @@ looking for headers and libraries. + # Always honor these variables. + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 73e3f4ccf5..c824705633 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. --- setup.py 2015-10-07 23:32:58.891329173 +0200 @@ -10,7 +10,7 @@ looking for headers and libraries. - lib_dirs = self.compiler.library_dirs + system_lib_dirs - inc_dirs = self.compiler.include_dirs + system_include_dirs + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and -- cgit v1.2.3 From 546bee40023687e52aff457b3b487cd47d751548 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 14:48:07 +0200 Subject: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries. * gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and C_INCLUDE_PATH instead of just the latter. --- gnu/packages/cmake.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7186cf98df..5bd91b7bf5 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -116,7 +116,8 @@ ;; Help cmake's bootstrap process to find system libraries (begin (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") + (getenv "C_INCLUDE_PATH"))) #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 7f81f8bcccb1aa624e1a5f64992dbeb38de5515f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 14:50:02 +0200 Subject: gnu: cppunit: Update to 1.14.0. * gnu/packages/check.scm (cppunit): Update to 1.14.0. (cppunit-1.14): Remove variable. * gnu/packages/libreoffice.scm (libreoffice)[inputs]: Change CPPUNIT-1.14 to CPPUNIT. --- gnu/packages/check.scm | 21 ++------------------- gnu/packages/libreoffice.scm | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3932f4c305..2e9103ab90 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -132,14 +132,14 @@ with a flexible variety of user interfaces.") (define-public cppunit (package (name "cppunit") - (version "1.13.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "-" version ".tar.gz")) (sha256 (base32 - "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz")))) + "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))) ;; Explicitly link with libdl. This is expected to be done by packages ;; relying on cppunit for their tests. However, not all of them do. ;; If we added the linker flag to such packages, we would pollute all @@ -154,23 +154,6 @@ unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.") (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball -;; Some packages require this newer version of cppunit. However, it needs -;; C++11 support, which is not enabled by default in our current GCC, and -;; updating in-place would require adding CXXFLAGS to many dependent packages. -;; Thus, keep as a separate variable for now. -;; TODO: Remove this when our default GCC is updated to 6 or higher. -(define-public cppunit-1.14 - (package - (inherit cppunit) - (version "1.14.0") - (source (origin - (method url-fetch) - (uri (string-append "https://dev-www.libreoffice.org/src/" - "cppunit-" version ".tar.gz")) - (sha256 - (base32 - "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))))) - ;; When dependent packages upgraded to use newer version of catch, this one should ;; be removed. (define-public catch-framework diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b047c34a0b..712b25bc24 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1011,7 +1011,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) - ("cppunit" ,cppunit-1.14) + ("cppunit" ,cppunit) ("flex" ,flex) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) -- cgit v1.2.3 From a555c3f4386a4cbb2abae52768dbca408a8ad9da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 13:46:32 +0200 Subject: gnu: swig: Fix FTBFS with GCC >= 6. * gnu/packages/swig.scm (swig)[arguments]: Add phase to remove -isystem flag to GCC. --- gnu/packages/swig.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 61f6a8ccfe..b1b17fc68d 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,14 @@ ;; Required since Perl 5.26.0's removal of the current ;; working directory from @INC. ;; TODO Try removing this for later versions of SWIG. - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))))) + (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t)) + (add-before 'configure 'workaround-gcc-bug + (lambda _ + ;; XXX: Don't add the -isystem flag, or GCCs #include_next + ;; won't be able to find . + (substitute* "configure" + (("-isystem ") "-I")) + #t))))) (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(;; Provide these to run the corresponding tests. -- cgit v1.2.3 From 8771fc1715b400ead16f97683c67ad336b485750 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 14:38:25 +0200 Subject: gnu: aspell: Fix FTBFS with GCC7. * gnu/packages/patches/aspell-gcc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/aspell.scm (aspell)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/aspell.scm | 3 ++- gnu/packages/patches/aspell-gcc-compat.patch | 31 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/aspell-gcc-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9df65b9d21..d16b9e8c01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -643,6 +643,7 @@ dist_patch_DATA = \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ + %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index ca9fc8eda5..01133155e1 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -45,7 +45,8 @@ (sha256 (base32 "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm")) - (patches (search-patches "aspell-default-dict-dir.patch")))) + (patches (search-patches "aspell-default-dict-dir.patch" + "aspell-gcc-compat.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/aspell-gcc-compat.patch b/gnu/packages/patches/aspell-gcc-compat.patch new file mode 100644 index 0000000000..94c44f8fb6 --- /dev/null +++ b/gnu/packages/patches/aspell-gcc-compat.patch @@ -0,0 +1,31 @@ +Fix GCC7 warnings. + +Taken from upstream: +https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384 + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); -- cgit v1.2.3 From 43d4c2298143631ada19539314c99775c18747e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 15:32:40 +0200 Subject: gnu: libevdev: Fix FTBFS with GCC7. * gnu/packages/xorg.scm (libevdev)[arguments]: Add phase to please "gcc -pedantic". --- gnu/packages/xorg.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bf7a4050a3..15ebd380d4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2402,6 +2402,18 @@ XC-APPGROUP, XTEST.") (base32 "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'pedantry + (lambda _ + ;; XXX: libevdev includes kernel headers, which causes this + ;; compile test to fail with: + ;; ...-headers-4.14.67/include/asm-generic/posix_types.h:88:14: + ;;error: ISO C90 does not support ‘long long’ [-Werror=long-long] + (substitute* "test/Makefile.in" + (("-pedantic -Werror -std=c89") + "-pedantic -Werror -std=c99")) + #t))))) (native-inputs `(("python" ,python))) (home-page "https://www.freedesktop.org/wiki/Software/libevdev/") (synopsis "Wrapper library for evdev devices") -- cgit v1.2.3 From b6c2805c0b6d9d237c52f9e0cc779fb7af548b93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 18:31:26 +0200 Subject: gnu: hyperrogue: Fix FTBFS with GCC7. * gnu/packages/games.scm (hyperrogue)[arguments]: Remove redundant #:make-flags. Preserve original CPATH when adding SDL path. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5d7c89a880..f46da6cff4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3635,7 +3635,8 @@ throwing people around in pseudo-randomly generated buildings.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") + (string-append (getenv "CPATH") ":" + (assoc-ref inputs "sdl-union") "/include/SDL")))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 0bba8a5cf8a089227549bcb0489628e5b08183c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 18:54:59 +0200 Subject: gnu: inkscape: Fix FTBFS with GCC >= 6. * gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase 'dont-use-system-includes. --- gnu/packages/inkscape.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 7b17ebae40..a2c6778b57 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -86,6 +86,13 @@ (lambda _ (substitute* "share/icons/application/CMakeLists.txt" (("gtk-update-icon-cache") "true")) + #t)) + (add-before 'configure 'dont-use-system-includes + (lambda _ + ;; Don't add redundant -isystem includes which confuses GCC7. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("include_directories\\(SYSTEM") + "include_directories(")) #t))))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") -- cgit v1.2.3 From a46dcdfa3d9002eface76ef9f83e5d34c1ecbfb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:10:08 +0100 Subject: gnu: GnuTLS: Update to 3.6.6. * gnu/packages/tls.scm (gnutls): Update to 3.6.6. [source](snippet): Remove. --- gnu/packages/tls.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c025bfc56f..a90cf0b0c2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -164,7 +164,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.5") + (version "3.6.6") (source (origin (method url-fetch) (uri @@ -176,16 +176,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7")) - (modules '((guix build utils))) - (snippet - '(begin - ;; XXX: The generated configure script in GnuTLS 3.6.5 - ;; apparently does not know about Guile 2.2. - (substitute* "configure" - (("guile_versions_to_search=\"2\\.0 1\\.8\"") - "guile_versions_to_search=\"2.2 2.0 1.8\"")) - #t)))) + "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From cb2c6364947017c06e8437477071f8d1098833a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:10:48 +0100 Subject: gnu: OpenLDAP: Update to 2.4.47. * gnu/packages/openldap.scm (openldap): Update to 2.4.47. --- gnu/packages/openldap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 368a953cb5..0d07571c2c 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -56,7 +56,7 @@ (define-public openldap (package (name "openldap") - (version "2.4.46") + (version "2.4.47") (source (origin (method url-fetch) @@ -73,7 +73,7 @@ "openldap-release/openldap-" version ".tgz"))) (sha256 (base32 - "0bab1km8f2nan1x0zgwliknbxg0zlf2pafxrr867kblrdfwdr44s")))) + "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 0c5ddd40b12102e14559f4703da2557913401b17 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:11:35 +0100 Subject: gnu: libuv: Update to 1.26.0. * gnu/packages/libevent.scm (libuv): Update to 1.26.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b3a5471527..0b8deaf15d 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "01pg0zsfr8mxlpipkbpw0dpsl26x5s966f5br7dx9ac29abk419q")))) + "1rqlh0ag02fni8ildz3anc26z9vz69vwf5qmzsid2gvzzfkigy6a")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From 2bdf9cb38c82a460632c9866f80278da1b35b12d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:12:01 +0100 Subject: gnu: RHash: Update to 1.3.8. * gnu/packages/crypto.scm (rhash): Update to 1.3.8. [arguments]: Adjust install target. --- gnu/packages/crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ffef4ff8e4..3cb80eb0f2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -683,7 +683,7 @@ BLAKE.") (define-public rhash (package (name "rhash") - (version "1.3.6") + (version "1.3.8") (source (origin (method url-fetch) @@ -692,7 +692,7 @@ BLAKE.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14ngzfgmd1lfp7m78sn49x8ymf2s37nrr67c6p5vas85nrrgjkcn")))) + "0k60ywyhwqwqxa2q2l85vwgf884hcgy31nxir3dqgz7ymib6llxy")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -711,7 +711,7 @@ BLAKE.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "-C" "librhash" - "install-headers" "install-so-link" + "install-lib-headers" "install-so-link" make-flags)))))) (home-page "https://sourceforge.net/projects/rhash/") (synopsis "Utility for computing hash sums") -- cgit v1.2.3 From c3188c9accaa0299ea181617b5ab6a5682837e58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:12:53 +0100 Subject: gnu: nghttp2: Remove GCC7 workaround. * gnu/packages/web.scm (nghttp2)[native-inputs]: Remove GCC-7. [arguments]: Remove phase 'work-around-bug-30756'. --- gnu/packages/web.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 158d542d7f..129e8861a8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6255,7 +6255,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") "lib")) ; only libnghttp2 (native-inputs `(("pkg-config" ,pkg-config) - ("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later ;; Required by tests. ("cunit" ,cunit) @@ -6287,9 +6286,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (("@prefix@") (assoc-ref outputs "lib"))) #t)) - (add-before 'configure 'work-around-bug-30756 - (lambda _ - (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)) (add-before 'check 'set-timezone-directory (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") -- cgit v1.2.3 From e04780b836a42050097fd2593eae8f2d636f8af7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:13:35 +0100 Subject: gnu: nghttp2: Update to 1.36.0. * gnu/packages/web.scm (nghttp2): Update to 1.36.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 129e8861a8..b386c1d469 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6240,7 +6240,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.35.1") + (version "1.36.0") (source (origin (method url-fetch) @@ -6249,7 +6249,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv")))) + "1z47hadp5gpspfn41dj4mb0m5fzbkw1jw8sahjkabvc8gcaqdfz9")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 8152024c2c743aada72b26692862859f74866640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:14:02 +0100 Subject: gnu: graphite2: Update to 1.3.13. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.13. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 274efe5fd8..2b60979699 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -433,7 +433,7 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.12") + (version "1.3.13") (source (origin (method url-fetch) @@ -441,7 +441,7 @@ applications should be.") "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "1l1940d8fz67jm6a0x8cjb5p2dv48cvz3wcskwa83hamd70k15fd")))) + "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3 From 342c695e10a4528338a63301c99c3c175e8a4931 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:14:51 +0100 Subject: gnu: harfbuzz: Update to 2.3.1. * gnu/packages/gtk.scm (harfbuzz): Update to 2.3.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 93b9ba09fe..4817fec8c1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,7 +182,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -190,7 +190,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "047q63jr513azf3g1y7f5xn60b4jdjs9zsmrx04sfw5rasyzrk5p")))) + "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From f9126dd404b61d7aeea8cf5ddcfb3b2829ac0f73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:18:18 +0100 Subject: gnu: libidn2: Update to 2.1.1a. * gnu/packages/libidn.scm (libidn2): Update to 2.1.1a. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 719a0f0b4b..1487a7644d 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -59,14 +59,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.0.5") + (version "2.1.1a") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "0s4nkazy1xbs6bbq4farby1xhmhzk5bdclbil5gqdwyzxsgabxqg")))) + "1pdvar50hsgma40gmd7rgrwxhfbqfdpx5slxhl3jjpy1rcjgy9bd")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From 7d9ca5c4b55a22da249ff2afec07e0d0f7a623f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:45:27 +0100 Subject: gnu: curl: Remove graft for 7.64.0. * gnu/packages/curl.scm (curl): Update to 7.64.0. (curl-7.64.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 12a82d1bb7..2e14e05c2c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.64.0) - (version "7.63.0") + (version "7.64.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1i38v49233jirzlfqd8fy6jyf80assa953hk7w6qmysbg562604n")))) + "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -142,19 +141,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.64.0 - (package - (inherit curl) - (version "7.64.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From fe82194394137bbd617d474d3a3b58783afb0470 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:27:12 +0100 Subject: gnu: gdbm: Update to 1.18.1. * gnu/packages/dbm.scm (gdbm): Update to 1.18.1. --- gnu/packages/dbm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index bf548a25f3..2f1c88f112 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -139,14 +139,14 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") (define-public gdbm (package (name "gdbm") - (version "1.18") + (version "1.18.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) + "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit v1.2.3 From 35b259eed055e288eadb2365b5ab4e8b15f363a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 16:42:15 +0100 Subject: gnu: pixman: Update to 0.38.0. * gnu/packages/xdisorg.scm (pixman): Update to 0.38.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5359c4c9d9..c43f834985 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -298,7 +298,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.36.0") + (version "0.38.0") (source (origin (method url-fetch) (uri (string-append @@ -306,7 +306,7 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "1blzrx50ssdv0pn56hcv2v0zw0vrjwj1sx22pkgjls1p9n6rr88w")) + "1a0ci5ni7wngh59m0m00wzvhrc39aqj54yj88msw5msn07pjnnd7")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 9df397508dc1bc3544534aebc7c658c9754b08b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:15:10 +0100 Subject: gnu: poppler: Update to 0.74.0. * gnu/packages/patches/scribus-poppler-0.73.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/scribus.scm (scribus)[source](patches): Add it. * gnu/packages/pdf.scm (poppler): Update to 0.74.0. [arguments]: Adjust renamed configure flag. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add phase 'use-code-for-even-newer-poppler'. --- gnu/local.mk | 1 + gnu/packages/patches/scribus-poppler-0.73.patch | 36 +++++++++++++++++++++++++ gnu/packages/pdf.scm | 6 ++--- gnu/packages/scribus.scm | 4 ++- gnu/packages/tex.scm | 9 +++++++ 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/scribus-poppler-0.73.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 3a7bbedf6c..3f66beac14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1220,6 +1220,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/scribus-poppler.patch \ + %D%/packages/patches/scribus-poppler-0.73.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch new file mode 100644 index 0000000000..5cf4cf721d --- /dev/null +++ b/gnu/packages/patches/scribus-poppler-0.73.patch @@ -0,0 +1,36 @@ +Fix build with Poppler 0.73. + +This is an amalgamation of these upstream commits: +https://github.com/scribusproject/scribus/commit/d34e59bfe495250ba023ba0f99e672ee32300a27 +https://github.com/scribusproject/scribus/commit/c43a89030026f8ffab5070b6935daee8bd74838a + +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index c46448b80a..4dac7c3983 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. + #include "selection.h" + #include "vgradient.h" + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) + #include ++#endif + #include + #include + #include +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index f6b3950377..80ac796501 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -37,4 +37,11 @@ for which a new license (GPL+exception) is in place. + #define getCString c_str + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) ++#define Guchar unsigned char ++#define Gushort unsigned short ++#define Guint unsigned int ++#define Gulong unsigned long ++#endif ++ + #endif diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 504e69c769..1aa47b5c28 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -83,14 +83,14 @@ (define-public poppler (package (name "poppler") - (version "0.72.0") + (version "0.74.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0lfs1b1jfamxl13zbl5n448dqvl9n8frbv8180y7b7kfyaw7wx61")))) + "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no @@ -122,7 +122,7 @@ #:configure-flags (let* ((out (assoc-ref %outputs "out")) (lib (string-append out "/lib"))) - (list "-DENABLE_XPDF_HEADERS=ON" ; to install header files + (list "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" ;to install header files "-DENABLE_ZLIB=ON" (string-append "-DCMAKE_INSTALL_LIBDIR=" lib) (string-append "-DCMAKE_INSTALL_RPATH=" lib))))) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 20795da275..5b770fd696 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -97,7 +97,9 @@ (file-name "scribus-poppler-0.70.patch") (sha256 (base32 - "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))))) + "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))) + + (search-patches "scribus-poppler-0.73.patch"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5f294dc84c..631fb8319f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -200,6 +200,15 @@ (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) + (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler + (lambda _ + ;; Adjust for deprecated types in Poppler 0.73. + (substitute* (append + (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") + '("texk/web2c/pdftexdir/pdftosrc.cc")) + (("Guint") "unsigned int") + (("Guchar") "unsigned char")) + #t)) (add-after 'unpack 'disable-failing-test (lambda _ ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28: -- cgit v1.2.3 From 0b7c0b699db4351522459ec69d8a159ed9fae6c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:27:56 +0100 Subject: gnu: libx11: Update to 1.6.7. * gnu/packages/xorg.scm (libx11): Update to 1.6.7. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 15ebd380d4..f4dbdffb63 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5261,7 +5261,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.6") + (version "1.6.7") (source (origin (method url-fetch) @@ -5271,7 +5271,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))) + "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML -- cgit v1.2.3 From 709fdfc21ec565b93630b935bd18b0803feace72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:28:15 +0100 Subject: gnu: libsm: Update to 1.2.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f4dbdffb63..bdfbabb356 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1212,7 +1212,7 @@ hit when running single-threaded.") (define-public libsm (package (name "libsm") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -1222,7 +1222,7 @@ hit when running single-threaded.") ".tar.bz2")) (sha256 (base32 - "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b")))) + "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id")))) (build-system gnu-build-system) (propagated-inputs `(("libice" ,libice))) ; SMlib.h includes ICElib.h -- cgit v1.2.3 From 4e546e546d85d590db32ab9dd7bc6ab5c14f28ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 23:51:48 +0100 Subject: gnu: libxau: Update to 1.0.9. * gnu/packages/xorg.scm (libxau): Update to 1.0.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bdfbabb356..b8e6c4add5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4845,7 +4845,7 @@ common definitions and porting layer.") (define-public libxau (package (name "libxau") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) @@ -4855,7 +4855,7 @@ common definitions and porting layer.") ".tar.bz2")) (sha256 (base32 - "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x")))) + "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 66679ab97846568a8a222afddc5181586636b74e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:17:08 +0100 Subject: gnu: libreoffice.scm: Fix build failures with GCC7. * gnu/packages/libreoffice.scm (libwpd, libcmis, libpagemaker)[arguments]: Add "--disable-werror" to #:configure-flags. --- gnu/packages/libreoffice.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 712b25bc24..4e90d436ac 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -181,6 +181,8 @@ spreadsheets and presentations.") (sha256 (base32 "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-werror"))) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) @@ -315,6 +317,8 @@ working with graphics in the WPG (WordPerfect Graphics) format.") ;; FIXME: Man pages generation requires docbook-to-man; reenable ;; it once this is available. "--without-man" + ;; XXX: A configure test fails with GCC7 when including Boost headers. + "--disable-werror" ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" @@ -565,6 +569,8 @@ Java.") (sha256 (base32 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-werror"))) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f85ca6eda044c43bd5b9b54e756c02fd90c372f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:21:22 +0100 Subject: gnu: Remove WebKitGTK@2.20. * gnu/packages/gnome.scm (eolie, epiphany)[native-inputs]: Remove GCC-7. [inputs]: Change WEBKITGTK-2.22 to WEBKITGTK. [arguments]: Adjust accordingly. * gnu/packages/web-browsers.scm (next-gtk-webkit): Likewise. * gnu/packages/webkit.scm (webkitgtk): Update to 2.22.6. (webkitgtk-2.22): Remove variable. --- gnu/packages/gnome.scm | 9 +++------ gnu/packages/web-browsers.scm | 10 +++------- gnu/packages/webkit.scm | 34 ++-------------------------------- 3 files changed, 8 insertions(+), 45 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a09ae373c..3a34356beb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4130,7 +4130,6 @@ work and the interface is well tested.") ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" - "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4143,8 +4142,7 @@ work and the interface is well tested.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 - ("intltool" ,intltool) + `(("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("python" ,python) @@ -4165,7 +4163,7 @@ work and the interface is well tested.") ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description @@ -4203,7 +4201,6 @@ a secret password store, an adblocker, and a modern UI.") `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4224,7 +4221,7 @@ a secret password store, an adblocker, and a modern UI.") ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c9038ed8c7..b84abd0929 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -383,10 +383,7 @@ driven and does not detract you from your daily work.") (arguments `(#:tests? #f ; no tests #:make-flags (list "gtk-webkit" - (string-append - "CC=" - (assoc-ref %build-inputs "gcc-7") - "/bin/gcc") + "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -397,10 +394,9 @@ driven and does not detract you from your daily work.") (inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (native-inputs - `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://next.atlas.engineer") (synopsis "Infinitely extensible web-browser (user interface only)") (description "Next is a keyboard-oriented, extensible web-browser diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 91c6c7d02a..af34052ee4 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -59,14 +59,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.20.5") + (version "2.22.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m")))) + "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments @@ -160,33 +160,3 @@ HTML/CSS applications to full-fledged web browsers.") license:lgpl2.1+ license:bsd-2 license:bsd-3)))) - -;; This version of webkitgtk needs to be kept separate, because it requires a -;; newer version of GCC than our default compiler, and this causes problems -;; when linked with C++ libraries built using our default compiler. For now, -;; we use this newer webkitgtk only for selected packages, e.g. epiphany. -(define-public webkitgtk-2.22 - (package/inherit webkitgtk - (name "webkitgtk") - (version "2.22.6") - (source (origin - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) - (native-inputs - `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer - ,@(package-native-inputs webkitgtk))) - (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)))))))) -- cgit v1.2.3 From 63d4ef52ebad4157817d56ccbe974da8fff81929 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:49:27 +0100 Subject: gnu: Remove GCC < 7 workarounds. * gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. * gnu/packages/games.scm (openrct2): Likewise. * gnu/packages/linux.scm (make-linux-libre): Likewise. * gnu/packages/mpd.scm (mpd): Likewise. * gnu/packages/storage.scm (ceph): Likewise. --- gnu/packages/emulators.scm | 6 ------ gnu/packages/games.scm | 13 ++++--------- gnu/packages/linux.scm | 9 --------- gnu/packages/mpd.scm | 17 ++--------------- gnu/packages/storage.scm | 8 +------- 5 files changed, 7 insertions(+), 46 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 184a3bc859..16dc7945ba 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -151,11 +151,6 @@ '(#:tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'configure 'generate-fonts&hardcore-libvulkan-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((fontfile @@ -189,7 +184,6 @@ "-DX11_FOUND=1"))) (native-inputs `(("pkg-config" ,pkg-config) - ("gcc" ,gcc-7) ; Building with gcc@5 doesn't work anymore. ("gettext" ,gnu-gettext))) (inputs `(("alsa-lib" ,alsa-lib) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f46da6cff4..8858de7713 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2615,16 +2615,12 @@ Transport Tycoon Deluxe.") "/share/openrct2/title-sequences") "data/title") (copy-recursively (string-append objects "/share/openrct2/objects") "data/object")))) - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) - (add-after 'fixgcc7 'get-rid-of-errors + (add-before 'configure 'get-rid-of-errors (lambda _ ;; Don't treat warnings as errors. (substitute* "CMakeLists.txt" - (("-Werror") ""))))))) + (("-Werror") "")) + #t))))) (inputs `(("curl" ,curl) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -2640,8 +2636,7 @@ Transport Tycoon Deluxe.") ("speexdsp" ,speexdsp) ("zlib" ,zlib))) (native-inputs - `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7c242015e..e71c62900f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -308,10 +308,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("flex" ,flex) ("bison" ,bison) - ;; Build with GCC-7 for full retpoline support. - ;; FIXME: Remove this when our default compiler has retpoline support. - ("gcc" ,gcc-7) - ;; These are needed to compile the GCC plugins. ("gmp" ,gmp) ("mpfr" ,mpfr) @@ -338,11 +334,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")) #t)) - (add-before 'configure 'work-around-gcc-7-include-path-issue - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7885e21aa4..56ffe177f2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -103,17 +103,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'... - #:phases - (modify-phases %standard-phases - (add-before 'configure 'expand-C++-include-path - ;; Make /include/c++/ext/string_conversions.h find . - (lambda* (#:key inputs #:allow-other-keys) - (let* ((path "CPLUS_INCLUDE_PATH") - (gcc (assoc-ref inputs "gcc")) - (c++ (string-append gcc "/include/c++"))) - (setenv path (string-append c++ ":" (getenv path))) - #t)))))) + `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) @@ -135,10 +125,7 @@ interfacing MPD in the C, C++ & Objective C languages.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) - ;; MPD > 0.21 requires > GCC 6 - (native-inputs `(("gcc" ,gcc-8) - ("gcc-lib" ,gcc-8 "lib") - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) ;; Missing optional inputs: ;; libyajl diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 063825f429..4cff9665d5 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -237,11 +237,6 @@ (("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n") (("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n")) #t))) - (add-before 'configure 'gcc-workaround - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'check 'set-check-environment (lambda _ ;; Run tests in parallel. @@ -289,8 +284,7 @@ (outputs '("out" "lib")) (native-inputs - `(("gcc" ,gcc-7) ;7 or later is required - ("gperf" ,gperf) + `(("gperf" ,gperf) ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From 47f66348f7c80056d6ae9637c42fce4effa688db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:24:03 +0100 Subject: gnu: python-more-itertools: Update to 6.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 6.0.0. [propagated-inputs]: Remove PYTHON-SIX-BOOTSTRAP. [properties]: New field. (python2-more-itertools): Stay on version 5.0.0. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d119fd12a..5768228dfe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -13788,27 +13788,40 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "5.0.0") + (version "6.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") (description "Python's built-in @code{itertools} module implements a number of iterator building blocks inspired by constructs from APL, Haskell, and SML. @code{more-itertools} includes additional building blocks for working with iterables.") + (properties `((python2-variant . ,(delay python2-more-itertools)))) (license license:expat))) +;; The 5.x series are the last versions supporting Python 2.7. (define-public python2-more-itertools - (package-with-python2 python-more-itertools)) + (package + (inherit python-more-itertools) + (name "python2-more-itertools") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "more-itertools" version)) + (sha256 + (base32 + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + (arguments + `(#:python ,python2-minimal)) + (propagated-inputs + `(("python2-six" ,python2-six-bootstrap))))) (define-public python-latexcodec (package -- cgit v1.2.3 From b3e508dadbeb1a08592f8691a1de63bdeb43b39a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:59:45 +0100 Subject: gnu: texinfo: Update to 6.6. * gnu/packages/patches/texinfo-perl-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/texinfo.scm (texinfo): Update to 6.6. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/patches/texinfo-perl-compat.patch | 51 -------------------------- gnu/packages/texinfo.scm | 5 +-- 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/texinfo-perl-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index e239c76c7c..0500a06b53 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1270,7 +1270,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ - %D%/packages/patches/texinfo-perl-compat.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \ %D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \ diff --git a/gnu/packages/patches/texinfo-perl-compat.patch b/gnu/packages/patches/texinfo-perl-compat.patch deleted file mode 100644 index a7348fde0d..0000000000 --- a/gnu/packages/patches/texinfo-perl-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fix compatibility with newer Perls. - -The first patch is taken from upstream: -https://svn.savannah.gnu.org/viewvc/texinfo?view=revision&revision=8008 - -The second gets rid of a deprecation warning that breaks some tests. -Taken from Fedora: . - ---- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2017/04/30 14:57:26 7765 -+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018/07/13 15:39:29 8008 -@@ -248,6 +248,11 @@ - - dTHX; - -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ switch_to_global_locale(); -+#endif -+ - if (setlocale (LC_CTYPE, "en_US.UTF-8") - || setlocale (LC_CTYPE, "en_US.utf8")) - goto success; -@@ -320,6 +325,10 @@ - { - success: ; - free (utf8_locale); -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ sync_locale(); -+#endif - /* - fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); - fprintf (stderr, "character encoding is: %s\n", - -diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm ---- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 -+++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index fa98bd56b8..befdd78551 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -32,15 +32,14 @@ (define-public texinfo (package (name "texinfo") - (version "6.5") + (version "6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) - (patches (search-patches "texinfo-perl-compat.patch")) (sha256 (base32 - "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) + "0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("perl" ,perl))) -- cgit v1.2.3 From 128c82bb3961ff74ff5b5fcac7c75b87fdee9336 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:35:29 +0100 Subject: gnu: libgpg-error: Update to 1.35. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.35. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e0a763dfaf..42b66f8953 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -77,7 +77,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.32") + (version "1.35") (source (origin (method url-fetch) @@ -85,7 +85,7 @@ version ".tar.bz2")) (sha256 (base32 - "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3")))) + "0rz00xyrk7qzg7mmcjhvrnm34hddkvyg9zsqq548vj58m1ifxmfb")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From 3f544cf207b1d7aafdb500b26900fcba4cfe8fa4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Feb 2019 18:49:15 +0100 Subject: gnu: OpenSSL: Remove obsolete phase. * gnu/packages/tls.scm (openssl)[arguments]: Remove 'make-libraries-writable' phase. --- gnu/packages/tls.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f4ae7fbda3..8813083302 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -318,16 +318,6 @@ required structures.") "/share/openssl-" ,version) (string-append "--prefix=" out))))) - (add-after - 'install 'make-libraries-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make libraries writable so that 'strip' does its job. - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (file) - (chmod file #o644)) - (find-files (string-append out "/lib") - "\\.so")) - #t))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. -- cgit v1.2.3 From 218eb6e611c0a238802bf9cb5742d37cea0bb012 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:13:37 +0100 Subject: gnu: tar: Update to 1.32. * gnu/packages/base.scm (tar): Update to 1.32. [arguments]: Remove #:make-flags and #:configure-flags. --- gnu/packages/base.scm | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 289631acee..c252067571 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -156,14 +156,14 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp")) + "1n7xy657ii0sa42zx6944v2m4v9qrh6sqgmw17l3nch3y43sxlyh")) (patches (search-patches "tar-skip-unreliable-tests.patch" "tar-remove-wholesparse-check.patch")))) (build-system gnu-build-system) @@ -177,27 +177,7 @@ implementation offers several extensions over the standard utility.") (substitute* "src/system.c" (("/bin/sh") (string-append bash "/bin/sh"))) - #t)))) - - ;; Work around a cross-compilation bug whereby libgnu.a would provide - ;; '__mktime_internal', which conflicts with the one in libc.a. - ,@(if (%current-target-system) - `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - '()) - - ;; Test #92 "link mismatch" expects "a/z: Not linked to a/y" but gets - ;; "a/y: Not linked to a/z" and fails, presumably due to differences in - ;; the order in which 'diff' traverses directories. That leads to a - ;; test failure even though conceptually the test passes. Skip it. - ;; Test 117 and 118 are prone to race conditions too, particularly - ;; when cross-compiling, so we skip those as well. All issues have - ;; been fixed upstream in these commits: - ;; - ;; - #:make-flags (list (string-append - "TESTSUITEFLAGS= -k '!link mismatch," - "!directory removed before reading," - "!explicitly named directory removed before reading'")))) + #t)))))) ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able ;; to refer to the target Bash. -- cgit v1.2.3 From 9b070277f9cb1512787fc6eb10ecf87102508d86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:31:29 +0100 Subject: gnu: libjpeg-turbo: Remove graft for 2.0.2. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.2. [replacement]: Remove. (libjpeg-turbo-2.0.2): Remove variable. --- gnu/packages/image.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f4bf1116e4..79826a579c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1298,15 +1298,14 @@ PNG, and performs PNG integrity checks and corrections.") (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.1") - (replacement libjpeg-turbo-2.0.2) + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version "/libjpeg-turbo-" version ".tar.gz")) (sha256 (base32 - "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75")))) + "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) @@ -1329,18 +1328,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -(define-public libjpeg-turbo-2.0.2 - (package - (inherit libjpeg-turbo) - (version "2.0.2") - (source (origin - (inherit (package-source libjpeg-turbo)) - (uri (string-append "mirror://sourceforge/libjpeg-turbo/" - version "/libjpeg-turbo-" version ".tar.gz")) - (sha256 - (base32 - "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))))) - (define-public niftilib (package (name "niftilib") -- cgit v1.2.3 From db91596a78cf463056b7304b4fc9e2b19ba042fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:32:16 +0100 Subject: gnu: gd: Incorporate grafted changes. * gnu/packages/gd.scm (gd)[replacement]: Remove. [source](patches): Add gd-CVE-2019-6977.patch and gd-CVE-2019-6978.patch. (gd/fixed): Remove variable. --- gnu/packages/gd.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c08c1f6758..2012a38e26 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,7 +39,6 @@ (define-public gd (package (name "gd") - (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -55,6 +54,8 @@ (patches (search-patches "gd-CVE-2018-5711.patch" "gd-CVE-2018-1000222.patch" + "gd-CVE-2019-6977.patch" + "gd-CVE-2019-6978.patch" "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch")))) (build-system gnu-build-system) @@ -95,16 +96,6 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) -(define-public gd/fixed - (hidden-package - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (append (origin-patches (package-source gd)) - (search-patches "gd-CVE-2019-6977.patch" - "gd-CVE-2019-6978.patch")))))))) - (define-public perl-gd (package (name "perl-gd") -- cgit v1.2.3 From 4e3a7d84613e4caeca903a205f21707cff5819f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:54:46 +0100 Subject: gnu: Python: Consolidate test patches. While at it, adjust patches for -p1 patch flag. * gnu/packages/patches/python-fix-tests.patch: Delete file. Move contents ... * gnu/packages/patches/python-3-fix-tests.patch: ... here. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-3.7)[source](patches): Remove obsolete. [source](patch-flags): Remove. * gnu/packages/patches/python-3-deterministic-build-info.patch, gnu/packages/patches/python-3-search-paths.patch: Adjust for `patch -p1`. --- gnu/local.mk | 1 - .../python-3-deterministic-build-info.patch | 4 +- gnu/packages/patches/python-3-fix-tests.patch | 354 +++++++++++++++------ gnu/packages/patches/python-3-search-paths.patch | 4 +- gnu/packages/patches/python-fix-tests.patch | 147 --------- gnu/packages/python.scm | 2 - 6 files changed, 256 insertions(+), 256 deletions(-) delete mode 100644 gnu/packages/patches/python-fix-tests.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0500a06b53..a1555fa224 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1173,7 +1173,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ - %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ diff --git a/gnu/packages/patches/python-3-deterministic-build-info.patch b/gnu/packages/patches/python-3-deterministic-build-info.patch index 22c372a0cf..25a079fe90 100644 --- a/gnu/packages/patches/python-3-deterministic-build-info.patch +++ b/gnu/packages/patches/python-3-deterministic-build-info.patch @@ -2,8 +2,8 @@ Always provide the same date and time in 'Py_GetBuildInfo'. This is the information shown at the REPL and in 'sys.version'. We cannot pass it in CPPFLAGS due to whitespace in the DATE string. ---- Modules/getbuildinfo.c -+++ Modules/getbuildinfo.c +--- a/Modules/getbuildinfo.c ++++ b/Modules/getbuildinfo.c @@ -4,6 +4,10 @@ #include #endif diff --git a/gnu/packages/patches/python-3-fix-tests.patch b/gnu/packages/patches/python-3-fix-tests.patch index ab713c54dd..e4ba728a7e 100644 --- a/gnu/packages/patches/python-3-fix-tests.patch +++ b/gnu/packages/patches/python-3-fix-tests.patch @@ -1,9 +1,134 @@ -Additional test fixes which affect Python 3.5 (and presumably later) but not -prior revisions of Python. +See the discussion about the issues fixed here at: +http://bugs.python.org/issue20868 . ---- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100 -+++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100 -@@ -2132,8 +2132,7 @@ +diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py +--- a/Lib/ctypes/test/test_callbacks.py ++++ b/Lib/ctypes/test/test_callbacks.py +@@ -3,6 +3,7 @@ import unittest + from ctypes import * + from ctypes.test import need_symbol + import _ctypes_test ++import platform + + class Callbacks(unittest.TestCase): + functype = CFUNCTYPE +@@ -176,6 +177,8 @@ class SampleCallbacksTestCase(unittest.TestCase): + + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_issue_8959_a(self): + from ctypes.util import find_library + libc_path = find_library("c") +diff --git a/Lib/ctypes/test/test_libc.py b/Lib/ctypes/test/test_libc.py +--- a/Lib/ctypes/test/test_libc.py ++++ b/Lib/ctypes/test/test_libc.py +@@ -2,6 +2,7 @@ import unittest + + from ctypes import * + import _ctypes_test ++import platform + + lib = CDLL(_ctypes_test.__file__) + +@@ -17,6 +18,8 @@ class LibTest(unittest.TestCase): + import math + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_qsort(self): + comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) + lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc +diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py +--- a/Lib/distutils/tests/test_archive_util.py ++++ b/Lib/distutils/tests/test_archive_util.py +@@ -333,6 +333,7 @@ class ArchiveUtilTestCase(support.TempdirManager, + self.assertEqual(os.path.basename(res), 'archive.tar.xz') + self.assertEqual(self._tarinfo(res), self._created_files) + ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -362,6 +363,7 @@ class ArchiveUtilTestCase(support.TempdirManager, + + @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_tarfile_root_owner(self): + tmpdir = self._create_files() + base_name = os.path.join(self.mkdtemp(), 'archive') +diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py +--- a/Lib/distutils/tests/test_sdist.py ++++ b/Lib/distutils/tests/test_sdist.py +@@ -443,6 +443,7 @@ class SDistTestCase(BasePyPIRCCommandTestCase): + "The tar command is not found") + @unittest.skipIf(find_executable('gzip') is None, + "The gzip command is not found") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_distribution_owner_group(self): + # now building a sdist + dist, cmd = self.get_cmd() +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -1473,6 +1473,7 @@ class _TestCondition(BaseTestCase): + if pid is not None: + os.kill(pid, signal.SIGINT) + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_wait_result(self): + if isinstance(self, ProcessesMixin) and sys.platform != 'win32': + pid = os.getpid() +diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py +--- a/Lib/test/test_asyncio/test_base_events.py ++++ b/Lib/test/test_asyncio/test_base_events.py +@@ -1301,6 +1301,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value +diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py +--- a/Lib/test/test_generators.py ++++ b/Lib/test/test_generators.py +@@ -34,6 +34,7 @@ class SignalAndYieldFromTest(unittest.TestCase): + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) +diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py +--- a/Lib/test/test_normalization.py ++++ b/Lib/test/test_normalization.py +@@ -2,6 +2,7 @@ from test.support import open_urlresource + import unittest + + from http.client import HTTPException ++from urllib.error import URLError + import sys + from unicodedata import normalize, unidata_version + +@@ -43,6 +44,8 @@ class NormalizationTest(unittest.TestCase): + except PermissionError: + self.skipTest(f"Permission error when downloading {TESTDATAURL} " + f"into the test data directory") ++ except URLError: ++ self.skipTest("DNS lookups are not enabled.") + except (OSError, HTTPException): + self.fail(f"Could not retrieve {TESTDATAURL}") + +diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py +--- a/Lib/test/test_pathlib.py ++++ b/Lib/test/test_pathlib.py +@@ -2130,8 +2130,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self.assertEqual(given, expect) self.assertEqual(set(p.rglob("FILEd*")), set()) @@ -13,47 +138,10 @@ prior revisions of Python. def test_expanduser(self): P = self.cls support.import_module('pwd') ---- Lib/test/test_tarfile.py 2016-02-24 19:22:52.597208055 +0000 -+++ Lib/test/test_tarfile.py 2016-02-24 20:50:48.941950135 +0000 -@@ -2305,11 +2305,14 @@ - try: - import pwd, grp - except ImportError: - return False -- if pwd.getpwuid(0)[0] != 'root': -- return False -- if grp.getgrgid(0)[0] != 'root': -+ try: -+ if pwd.getpwuid(0)[0] != 'root': -+ return False -+ if grp.getgrgid(0)[0] != 'root': -+ return False -+ except KeyError: - return False - return True - - ---- Lib/test/test_asyncio/test_base_events.py -+++ Lib/test/test_asyncio/test_base_events.py -@@ -1216,6 +1216,8 @@ - self._test_create_connection_ip_addr(m_socket, False) - - @patch_socket -+ @unittest.skipUnless(support.is_resource_enabled('network'), -+ 'network is not enabled') - def test_create_connection_service_name(self, m_socket): - m_socket.getaddrinfo = socket.getaddrinfo - sock = m_socket.socket.return_value - ---- Lib/test/test_pdb.py.org 2017-03-12 03:09:01.991856701 +0100 -+++ Lib/test/test_pdb.py 2017-03-12 03:26:17.742572869 +0100 - -For some reason, KeyboardInterrupts do not work in the build -environment (lack of controlling TTY?). Just change the expected -outcome. Unfortunately, this will make it fail for users running -`python -m test test_pdb test_pdb` interactively. - -@@ -928,11 +928,11 @@ +diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py +--- a/Lib/test/test_pdb.py ++++ b/Lib/test/test_pdb.py +@@ -1133,11 +1133,11 @@ def test_pdb_issue_20766(): > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue @@ -65,22 +153,100 @@ outcome. Unfortunately, this will make it fail for users running - pdb 2: + pdb 2: Handlers.SIG_IGN """ - - class PdbTestCase(unittest.TestCase): ---- Lib/test/test_socket.py -+++ Lib/test/test_socket.py -@@ -802,6 +802,8 @@ + + +diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py +--- a/Lib/test/test_regrtest.py ++++ b/Lib/test/test_regrtest.py +@@ -764,6 +764,7 @@ class ArgsTestCase(BaseTestCase): + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +@@ -781,6 +782,7 @@ class ArgsTestCase(BaseTestCase): + % (self.TESTNAME_REGEX, len(tests))) + self.check_line(output, regex) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_slow_interrupted(self): + # Issue #25373: test --slowest with an interrupted test + code = TEST_INTERRUPTED +diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py +--- a/Lib/test/test_resource.py ++++ b/Lib/test/test_resource.py +@@ -145,6 +145,7 @@ class ResourceTest(unittest.TestCase): + + @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') + @support.requires_linux_version(2, 6, 36) ++ @unittest.skipIf(True, "Bug: the PermissionError is not raised") + def test_prlimit(self): + self.assertRaises(TypeError, resource.prlimit) + self.assertRaises(ProcessLookupError, resource.prlimit, +diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py +--- a/Lib/test/test_shutil.py ++++ b/Lib/test/test_shutil.py +@@ -1135,6 +1135,7 @@ class TestShutil(unittest.TestCase): + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -1163,6 +1164,7 @@ class TestShutil(unittest.TestCase): + + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + def test_tarfile_root_owner(self): + root_dir, base_dir = self._create_files() +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- a/Lib/test/test_socket.py ++++ b/Lib/test/test_socket.py +@@ -875,6 +875,8 @@ class GeneralModuleTests(unittest.TestCase): if not fqhn in all_host_names: self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') def test_host_resolution(self): - for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + for addr in [support.HOSTv4, '10.0.0.1', '255.255.255.255']: self.assertEqual(socket.gethostbyname(addr), addr) ---- Lib/test/test_spwd.py -+++ Lib/test/test_spwd.py -@@ -5,8 +5,7 @@ +@@ -1004,6 +1006,8 @@ class GeneralModuleTests(unittest.TestCase): + self.assertWarns(DeprecationWarning, socket.ntohs, k) + self.assertWarns(DeprecationWarning, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1358,6 +1362,8 @@ class GeneralModuleTests(unittest.TestCase): + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1440,6 +1446,8 @@ class GeneralModuleTests(unittest.TestCase): + # only IP addresses are allowed + self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): +diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py +--- a/Lib/test/test_spwd.py ++++ b/Lib/test/test_spwd.py +@@ -5,8 +5,7 @@ from test import support spwd = support.import_module('spwd') @@ -90,7 +256,7 @@ outcome. Unfortunately, this will make it fail for users running class TestSpwdRoot(unittest.TestCase): def test_getspall(self): -@@ -56,8 +55,7 @@ +@@ -56,8 +55,7 @@ class TestSpwdRoot(unittest.TestCase): self.assertRaises(TypeError, spwd.getspnam, bytes_name) @@ -100,50 +266,34 @@ outcome. Unfortunately, this will make it fail for users running class TestSpwdNonRoot(unittest.TestCase): def test_getspnam_exception(self): ---- Lib/test/test_regrtest.py -+++ Lib/test/test_regrtest.py -@@ -700,6 +700,7 @@ - output = self.run_tests('--fromfile', filename) - self.check_executed_tests(output, tests) - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_interrupted(self): - code = TEST_INTERRUPTED - test = self.create_test('sigint', code=code) -@@ -717,6 +718,7 @@ - % (self.TESTNAME_REGEX, len(tests))) - self.check_line(output, regex) - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_slow_interrupted(self): - # Issue #25373: test --slowest with an interrupted test - code = TEST_INTERRUPTED ---- Lib/test/test_generators.py -+++ Lib/test/test_generators.py -@@ -29,6 +29,7 @@ - else: - return "FAILED" - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') - def test_raise_and_yield_from(self): - gen = self.generator1() - gen.send(None) ---- Lib/test/test_normalization.py -+++ Lib/test/test_normalization.py -@@ -2,6 +2,7 @@ - import unittest - - from http.client import HTTPException -+from urllib.error import URLError - import sys - from unicodedata import normalize, unidata_version - -@@ -43,6 +44,8 @@ - except PermissionError: - self.skipTest(f"Permission error when downloading {TESTDATAURL} " - f"into the test data directory") -+ except URLError: -+ self.skipTest("DNS lookups are not enabled.") - except (OSError, HTTPException): - self.fail(f"Could not retrieve {TESTDATAURL}") +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -2504,9 +2504,12 @@ def root_is_uid_gid_0(): + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True +diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py +--- a/Tools/scripts/run_tests.py ++++ b/Tools/scripts/run_tests.py +@@ -39,7 +39,7 @@ def main(regrtest_args): + if not any(is_multiprocess_flag(arg) for arg in regrtest_args): + args.extend(['-j', '0']) # Use all CPU cores + if not any(is_resource_use_flag(arg) for arg in regrtest_args): +- args.extend(['-u', 'all,-largefile,-audio,-gui']) ++ args.extend(['-u', 'all,-largefile,-audio,-gui,-network']) + args.extend(regrtest_args) + print(' '.join(args)) + if sys.platform == 'win32': diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index c824705633..5fea9c66b6 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,8 +1,8 @@ Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. ---- setup.py 2015-10-07 23:32:58.891329173 +0200 -+++ setup.py 2015-10-07 23:46:29.653349924 +0200 +--- a/setup.py 2015-10-07 23:32:58.891329173 +0200 ++++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 @@ -575,8 +575,8 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. diff --git a/gnu/packages/patches/python-fix-tests.patch b/gnu/packages/patches/python-fix-tests.patch deleted file mode 100644 index d8f69866fd..0000000000 --- a/gnu/packages/patches/python-fix-tests.patch +++ /dev/null @@ -1,147 +0,0 @@ -See the discussion about the issues fixed here at: -http://bugs.python.org/issue20868 . - ---- Lib/test/test_shutil.py 2014-03-01 03:02:36.088311000 +0100 -+++ Lib/test/test_shutil.py 2014-03-01 04:56:37.768311000 +0100 -@@ -1127,6 +1127,7 @@ - self.assertRaises(ValueError, make_archive, base_name, 'xxx') - - @support.requires_zlib -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_archive_owner_group(self): - # testing make_archive with owner and group, with various combinations - # this works even if there's not gid/uid support -@@ -1155,6 +1156,7 @@ - - - @support.requires_zlib -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") - def test_tarfile_root_owner(self): - root_dir, base_dir = self._create_files() ---- Lib/test/test_socket.py.orig 2014-03-02 22:14:12.264311000 +0100 -+++ Lib/test/test_socket.py 2014-03-21 03:50:45.660311000 +0100 -@@ -819,6 +819,8 @@ - self.assertRaises(OverflowError, socket.htonl, k) - self.assertRaises(OverflowError, socket.htons, k) - -+ @unittest.skipUnless(os.path.exists("/etc/services"), -+ "getservbyname uses /etc/services, which is not in the chroot") - def testGetServBy(self): - eq = self.assertEqual - # Find one service that exists, then check all the related interfaces. -@@ -1104,6 +1106,8 @@ - self.assertRaises(ValueError, s.ioctl, -1, None) - s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100)) - -+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), -+ "getaddrinfo() will fail") - def testGetaddrinfo(self): - try: - socket.getaddrinfo('localhost', 80) -@@ -1174,6 +1178,8 @@ - # only IP addresses are allowed - self.assertRaises(socket.error, socket.getnameinfo, ('mail.python.org',0), 0) - -+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), -+ "getaddrinfo() will fail") - @unittest.skipUnless(support.is_resource_enabled('network'), - 'network is not enabled') - def test_idna(self): ---- Lib/test/_test_multiprocessing.py 2014-04-06 23:12:27.575235000 +0200 -+++ Lib/test/_test_multiprocessing.py 2014-04-06 23:13:04.827235000 +0200 -@@ -1016,6 +1016,7 @@ - if pid is not None: - os.kill(pid, signal.SIGINT) - -+ @unittest.skipIf(True, "This fails for unknown reasons on Guix") - def test_wait_result(self): - if isinstance(self, ProcessesMixin) and sys.platform != 'win32': - pid = os.getpid() ---- Lib/ctypes/test/test_libc.py 2014-04-07 23:17:41.351235000 +0200 -+++ Lib/ctypes/test/test_libc.py 2014-04-07 23:32:18.799235000 +0200 -@@ -2,6 +2,7 @@ - - from ctypes import * - import _ctypes_test -+import platform - - lib = CDLL(_ctypes_test.__file__) - -@@ -17,6 +18,8 @@ - import math - self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) - -+ @unittest.skipIf(platform.machine() in ['mips64'], -+ "This test fails on this platform") - def test_qsort(self): - comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) - lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc ---- Lib/ctypes/test/test_callbacks.py 2014-04-07 23:15:42.835235000 +0200 -+++ Lib/ctypes/test/test_callbacks.py 2014-04-07 23:32:42.035235000 +0200 -@@ -1,6 +1,7 @@ - import unittest - from ctypes import * - import _ctypes_test -+import platform - - class Callbacks(unittest.TestCase): - functype = CFUNCTYPE -@@ -174,6 +175,8 @@ - - self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) - -+ @unittest.skipIf(platform.machine() in ['mips64'], -+ "This test fails on this platform") - def test_issue_8959_a(self): - from ctypes.util import find_library - libc_path = find_library("c") ---- Tools/scripts/run_tests.py.orig 2015-04-06 03:52:17.484000000 +0200 -+++ Tools/scripts/run_tests.py 2015-04-06 03:52:25.880000000 +0200 -@@ -47,7 +47,7 @@ - if threading and not any(is_multiprocess_flag(arg) for arg in regrtest_args): - args.extend(['-j', '0']) # Use all CPU cores - if not any(is_resource_use_flag(arg) for arg in regrtest_args): -- args.extend(['-u', 'all,-largefile,-audio,-gui']) -+ args.extend(['-u', 'all,-largefile,-audio,-gui,-network']) - args.extend(regrtest_args) - print(' '.join(args)) - os.execv(sys.executable, args) ---- Lib/distutils/tests/test_archive_util.py.orig 2015-04-06 04:08:49.288000000 +0200 -+++ Lib/distutils/tests/test_archive_util.py 2015-04-06 04:09:34.396000000 +0200 -@@ -282,6 +282,7 @@ - finally: - del ARCHIVE_FORMATS['xxx'] - -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_archive_owner_group(self): - # testing make_archive with owner and group, with various combinations - # this works even if there's not gid/uid support -@@ -310,6 +311,7 @@ - - @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") - @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_tarfile_root_owner(self): - tmpdir, tmpdir2, base_name = self._create_files() - old_dir = os.getcwd() ---- Lib/distutils/tests/test_sdist.py.orig 2015-04-06 04:10:05.264000000 +0200 -+++ Lib/distutils/tests/test_sdist.py 2015-04-06 04:10:21.448000000 +0200 -@@ -435,6 +435,7 @@ - "The tar command is not found") - @unittest.skipIf(find_executable('gzip') is None, - "The gzip command is not found") -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_distribution_owner_group(self): - # now building a sdist - dist, cmd = self.get_cmd() ---- Lib/test/test_resource.py.orig 2015-04-06 21:30:24.708000000 +0200 -+++ Lib/test/test_resource.py 2015-04-06 23:07:27.220000000 +0200 -@@ -146,6 +146,7 @@ - - @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') - @support.requires_linux_version(2, 6, 36) -+ @unittest.skipIf(True, "Bug: the PermissionError is not raised") - def test_prlimit(self): - self.assertRaises(TypeError, resource.prlimit) - if os.geteuid() != 0: diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 057c47706b..9ed16d447e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -307,11 +307,9 @@ data types.") (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches - "python-fix-tests.patch" "python-3-fix-tests.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) - (patch-flags '("-p0")) (sha256 (base32 "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) -- cgit v1.2.3 From 5466e82a1e61349e5a3f9726a03874e4f9817226 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Feb 2019 23:37:31 +0100 Subject: gnu: groff: Adjust relocatability snippet for 1.22.4. This commit does three things. It reverts 73b2ce87 ("gnu: groff-minimal: Disable relocatability."), re-applies f57693e1 ("gnu: groff: Disable relocatability."), and finally adjusts the substitution for changes since 0559a4c2 ("gnu: groff: Update to 1.22.4."). * gnu/packages/groff.scm (groff-minimal)[arguments]: Move relocatibility snippet ... (groff)[arguments]: ... here. Don't delete relocation.cpp and adjust file name. --- gnu/packages/groff.scm | 53 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index dd679f1582..cf4a884e04 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -63,6 +63,29 @@ `(#:parallel-build? #f ; parallel build fails #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-relocatability + (lambda _ + ;; Groff contains a Rube Goldberg-esque relocator for the file + ;; "charset.alias". It tries to find the current executable + ;; using realpath, a do-it-yourself search in $PATH and so on. + ;; Furthermore, the routine that does the search is buggy + ;; in that it doesn't handle error cases when they arise. + ;; This causes preconv to segfault when trying to look up + ;; the file "charset.alias" in the NULL location. + ;; The "charset.alias" parser is a copy of gnulib's, and a + ;; non-broken version of gnulib's "charset.alias" parser is + ;; part of glibc's libcharset. + ;; However, groff unconditionally uses their own + ;; "charset.alias" parser, but then DOES NOT INSTALL the + ;; file "charset.alias" when glibc is too new. + ;; In Guix, our file "charset.alias" only contains an obscure + ;; alias for ASCII and nothing else. So just disable relocation + ;; and make the entire "charset.alias" lookup fail. + ;; See for + ;; details. + (substitute* "Makefile.in" + (("-DENABLE_RELOCATABLE=1") "")) + #t)) (add-after 'unpack 'setenv (lambda _ (setenv "GS_GENERATE_UUIDS" "0") @@ -101,36 +124,6 @@ is usually the formatter of \"man\" documentation pages.") ,@(substitute-keyword-arguments (package-arguments groff) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'disable-relocatability - (lambda _ - ;; Groff contains a Rube Goldberg-esque relocator for the - ;; file "charset.alias". - ;; It tries to find the current executable using realpath, - ;; a do-it-yourself search in $PATH and so on. - ;; Furthermore, the routine that does the search is buggy - ;; in that it doesn't handle error cases when they arise. - ;; This causes preconv to segfault when trying to look up - ;; the file "charset.alias" in the NULL location. - ;; The "charset.alias" parser is a copy of gnulib's, and a - ;; non-broken version of gnulib's "charset.alias" parser - ;; is part of glibc's libcharset. - ;; However, groff unconditionally uses their own - ;; "charset.alias" parser, but then DOES NOT INSTALL the - ;; file "charset.alias" when glibc is too new. - ;; In Guix, our file "charset.alias" only contains an - ;; obscure alias for ASCII and nothing else. - ;; So just disable relocation and make the entire - ;; "charset.alias" lookup fail. - ;; See - ;; for details. - (substitute* "src/libs/libgroff/Makefile.sub" - (("-DENABLE_RELOCATABLE=1") "")) - ;; That file contains a crash bug--so make sure that - ;; its contents are not there. - (call-with-output-file "src/libs/libgroff/relocate.cpp" - (lambda (port) - #t)) - #t)) (add-after 'install 'remove-non-essential-programs (lambda* (#:key outputs #:allow-other-keys) ;; Keep only the programs that man-db needs at run time, -- cgit v1.2.3 From b4037d82c0d30455ca9288e18a543dbb310476ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Feb 2019 23:39:02 +0100 Subject: gnu: groff: Return #t from all phases. * gnu/packages/groff.scm (groff)[arguments]: Return #t from phases. --- gnu/packages/groff.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index cf4a884e04..98f17914bf 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -93,7 +93,8 @@ (add-after 'unpack 'fix-docdir (lambda _ ;see https://savannah.gnu.org/bugs/index.php?55461 (substitute* "Makefile.in" - (("^docdir =.*") "docdir = @docdir@\n"))))))) + (("^docdir =.*") "docdir = @docdir@\n")) + #t))))) (synopsis "Typesetting from plain text mixed with formatting commands") (description "Groff is a typesetting package that reads plain text and produces -- cgit v1.2.3 From b45a97ea84befd28b6191aa9ca320b8758ee8090 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Feb 2019 20:28:57 +0100 Subject: gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-base). This makes sure it is inherited by packages using (cross-gcc ...). This commit is a followup to 01e8263febb9634564b4b73af49b81a36567a11b. * gnu/build/cross-toolchain.scm (cross-gcc-build-phases): Move 'treat-glibc-as-system-header' phase ... * gnu/packages/cross-base.scm (cross-gcc-arguments): ... here. --- gnu/build/cross-toolchain.scm | 10 ---------- gnu/packages/cross-base.scm | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 0b5450d1b4..53d6d39187 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -169,16 +169,6 @@ a target triplet." (if (string-contains target "mingw") set-cross-path/mingw set-cross-path)) - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc"))) - (when libc - ;; For GCC6 and later, make sure Glibc is treated as a "system - ;; header" such that #include_next does the right thing. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) - #t))) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) (replace 'install install-strip))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 8fe9d5b6d6..6a092727c1 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,7 +166,19 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,flags)) flags)) ((#:phases phases) - `(cross-gcc-build-phases ,target ,phases)))))) + `(cross-gcc-build-phases + ,target + (modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (when libc + ;; For GCC6 and later, make sure Glibc is treated as a "system + ;; header" such that #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) + #t)))))))))) (define (cross-gcc-patches target) "Return GCC patches needed for TARGET." -- cgit v1.2.3 From e050aa1990ca846ccbf27327bc9009ffcfa0d578 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Feb 2019 20:39:13 +0100 Subject: gnu: make-bootstrap: Adjust for GCC7. This is a follow-up to commit 01e8263febb9634564b4b73af49b81a36567a11b. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc): Add the GCC7 'treat-glibc-as-system-header' build phase. --- gnu/packages/make-bootstrap.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 86e331b34d..ec477da7c8 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -114,11 +115,26 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) - (outputs '("out")) ; all in one so libgcc_s is easily found + (outputs '("out")) ;all in one so libgcc_s is easily found (inputs - `(("libc" ,(glibc-for-bootstrap)) + `(;; Distinguish the name so we can refer to it below. + ("bootstrap-libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") - ,@(package-inputs gcc))))) + ,@(package-inputs gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "bootstrap-libc"))) + ;; GCCs build processes requires that the libc + ;; we're building against is on the system header + ;; search path. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + #t))))))))) ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) (package-with-explicit-inputs p inputs -- cgit v1.2.3 From f90d6c3f69d51f10a47e78c6d57d8e59a7da337e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Feb 2019 20:20:28 +0100 Subject: gnu: efivar: Fix build failure with GCC7. * gnu/packages/linux.scm (efivar)[arguments]: Add phase 'kernel-headers-are-system-headers'. --- gnu/packages/linux.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 23dd3f1ebd..8dd8e947ed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4104,7 +4104,14 @@ under OpenGL graphics workloads.") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-before 'build 'kernel-headers-are-system-headers + (lambda* (#:key inputs #:allow-other-keys) + (let ((kernel-headers (assoc-ref inputs "kernel-headers"))) + ;; Make sure the kernel headers are treated as system headers + ;; to suppress a conflict between "util.h" and . + (setenv "C_INCLUDE_PATH" (string-append kernel-headers "/include")) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From ceb831d33841d47f4b92c07829df9134853c83d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 14:44:37 +0100 Subject: gnu: libcap: Update to 2.26. * gnu/packages/linux.scm (libcap): Update to 2.26. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8dd8e947ed..24234b431f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1381,7 +1381,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (string-append @@ -1389,7 +1389,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39")))) + "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e02671939bcc4a38e13f68f58d4cb531150dde81 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 16:02:16 +0100 Subject: gnu: acl: Update to 2.2.53. * gnu/packages/patches/acl-hurd-path-max.patch, gnu/packages/patches/acl-fix-perl-regex.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/acl.scm (acl): Update to 2.2.53. [source](uri): Adjust for renamed tarball. [arguments]: Remove #:test-target. Adjust disabled tests. Don't override install phase. --- gnu/local.mk | 2 - gnu/packages/acl.scm | 24 ++++---- gnu/packages/patches/acl-fix-perl-regex.patch | 22 -------- gnu/packages/patches/acl-hurd-path-max.patch | 80 --------------------------- 4 files changed, 10 insertions(+), 118 deletions(-) delete mode 100644 gnu/packages/patches/acl-fix-perl-regex.patch delete mode 100644 gnu/packages/patches/acl-hurd-path-max.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 98074678ec..bcdb716c41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -627,8 +627,6 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ - %D%/packages/patches/acl-fix-perl-regex.patch \ - %D%/packages/patches/acl-hurd-path-max.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 8d5f0117f5..0131adcac4 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,21 +35,18 @@ (define-public acl (package (name "acl") - (version "2.2.52") + (version "2.2.53") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/acl/acl-" - version ".src.tar.gz")) + version ".tar.gz")) (sha256 (base32 - "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p")) - (patches (search-patches "acl-fix-perl-regex.patch" - "acl-hurd-path-max.patch")))) + "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6")))) (build-system gnu-build-system) (arguments - `(#:test-target "tests" - #:modules ((ice-9 ftw) + `(#:modules ((ice-9 ftw) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -75,13 +73,11 @@ (("\\| sed.*'") "")) ;; These tests require the existence of a user named "bin", but ;; this user does not exist within Guix's build environment. - (for-each (lambda (file) - (delete-file (string-append "test/" file))) - '("setfacl-X.test" "cp.test" "misc.test")) - #t)) - (replace 'install - (lambda _ - (invoke "make" "install" "install-lib" "install-dev")))))) + (substitute* "Makefile.in" + ((".*test/misc\\.test.*") "") + ((".*test/cp\\.test.*") "") + ((".*test/setfacl-X\\.test.*") "")) + #t))))) (inputs `(("attr" ,attr))) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/acl-fix-perl-regex.patch b/gnu/packages/patches/acl-fix-perl-regex.patch deleted file mode 100644 index f682abc058..0000000000 --- a/gnu/packages/patches/acl-fix-perl-regex.patch +++ /dev/null @@ -1,22 +0,0 @@ -This can be removed with the next acl release - ---- - test/run | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/run b/test/run -index 2cf52e8..4627cd2 100755 ---- a/test/run -+++ b/test/run -@@ -70,7 +70,7 @@ for (;;) { - if (defined $line) { - # Substitute %VAR and %{VAR} with environment variables. - $line =~ s[%(\w+)][$ENV{$1}]eg; -- $line =~ s[%{(\w+)}][$ENV{$1}]eg; -+ $line =~ s[%\{(\w+)\}][$ENV{$1}]eg; - } - if (defined $line) { - if ($line =~ s/^\s*< ?//) { --- -2.15.0 - diff --git a/gnu/packages/patches/acl-hurd-path-max.patch b/gnu/packages/patches/acl-hurd-path-max.patch deleted file mode 100644 index 89cb3a38d7..0000000000 --- a/gnu/packages/patches/acl-hurd-path-max.patch +++ /dev/null @@ -1,80 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636512 - -From: Svante Signell -Subject: acl: Fix FTBFS on hurd-i386 -Date: Wed, 03 Aug 2011 19:36:27 +0200 - -Currently acl does not compile on hurd-i386. The problem is a PATH_MAX -definition which is not supported on GNU/Hurd. - -Index: acl-2.2.52/setfacl/parse.c -=================================================================== ---- acl-2.2.52/setfacl/parse.c -+++ acl-2.2.52/setfacl/parse.c -@@ -419,7 +419,13 @@ read_acl_comments( - bytes for "# file: ". Not a good solution but for now it is the - best I can do without too much impact on the code. [tw] - */ -+ -+#ifdef __GNU__ -+ char *linebuf; -+ size_t dummy = 0; -+#else - char linebuf[(4*PATH_MAX)+9]; -+#endif - char *cp; - char *p; - int comments_read = 0; -@@ -449,9 +455,13 @@ read_acl_comments( - if (line) - (*line)++; - -+#ifdef __GNU__ -+ if (getline(&linebuf, &dummy, file) == -1) -+ break; -+#else - if (fgets(linebuf, sizeof(linebuf), file) == NULL) - break; -- -+#endif - comments_read = 1; - - p = strrchr(linebuf, '\0'); -@@ -473,7 +483,12 @@ read_acl_comments( - goto fail; - *path_p = (char*)malloc(strlen(cp)+1); - if (!*path_p) -+ { -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -1; -+ } - strcpy(*path_p, cp); - } - } else if (strncmp(cp, "owner:", 6) == 0) { -@@ -522,13 +537,24 @@ read_acl_comments( - } - } - if (ferror(file)) -+ { -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -1; -+ } -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return comments_read; - fail: - if (path_p && *path_p) { - free(*path_p); - *path_p = NULL; - } -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -EINVAL; - } - -- cgit v1.2.3 From 1130929acfff30b3f179e6bb949b1b7d78b85b69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 16:05:04 +0100 Subject: gnu: attr: Update to 2.4.48. * gnu/packages/attr.scm (attr): Update to 2.4.48. [source](uri): Adjust for renamed tarball. [arguments]: Remove obsolete phases. [license]: Remove GPL2+ (see upstream commit 0fb61a4d20). --- gnu/packages/attr.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index ff0a07aa67..3237376d40 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2012, 2013, 2016 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,28 +30,18 @@ (define-public attr (package (name "attr") - (version "2.4.47") + (version "2.4.48") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/attr/attr-" - version ".src.tar.gz")) + version ".tar.gz")) (sha256 (base32 - "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5")))) + "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'configure 'patch-makefile-SHELL - (lambda _ - (patch-makefile-SHELL "include/buildmacros") - #t)) - (replace 'install - (lambda _ - (invoke "make" - "install" - "install-lib" - "install-dev"))) (replace 'check (lambda* (#:key target #:allow-other-keys) ;; Use the right shell. @@ -80,4 +71,4 @@ (synopsis "Library and tools for manipulating extended attributes") (description "Portable library and tools for manipulating extended attributes.") - (license (list gpl2+ lgpl2.1+)))) + (license lgpl2.1+))) -- cgit v1.2.3 From 0e5f3282601f84b7dfba65cbc617c31629040223 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:41:21 +0100 Subject: gnu: OpenSSL@1.0: Update to 1.0.2r. * gnu/packages/tls.scm (openssl): Update to 1.0.2r. [replacement]: Remove. (openssl/fixed): Remove variable. --- gnu/packages/tls.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9cb2f7e7b0..7cc70fe0d6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -262,8 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (replacement openssl/fixed) - (version "1.0.2q") + (version "1.0.2r") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -275,7 +274,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p")) + "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) @@ -381,15 +380,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define-public openssl/fixed - (hidden-package - (package - (inherit openssl) - (source (origin - (inherit (package-source openssl)) - (patches (append (origin-patches (package-source openssl)) - (search-patches "openssl-CVE-2019-1559.patch")))))))) - (define-public openssl-next (package (inherit openssl) -- cgit v1.2.3 From b9a30e0d37525e714a232318c26c7e4ef8250dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:41:43 +0100 Subject: gnu: efibootmgr: Fix build failure with GCC7. * gnu/packages/linux.scm (efibootmgr)[arguments]: Set C_INCLUDE_PATH. --- gnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed092e1c73..6049b09139 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4142,7 +4142,12 @@ interface to the variable facility of UEFI boot firmware.") ;; installed (known as OS_VENDOR in the code). ;; GRUB overrides this, as such it's only used if ;; nothing else is specified on the command line. - "EFIDIR=gnu") + "EFIDIR=gnu" + ;; Treat kernel headers as system headers to prevent + ;; warnings about conflicting types. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")) #:phases (modify-phases %standard-phases (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4aeb42b9f88a9191cfa5f7fed75143e0a03488c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Mar 2019 22:19:37 +0200 Subject: gnu: bash: Update to patch level 2. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 1 and 2. [source]: Apply patches. [version]: Update with patch numbers. --- gnu/packages/bash.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9fd4b30e62..4a884e6175 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -61,7 +61,8 @@ ;; This is the current patches series for 5.0, generated using ;; 'download-patches' below. (patch-series - )) + (1 "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") + (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of @@ -106,8 +107,10 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "mirror://gnu/bash/bash-" version ".tar.gz")) (sha256 (base32 - "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")))) - (version version) + "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")) + (patch-flags '("-p0")) + (patches %patch-series-5.0))) + (version (string-append version "." (number->string (length %patch-series-5.0)))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From ed709ee954817486a5021b182b539dafa80549fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:02:05 +0100 Subject: gnu: Python@2: Update to 2.7.16. * gnu/packages/patches/python2-CVE-2018-1000802.patch, gnu/packages/patches/python2-CVE-2018-14647.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-2.7): Update to 2.7.16. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../patches/python2-CVE-2018-1000802.patch | 47 ----------------- gnu/packages/patches/python2-CVE-2018-14647.patch | 61 ---------------------- gnu/packages/python.scm | 8 ++- 4 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 gnu/packages/patches/python2-CVE-2018-1000802.patch delete mode 100644 gnu/packages/patches/python2-CVE-2018-14647.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 52df157a95..64d4324607 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1161,8 +1161,6 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ - %D%/packages/patches/python2-CVE-2018-14647.patch \ - %D%/packages/patches/python2-CVE-2018-1000802.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1000802.patch b/gnu/packages/patches/python2-CVE-2018-1000802.patch deleted file mode 100644 index 0d5bc77c84..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1000802.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix CVE-2018-1000802: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000802 - -Taken from upstream commit (sans NEWS): -https://github.com/python/cpython/commit/d8b103b8b3ef9644805341216963a64098642435 - -diff --git a/Lib/shutil.py b/Lib/shutil.py -index 3462f7c5e9..0ab1a06f52 100644 ---- a/Lib/shutil.py -+++ b/Lib/shutil.py -@@ -413,17 +413,21 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, - - return archive_name - --def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False): -+def _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger): - # XXX see if we want to keep an external call here - if verbose: - zipoptions = "-r" - else: - zipoptions = "-rq" -- from distutils.errors import DistutilsExecError -- from distutils.spawn import spawn -+ cmd = ["zip", zipoptions, zip_filename, base_dir] -+ if logger is not None: -+ logger.info(' '.join(cmd)) -+ if dry_run: -+ return -+ import subprocess - try: -- spawn(["zip", zipoptions, zip_filename, base_dir], dry_run=dry_run) -- except DistutilsExecError: -+ subprocess.check_call(cmd) -+ except subprocess.CalledProcessError: - # XXX really should distinguish between "couldn't find - # external 'zip' command" and "zip failed". - raise ExecError, \ -@@ -458,7 +462,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): - zipfile = None - - if zipfile is None: -- _call_external_zip(base_dir, zip_filename, verbose, dry_run) -+ _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger) - else: - if logger is not None: - logger.info("creating '%s' and adding '%s' to it", diff --git a/gnu/packages/patches/python2-CVE-2018-14647.patch b/gnu/packages/patches/python2-CVE-2018-14647.patch deleted file mode 100644 index 6226b06aca..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-14647.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix CVE-2018-14647: -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 -https://bugs.python.org/issue34623 - -Taken from upstream: -https://github.com/python/cpython/commit/18b20bad75b4ff0486940fba4ec680e96e70f3a2 - -diff --git a/Include/pyexpat.h b/Include/pyexpat.h -index 5340ef5fa3..3fc5fa54da 100644 ---- a/Include/pyexpat.h -+++ b/Include/pyexpat.h -@@ -3,7 +3,7 @@ - - /* note: you must import expat.h before importing this module! */ - --#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" -+#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" - #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" - - struct PyExpat_CAPI -@@ -43,6 +43,8 @@ struct PyExpat_CAPI - XML_Parser parser, XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - void (*SetUserData)(XML_Parser parser, void *userData); -+ /* might be none for expat < 2.1.0 */ -+ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); - /* always add new stuff to the end! */ - }; - -diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c -index f7f992dd3a..b38e0ab329 100644 ---- a/Modules/_elementtree.c -+++ b/Modules/_elementtree.c -@@ -2574,6 +2574,11 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw) - PyErr_NoMemory(); - return NULL; - } -+ /* expat < 2.1.0 has no XML_SetHashSalt() */ -+ if (EXPAT(SetHashSalt) != NULL) { -+ EXPAT(SetHashSalt)(self->parser, -+ (unsigned long)_Py_HashSecret.prefix); -+ } - - ALLOC(sizeof(XMLParserObject), "create expatparser"); - -diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c -index 2b4d31293c..1f8c0d70a5 100644 ---- a/Modules/pyexpat.c -+++ b/Modules/pyexpat.c -@@ -2042,6 +2042,11 @@ MODULE_INITFUNC(void) - capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler; - capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler; - capi.SetUserData = XML_SetUserData; -+#if XML_COMBINED_VERSION >= 20100 -+ capi.SetHashSalt = XML_SetHashSalt; -+#else -+ capi.SetHashSalt = NULL; -+#endif - - /* export using capsule */ - capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9ed16d447e..0a483fb1db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -94,7 +94,7 @@ (define-public python-2.7 (package (name "python2") - (version "2.7.15") + (version "2.7.16") (source (origin (method url-fetch) @@ -102,14 +102,12 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92")) + "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj")) (patches (search-patches "python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch" - "python2-CVE-2018-14647.patch" - "python2-CVE-2018-1000802.patch")) + "python-2.7-adjust-tests.patch")) (modules '((guix build utils))) ;; suboptimal to delete failing tests here, but if we delete them in the ;; arguments then we need to make sure to strip out that phase when it -- cgit v1.2.3 From 08eba545f1551157d4b24877a8f6f167d7957d3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:06:27 +0100 Subject: gnu: python-py: Update to 1.8.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd754e10fd..afb74859bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1526,14 +1526,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) + "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From d0cba11bc568a75070cae19fe3aed14ae8a524b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:08:59 +0100 Subject: gnu: python-pyflakes: Update to 2.1.1. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afb74859bb..46f71ccbfa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5652,14 +5652,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls")))) + "18pq95a1xj2dgdd0m85gyfsn40jajj4xc3lp8wfv7igqhrc86xnr")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit v1.2.3 From b86b79960174eea6b16e4b8baa0e3d0d12310332 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:09:59 +0100 Subject: gnu: python-pluggy: Update to 0.9.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46f71ccbfa..0fa5d45a0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7800,14 +7800,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) + "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From c49c71cd2c6c74595f093b9d3bbad5d07865c5f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:10:58 +0100 Subject: gnu: python-pytest-runner: Update to 4.4. * gnu/packages/check.scm (python-pytest-runner): Update to 4.4. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3d0cf8a297..65faaee6ea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -774,14 +774,14 @@ supports coverage of subprocesses.") (define-public python-pytest-runner (package (name "python-pytest-runner") - (version "4.2") + (version "4.4") (source (origin (method url-fetch) (uri (pypi-uri "pytest-runner" version)) (sha256 (base32 - "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj")))) + "1x0d9n40lsiphblbs61rdc0d5r31f6vh0vcahqdv0mffakbnrb80")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest-bootstrap) -- cgit v1.2.3 From d9ea7a734db21d5b608bd8ee30359b1ef44c1d25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:12:35 +0100 Subject: gnu: python-hypothesis: Update to 4.7.19. * gnu/packages/check.scm (python-hypothesis): Update to 4.7.19. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 65faaee6ea..03e6c5fcd0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1474,13 +1474,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "4.5.3") + (version "4.7.19") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) + "18740bkpvj4ygmvzxnhakxdmj2igvgyayczyajll9gz5x47d9mjy")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From 1a246c01c6d573b6226fd273f648d231e6ec38f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:13:18 +0100 Subject: gnu: python-pytest: Update to 4.3.0. * gnu/packages/patches/python-pytest-pluggy-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/check.scm (python-pytest): Update to 4.3.0. [source](patches): New field. [arguments]: Skip five new tests. Disable tests by passing them as arguments. --- gnu/local.mk | 1 + gnu/packages/check.scm | 32 ++++++----- .../patches/python-pytest-pluggy-compat.patch | 64 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/python-pytest-pluggy-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 64d4324607..de352884a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1182,6 +1182,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ + %D%/packages/patches/python-pytest-pluggy-compat.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 03e6c5fcd0..20132492a7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -660,31 +660,35 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.8.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) + (patches (search-patches "python-pytest-pluggy-compat.patch")) (sha256 (base32 - "17grcfvd6ggvvqmprwv5y8g319nayam70hr43ssjwj40ws27z858")))) + "077gzimi9xiiyzpc3xjpb5yfgz038xkldg91mmbdvzr7z15isyh6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-invalid-tests + (replace 'check (lambda _ - ;; Some tests involves the /usr directory, and fails. - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix\\(self\\):") - "@pytest.mark.xfail\n def test_remove_dir_prefix(self):")) - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix" line) - (string-append "@pytest.mark.skip" - "(reason=\"Assumes that /usr exists.\")\n " - line))) - #t)) - (replace 'check (lambda _ (invoke "pytest" "-vv")))))) + (invoke "pytest" "-vv" "-k" + (string-append + ;; These tests involve the /usr directory, and fails. + "not test_remove_dir_prefix" + " and not test_argcomplete" + ;; This test tries to override PYTHONPATH, and + ;; subsequently fails to locate the test libraries. + " and not test_collection" + ;; These tests fail when run in verbose mode: + ;; . + " and not test_dont_rewrite_if_hasattr_fails" + " and not test_len" + " and not test_custom_repr" + " and not test_name"))))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/patches/python-pytest-pluggy-compat.patch b/gnu/packages/patches/python-pytest-pluggy-compat.patch new file mode 100644 index 0000000000..ac33b862e6 --- /dev/null +++ b/gnu/packages/patches/python-pytest-pluggy-compat.patch @@ -0,0 +1,64 @@ +Fix test failures when built against Pluggy 0.9. + +Taken from this upstream commit: +https://github.com/pytest-dev/pytest/commit/a68f4fd2b9e99c82476d0e04ebcf561aeddbcb2e + +diff --git a/testing/test_assertion.py b/testing/test_assertion.py +index b659233eb..e4fe56c6f 100644 +--- a/testing/test_assertion.py ++++ b/testing/test_assertion.py +@@ -209,7 +209,7 @@ def load(self, require=True, *args, **kwargs): + import spamplugin + return spamplugin + +- def iter_entry_points(name): ++ def iter_entry_points(group, name=None): + yield DummyEntryPoint() + + pkg_resources.iter_entry_points = iter_entry_points +diff --git a/testing/test_config.py b/testing/test_config.py +index f9f22a63e..1e29b83f1 100644 +--- a/testing/test_config.py ++++ b/testing/test_config.py +@@ -514,8 +514,8 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch): + pkg_resources = pytest.importorskip("pkg_resources") + monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -552,8 +552,8 @@ def test_setuptools_importerror_issue1479(testdir, monkeypatch): + pkg_resources = pytest.importorskip("pkg_resources") + monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -583,8 +583,8 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block + + plugin_module_placeholder = object() + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -621,7 +621,7 @@ def load(self): + def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load): + pkg_resources = pytest.importorskip("pkg_resources") + +- def my_iter(name): ++ def my_iter(group, name=None): + raise AssertionError("Should not be called") + + class PseudoPlugin(object): -- cgit v1.2.3 From 6c58a06e796962720c02ba50651d26acfbcbd269 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:16:51 +0100 Subject: gnu: python-six: Update to 1.12.0. * gnu/packages/python-xyz.scm (python-six): Update to 1.12.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0fa5d45a0d..7d4498f285 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -872,14 +872,14 @@ from the Python interpreter, or as a small part of a larger application.") (define-public python-six (package (name "python-six") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (pypi-uri "six" version)) (sha256 (base32 - "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h")))) + "0wxs1q74v07ssjywbbm7x6h5v9qx209ld2yfsif4060sxi0h2sni")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From beaff4a8a991fc04b5298d86be70490a718b80dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:17:11 +0100 Subject: gnu: python-flake8: Update to 3.7.7. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.7.7. [propagated-inputs]: Add PYTHON-ENTRYPOINTS. (python2-flake8)[propagated-inputs]: Add PYTHON2-TYPING. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d4498f285..af3c5a4667 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5751,13 +5751,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.6.0") + (version "3.7.7") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) + "0qg6zggqigrd4k3gv88shd1a27d0cwgfql8vfiq2c7rl7w3rd6c5")))) (build-system python-build-system) (arguments `(#:phases @@ -5770,6 +5770,7 @@ complexity of Python source code.") #t))))) (propagated-inputs `(("python-pycodestyle" ,python-pycodestyle) + ("python-entrypoints" ,python-entrypoints) ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe))) (native-inputs @@ -5790,6 +5791,7 @@ complexity of Python source code.") (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) + ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) ;; python-hacking requires flake8 <2.6.0. -- cgit v1.2.3 From 7b43d3a7c1204cd89d3009abef8b908c9999b762 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:37:51 +0100 Subject: gnu: python-zope-event: Update to 4.4. * gnu/packages/python-web.scm (python-zope-event): Update to 4.4. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4b84594b2a..198795db24 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -872,14 +872,14 @@ object to help create WSGI responses.") (define-public python-zope-event (package (name "python-zope-event") - (version "4.1.0") + (version "4.4") (source (origin (method url-fetch) (uri (pypi-uri "zope.event" version)) (sha256 (base32 - "11p75zpfz3ffhz21nzx9wb23xs993ck5s6hkjcvhswwizni5jynw")))) + "1ksbc726av9xacml6jhcfyn828hlhb9xlddpx6fcvnlvmpmpvhk9")))) (build-system python-build-system) (home-page "https://pypi.python.org/pypi/zope.event") (synopsis "Event publishing system for Python") -- cgit v1.2.3 From b87fc008aaa8bbc99c62fcbccf77e0356acba6b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:38:12 +0100 Subject: gnu: python-zope-interface: Update to 4.6.0. * gnu/packages/python-web.scm (python-zope-interface): Update to 4.6.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 198795db24..cf04c06541 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -895,14 +895,14 @@ dispatching systems can be built.") (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.1.3") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) + "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v")))) (build-system python-build-system) (native-inputs `(("python-zope-event" ,python-zope-event))) -- cgit v1.2.3 From ce1706b1bd7c4d085ea050fff038a811e3b2df10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:38:58 +0100 Subject: gnu: python-pympler: Update to 0.6. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af3c5a4667..5043f87c6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1980,13 +1980,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx")))) + "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From a6184bee6fd01c6cfac5b51d1020a8ba6d9c61de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:41:54 +0100 Subject: gnu: python-attrs-bootstrap: Update to 18.2.0. * gnu/packages/python-xyz.scm (python-attrs-bootstrap)[version, source]: Remove. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5043f87c6f..e86698fd5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11237,15 +11237,6 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") - ;; Keep this on a fixed version so python-attrs can be updated without - ;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle. - (version "17.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "attrs" version)) - (sha256 - (base32 - "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w")))) (native-inputs `()) (arguments `(#:tests? #f)))) -- cgit v1.2.3 From c41d5144cf9affce02b7252493e3ac4b93a2f745 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:43:06 +0100 Subject: gnu: python-attrs: Update to 19.1.0. * gnu/packages/python-xyz.scm (python-attrs): Update to 19.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e86698fd5b..e3917f5a1c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11189,13 +11189,13 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "18.2.0") + (version "19.1.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh")))) + "16g33zr5f449lqc5wgvzpknxryfzrfsxcr6kpgxwn7l5fkv71f7h")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 4c97f959021ce772a3162d17ec8b7aa13905fd85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:47:17 +0100 Subject: gnu: python-pytz: Update to 2018.9. * gnu/packages/time.scm (python-pytz): Update to 2018.9. --- gnu/packages/time.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index e67960db0d..04dbd8f002 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -92,14 +92,14 @@ to a file.") (define-public python-pytz (package (name "python-pytz") - (version "2018.5") + (version "2018.9") (source (origin (method url-fetch) - (uri (pypi-uri "pytz" version ".tar.gz")) + (uri (pypi-uri "pytz" version)) (sha256 (base32 - "0xzj5gkpdn2da8m6j47chlp6zrzcypv9m0fjv4236q3jw4fyzfgz")))) + "0k1pqnq3c4gvcspjxf3fschdjn71fk89i4wz801rxqh7f145xw6m")))) (build-system python-build-system) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") -- cgit v1.2.3 From 1a4bb420a7485a389e46cd793f4a4d6ca4209462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 20:19:51 +0100 Subject: gnu: python-fonttools: Update to 3.38.0. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.38.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3917f5a1c..0a5b24e79d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6021,13 +6021,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.37.3") + (version "3.38.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) + "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From dd7ce8643a28f5d633c5f3124de6be897cd5065f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 21:36:41 +0100 Subject: gnu: pcre: Update to 8.43. * gnu/packages/pcre.scm (pcre): Update to 8.43. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index f46f7e3775..0f9d590476 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -35,7 +35,7 @@ (define-public pcre (package (name "pcre") - (version "8.42") + (version "8.43") (source (origin (method url-fetch) (uri (list @@ -46,7 +46,7 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c")))) + "0sxg1wlknq05ryq63h21cchjmcjkin9lmnqsmhs3h08301965rwi")))) (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) -- cgit v1.2.3 From b9cb310468520928d39aabff4ea1cf76ad8dd92e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 12:59:32 +0100 Subject: gnu: libatomic-ops: Update to 7.6.10. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.10. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index d816b66615..041e142ded 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.8") + (version "7.6.10") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx")))) + "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") -- cgit v1.2.3 From b0f5ec4ffb9fd509c84c0fcf125b2e038e543ebc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:00:08 +0100 Subject: gnu: libgc: Update to 7.6.12. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.12. [arguments]: Add phase to avoid libatomic-ops propagation. --- gnu/packages/bdw-gc.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 041e142ded..7196ffcd32 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +31,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.8") + (version "7.6.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4")))) + "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -53,7 +54,19 @@ ,@(if (hurd-triplet? (or (%current-system) (%current-target-system))) '("--disable-gcj-support") - '())))) + '())) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-pc-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((libatomic-ops (assoc-ref inputs "libatomic-ops"))) + ;; GC 7.6.10 and later includes -latomic_ops in the + ;; pkg-config file. To avoid propagation, insert an + ;; absolute reference so dependent programs can find it. + (substitute* "bdw-gc.pc.in" + (("@ATOMIC_OPS_LIBS@" match) + (string-append "-L" libatomic-ops "/lib " + match))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libatomic-ops" ,libatomic-ops))) (outputs '("out" "debug")) -- cgit v1.2.3 From e74f153a10ca387a50c3acaf685981048c1bdb70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:52:57 +0100 Subject: gnu: Use OpenSSL 1.1 as the default OpenSSL package. * gnu/packages/tls.scm (openssl-next): Delete variable. Move related code ... (openssl) ... here. (openssl-1.0): New public variable. Retain old arguments. * gnu/packages/crypto.scm (asignify)[inputs]: Change OPENSSL-NEXT to OPENSSL. * gnu/packages/databases.scm (mariadb)[inputs]: Change from OPENSSL to OPENSSL-1.0. * gnu/packages/node.scm (node)[inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[inputs]: Likewise. --- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/node.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/tls.scm | 211 ++++++++++++++++++++++----------------------- 5 files changed, 106 insertions(+), 113 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index cc09f4abe1..cfd1df123d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -817,7 +817,7 @@ security.") ("automake" ,automake) ("libtool" ,libtool))) (inputs - `(("openssl" ,openssl-next))) + `(("openssl" ,openssl))) (home-page "https://github.com/vstakhov/asignify") (synopsis "Cryptographic authentication and encryption tool and library") (description "Asignify offers public cryptographic signatures and diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f63257034f..e151a5d9e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -671,7 +671,7 @@ Language.") ("zlib" ,zlib))) (propagated-inputs ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl))) + `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a0221601dd..2772f56d9f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -186,7 +186,7 @@ ("icu4c" ,icu4c) ("libuv" ,libuv-1.19) ("nghttp2" ,nghttp2 "lib") - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") (description "Node.js is a platform built on Chrome's JavaScript runtime diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2c9668c2f2..abd873aefa 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -400,7 +400,7 @@ test = { path = \"../libtest\" } (inputs `(("jemalloc" ,jemalloc-4.5.0) ("llvm" ,llvm-3.9.1) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("libssh2" ,libssh2) ; For "cargo" ("libcurl" ,curl))) ; For "cargo" diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f736447523..1ab9ec5a54 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur @@ -262,7 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2r") + (version "1.1.1b") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -274,13 +274,12 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) + "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" - "doc" ;1.5MiB of man3 pages - "static")) ;6MiB of .a files + "doc" ;6.8 MiB of man3 pages and full HTML documentation + "static")) ;6.4 MiB of .a files (native-inputs `(("perl" ,perl))) (arguments `(#:disallowed-references (,perl) @@ -293,31 +292,27 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases - (add-before - 'configure 'patch-Makefile.org - (lambda* (#:key outputs #:allow-other-keys) - ;; The default MANDIR is some unusual place. Fix that. - (let ((out (assoc-ref outputs "out"))) - (patch-makefile-SHELL "Makefile.org") - (substitute* "Makefile.org" - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/share/man\n"))) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + (string-append "-Wl,-rpath," lib))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -330,31 +325,20 @@ required structures.") (delete-file file)) (find-files lib "\\.a$")) #t))) - (add-after 'install 'move-man3-pages + (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) - ;; Move section 3 man pages to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (doc (assoc-ref outputs "doc")) - (target (string-append doc "/share/man/man3"))) - (mkdir-p target) - (for-each (lambda (file) - (rename-file file - (string-append target "/" - (basename file)))) - (find-files man3)) - (delete-file-recursively man3) - #t))) - (add-before - 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) - (substitute* (find-files "test" ".*") - (("/bin/sh") - (string-append bash "/bin/sh")) - (("/bin/rm") - "rm")) - #t))) + ;; Move man3 pages and full HTML documentation to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (html (string-append out "/share/doc/openssl")) + (doc (assoc-ref outputs "doc")) + (man-target (string-append doc "/share/man/man3")) + (html-target (string-append doc "/share/doc/openssl"))) + (copy-recursively man3 man-target) + (delete-file-recursively man3) + (copy-recursively html html-target) + (delete-file-recursively html) + #t))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -380,72 +364,81 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define-public openssl-next +(define-public openssl-1.0 (package (inherit openssl) (name "openssl") - (version "1.1.1b") + (version "1.0.2r") (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) + (method url-fetch) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/" + "openssl-" version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) (sha256 (base32 - "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")))) + "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) + (patches (search-patches "openssl-runpath.patch" + "openssl-c-rehash-in.patch")))) (outputs '("out" - "doc" ; 6.8 MiB of man3 pages and full HTML documentation - "static")) ; 6.4 MiB of .a files + "doc" ;1.5MiB of man3 pages + "static")) ;6MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases) `(modify-phases ,phases - (delete 'patch-tests) ; These two phases are not needed by - (delete 'patch-Makefile.org) ; OpenSSL 1.1. - - ;; Override configure phase since -rpath is now a configure option. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - ;; It's not a shebang so patch-source-shebangs misses it. - (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib))))) - - (delete 'move-man3-pages) - (add-after 'install 'move-extra-documentation + (add-before 'patch-source-shebangs 'patch-tests + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) + (substitute* (find-files "test" ".*") + (("/bin/sh") + (string-append bash "/bin/sh")) + (("/bin/rm") + "rm")) + #t))) + (add-before 'configure 'patch-Makefile.org (lambda* (#:key outputs #:allow-other-keys) - ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) - (man-target (string-append doc "/share/man/man3")) - (html-target (string-append doc "/share/doc/openssl"))) - (copy-recursively man3 man-target) - (delete-file-recursively man3) - (copy-recursively html html-target) - (delete-file-recursively html) + ;; The default MANDIR is some unusual place. Fix that. + (let ((out (assoc-ref outputs "out"))) + (patch-makefile-SHELL "Makefile.org") + (substitute* "Makefile.org" + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/share/man\n"))) #t))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out))))) + (delete 'move-extra-documentation) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (doc (assoc-ref outputs "doc")) + (target (string-append doc "/share/man/man3"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file file + (string-append target "/" + (basename file)))) + (find-files man3)) + (delete-file-recursively man3) + #t))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. (replace 'remove-miscellany -- cgit v1.2.3 From e8393ebe46d9ad09aceb152618db490378ba5ded Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 14:39:17 +0100 Subject: gnu: c-ares: Update to 1.15.0. * gnu/packages/adns.scm (c-ares): Update to 1.15.0. (c-ares-next): Remove variable. --- gnu/packages/adns.scm | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 28a65667eb..f6df825e7c 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -59,32 +59,6 @@ scripts.") (license gpl3+))) (define-public c-ares - (package - (name "c-ares") - (version "1.14.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://c-ares.haxx.se/download/" name "-" version - ".tar.gz")) - (sha256 - (base32 - "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://c-ares.haxx.se/") - (synopsis "C library for asynchronous DNS requests") - (description - "C-ares is a C library that performs DNS requests and name resolution -asynchronously. It is intended for applications which need to perform DNS -queries without blocking, or need to perform multiple DNS queries in parallel. -The primary examples of such applications are servers which communicate with -multiple clients and programs with graphical user interfaces.") - (license (x11-style "https://c-ares.haxx.se/license.html")))) - -;; XXX: temporary package for tensorflow / grpc -(define-public c-ares-next (package (name "c-ares") (version "1.15.0") @@ -96,11 +70,7 @@ multiple clients and programs with graphical user interfaces.") (sha256 (base32 "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; some tests seem to require Internet connection - #:configure-flags - (list "-DCARES_BUILD_TESTS=ON"))) + (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://c-ares.haxx.se/") -- cgit v1.2.3 From 9ded89fd7c064ce360d5dd13343d0f06cd48a1a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 14:40:09 +0100 Subject: gnu: nasm: Update to 2.14.02. * gnu/packages/assembly.scm (nasm): Update to 2.14.02. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 00ed00e1c1..6cb23ce2a8 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -38,14 +38,14 @@ (define-public nasm (package (name "nasm") - (version "2.13.03") + (version "2.14.02") (source (origin (method url-fetch) (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0wr58pb2wnyihcl6635hlx98fnscx5yirxm8m84x8nxwvjqcybl1")))) + "1xg8dfr49py15vbwk1rzcjc3zpqydmr49ahlijm56wlgj8zdwjp2")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for doc and test target ("texinfo" ,texinfo))) -- cgit v1.2.3 From 97e537c3c759d884ae06611de79969ff51827801 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 16:19:46 +0100 Subject: gnu: lz4: Update to 1.8.3. * gnu/packages/compression.scm (lz4): Update to 1.8.3. [arguments]: Add phase 'disable-broken-test'. --- gnu/packages/compression.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fff765f69d..2b82e2274c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -722,7 +722,7 @@ decompression of some loosely related file formats used by Microsoft.") (define-public lz4 (package (name "lz4") - (version "1.8.1.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -730,16 +730,23 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 - "1jggv4lvfav53advnj0pwqgxzn868lrj8dc9zp73iwvqlj82mhmx")) + "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (native-inputs `(("valgrind" ,valgrind))) ; for tests + (native-inputs `(("valgrind" ,valgrind))) ;for tests (arguments `(#:test-target "test" #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (delete 'configure) ;no configure script + (add-before 'check 'disable-broken-test + (lambda _ + ;; XXX: test_install.sh fails when prefix is a subdirectory. + (substitute* "tests/Makefile" + (("^test: (.*) test-install" _ targets) + (string-append "test: " targets))) + #t))))) (home-page "https://www.lz4.org") (synopsis "Compression algorithm focused on speed") (description "LZ4 is a lossless compression algorithm, providing -- cgit v1.2.3 From 3d3694079d24756c6963d3e81d5341d6e536a450 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:25:00 +0100 Subject: gnu: python-chardet: Disable tests. * gnu/packages/python-xyz.scm (python-chardet)[arguments]: New field. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46339c1abb..f5bc442a35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7160,6 +7160,8 @@ simulation, statistical modeling, machine learning and much more.") ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (build-system python-build-system) + ;; XXX: Incompatible with Pytest 4: . + (arguments `(#:tests? #f)) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description -- cgit v1.2.3 From 8acd1e90c5032d8bbcb0cdebc7f659ebdf442802 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:32:56 +0100 Subject: gnu: python-babel: Disable tests that are incompatible with Pytest 4. * gnu/packages/python-xyz.scm (python-babel)[arguments]: Expand pytest invokation. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5bc442a35..bf2fc56294 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -302,7 +302,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "pytest" "-vv")))))) + (lambda _ + (invoke "pytest" "-vv" "-k" + (string-append + ;; XXX: These tests fail when using Pytest 4.x and + ;; Babel 2.6.0. Try removing this for later versions. + "not test_no_inherit_metazone_marker_never_in_output" + " and not test_smoke_dates" + " and not test_smoke_numbers"))))))) (home-page "http://babel.pocoo.org/") (synopsis "Tools for internationalizing Python applications") -- cgit v1.2.3 From e1e89e2628b754da7823274d46bdef2a49539ca7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Mar 2019 16:32:24 +0100 Subject: gnu: nghttp2: Update to 1.37.0. * gnu/packages/web.scm (nghttp2): Update to 1.37.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 0266e99e26..8dd6d6cc2b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6279,7 +6279,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.36.0") + (version "1.37.0") (source (origin (method url-fetch) @@ -6288,7 +6288,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1z47hadp5gpspfn41dj4mb0m5fzbkw1jw8sahjkabvc8gcaqdfz9")))) + "1ds7ilgdsq1dykp285cxrl17xsgkxp0a2413wcgvkx0p9cb0n2da")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 5a457656284cfb25e9305362e18adf4aff13f91a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Mar 2019 18:08:33 +0100 Subject: gnu: python-mako: Fix FTBFS with Pytest 4. * gnu/packages/python-xyz.scm (python-mako)[arguments]: New field. --- gnu/packages/python-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf2fc56294..9749ce96bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8000,6 +8000,14 @@ python-xdo for newer bindings.)") (base32 "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.cfg + (lambda _ + ;; Adjust setup.cfg for compatibility with Pytest 4. + (substitute* "setup.cfg" + (("\\[pytest\\]") "[tool:pytest]")) + #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From cf8264364761857ca3550398369a0f20d7b0d512 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:44:26 +0100 Subject: gnu: coreutils: Update to 8.31. * gnu/packages/base.scm (coreutils): Update to 8.31. [arguments]: Remove obsolete workaround. --- gnu/packages/base.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c252067571..37be1ffeb7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -300,14 +300,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.30") + (version "8.31") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8")))) + "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! @@ -349,13 +349,7 @@ used to apply commands with arbitrarily long arguments.") ;; environments with long prefixes (/tmp/guix-build-...). (substitute* "Makefile" (("^.*tests/misc/env-S.pl.*$") "")) - #t))) - - ;; Work around a cross-compilation bug whereby libcoreutils.a would - ;; provide '__mktime_internal', which conflicts with the one in libc.a. - ,@(if (%current-target-system) - `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - '()))) + #t))))) (synopsis "Core GNU utilities (file, text, shell)") (description "GNU Coreutils includes all of the basic command-line tools that are -- cgit v1.2.3 From d80dcf2bdd666277cd83bc4613924a63ec3bcfc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:46:19 +0100 Subject: gnu: python-coverage: Update to 4.5.3. * gnu/packages/check.scm (python-coverage): Update to 4.5.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 20132492a7..f75dd61751 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1208,14 +1208,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "4.5.2") + (version "4.5.3") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "1d5zlyl3h39d3xlvkpsn4g5gpvdci9arplil2cnz2cs8wsgms8xb")))) + "02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From b0c1c9b31426ba7f07b278ef8dc506614f594199 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:48:31 +0100 Subject: gnu: libxdamage: Update to 1.1.5. * gnu/packages/xorg.scm (libxdamage): Update to 1.1.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 01ce5ee7ab..658670f328 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4538,7 +4538,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxdamage (package (name "libxdamage") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) @@ -4548,7 +4548,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw")))) + "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in the Requires or Requires.private field of xdamage.pc -- cgit v1.2.3 From 520ae432d446010ed6a5233c8abfda88a945926c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 21:15:15 +0100 Subject: gnu: util-linux: Update to 2.33.1. * gnu/packages/linux.scm (util-linux): Update to 2.33.1. * gnu/packages/patches/util-linux-tests.patch: Skip one new test. --- gnu/packages/linux.scm | 4 ++-- gnu/packages/patches/util-linux-tests.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9020a599e2..674f6181da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -600,7 +600,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.32.1") + (version "2.33.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -608,7 +608,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6")) + "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/util-linux-tests.patch b/gnu/packages/patches/util-linux-tests.patch index bb5be66515..ec1671f224 100644 --- a/gnu/packages/patches/util-linux-tests.patch +++ b/gnu/packages/patches/util-linux-tests.patch @@ -2,6 +2,8 @@ This test checks whether 'root' is successfully translated to UID/GID 0, using 'getpwnam' in libmount. This doesn't work in the chroot because /etc/passwd doesn't contain an entry for 'root' so skip it. +The second test requires that '/sys/dev/block' is present, which is not +the case inside the build container. --- util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:41.181151194 +0100 +++ util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:42.829161716 +0100 @@ -16,3 +18,14 @@ using 'getpwnam' in libmount. This doesn't work in the chroot because ts_init_subtest "deduplicate" ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT ts_finalize_subtest +--- a/tests/ts/lsblk/lsblk 2019-03-11 21:08:23.734387391 +0100 ++++ b/tests/ts/lsblk/lsblk 2019-03-11 21:12:43.635473111 +0100 +@@ -22,6 +22,8 @@ + + ts_init "$*" + ++ts_skip "/sys/dev/block is not available" ++ + ts_check_test_command "$TS_CMD_LSBLK" + ts_check_prog xz + ts_check_prog tar -- cgit v1.2.3 From 6b95bf0b37c9e95fbe6e93cf78743392e7cb1b91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 12:46:18 +0100 Subject: gnu: libimobiledevice: Build against OpenSSL 1.0. * gnu/packages/libusb.scm (libimobiledevice)[propagated-inputs]: Change from OPENSSL to OPENSSL-1.0. --- gnu/packages/libusb.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f0725d77e8..a8d6d7c963 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -367,7 +367,7 @@ connections from and to iOS devices by connecting to a socket provided by a ,(version-major+minor (package-version python)) "m")))) (propagated-inputs - `(("openssl" ,openssl) + `(("openssl" ,openssl-1.0) ("libplist" ,libplist) ("libusbmuxd" ,libusbmuxd))) (inputs -- cgit v1.2.3 From e2bf462b05b14b8ba7765720d2a2e9ababf570cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:03:56 +0100 Subject: gnu: libxdmcp: Update to 1.1.3. * gnu/packages/xorg.scm (libxdmcp): Update to 1.1.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6471f2d630..3a7e69a82d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1300,7 +1300,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (define-public libxdmcp (package (name "libxdmcp") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -1310,7 +1310,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ".tar.bz2")) (sha256 (base32 - "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1")))) + "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd) -- cgit v1.2.3 From df37df52c9ccbb04e2173af7146cd0bc6e32152d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:07 +0100 Subject: gnu: libxft: Update to 2.3.3. * gnu/packages/xorg.scm (libxft): Update to 2.3.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3a7e69a82d..4867250cff 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1326,7 +1326,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (define-public libxft (package (name "libxft") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) @@ -1336,7 +1336,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ".tar.bz2")) (sha256 (base32 - "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm")))) + "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12")))) (build-system gnu-build-system) (propagated-inputs ;; xft.pc refers to all these. -- cgit v1.2.3 From cb7fd8d055a42a40754bb2b108542a3c9c5e97bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:28 +0100 Subject: gnu: libxmu: Update to 1.1.3. * gnu/packages/xorg.scm (libxmu): Update to 1.1.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4867250cff..63da44fdcd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1385,7 +1385,7 @@ configuration files.") (define-public libxmu (package (name "libxmu") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -1395,7 +1395,7 @@ configuration files.") ".tar.bz2")) (sha256 (base32 - "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm")))) + "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) -- cgit v1.2.3 From 165d7c01274a08fcfefcdf1d1656014fc4627601 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:45 +0100 Subject: gnu: xtrans: Update to 1.4.0. * gnu/packages/xorg.scm (xtrans): Update to 1.4.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 63da44fdcd..920949ddac 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4333,7 +4333,7 @@ a display running X server.") (define-public xtrans (package (name "xtrans") - (version "1.3.5") + (version "1.4.0") (source (origin (method url-fetch) @@ -4343,7 +4343,7 @@ a display running X server.") ".tar.bz2")) (sha256 (base32 - "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd")))) + "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From 40916d637a854818ac1c5c0264432d9f8b7f9d23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:05:07 +0100 Subject: gnu: libxext: Update to 1.3.4. * gnu/packages/xorg.scm (libxext): Update to 1.3.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 920949ddac..2cab66eb3b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4560,7 +4560,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxext (package (name "libxext") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) @@ -4570,7 +4570,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m")))) + "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 7dad1cce6c7f1bc8c7eec93edc85b5dd26a21a18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:05:26 +0100 Subject: gnu: libxrandr: Update to 1.5.2. * gnu/packages/xorg.scm (libxrandr): Update to 1.5.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2cab66eb3b..ab12529c08 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4960,7 +4960,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxrandr (package (name "libxrandr") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) @@ -4970,7 +4970,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z")))) + "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla")))) (build-system gnu-build-system) (propagated-inputs ;; In accordance with xrandr.pc. -- cgit v1.2.3 From ca99dc174d20496cbb4c6ffb04531e56b29d8d77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 15:03:10 +0100 Subject: gnu: libuv: Update to 1.27.0. * gnu/packages/libevent.scm (libuv): Update to 1.27.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index cdd05c5441..273160c92a 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.26.0") + (version "1.27.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1rqlh0ag02fni8ildz3anc26z9vz69vwf5qmzsid2gvzzfkigy6a")))) + "1jndi12800p1r34rc41kaxhwrb3cb3pcsnkyp3v0c1k7ld3p124d")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From e16cf2666ffae3d5c008f092630d1b65eb8b1598 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 15:04:20 +0100 Subject: gnu: cmake: Update to 3.14.0. * gnu/packages/cmake.scm (cmake): Update to 3.14.0. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 5bd91b7bf5..7772fbedb1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.13.1") + (version "3.14.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "04123d7fgnn1fs5p0nwyq397ss89r0y4wkg9a09qiwkjsvk1rzmy")) + "00jmwwkr3ybsr4hz4hgiv75zaak5yirp110zf131kby2ndkvlxma")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2f33a7321e5e37d37f57c229c8079cb4ffd10834 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 Mar 2019 21:38:19 -0400 Subject: cmake: Generate documentation. To prevent complicating the dependencies of a core tool, a new variant, CMAKE-MINIMAL is introduced and the CMake build system is configured to use it by default. The regular CMAKE package gains a manpage, info manual as well as HTML documentation. Fixes issue #33497 (https://bugs.gnu.org/33497). * gnu/packages/cmake.scm (gnu): Use modules (gnu packages python-xyz), (gnu packages texinfo) and (srfi srfi-1). (cmake-minimal): Rename the original cmake variable to this. [phases]{configure}: Extract the configure script arguments to... [configure-flags]: here. [properties]: Set the HIDDEN? property to #t. (cmake): New variable, which inherits from CMAKE-MINIMAL. [phases]{move-html-doc}: Add phase. [native-inputs]: Add PYTHON-SPHINX and TEXINFO. [outputs]: Add the "doc" output. [properties]: Clear the inherited HIDDEN? property. * guix/build-system/cmake.scm (default-cmake): Use CMAKE-MINIMAL instead of CMAKE. --- gnu/packages/cmake.scm | 94 +++++++++++++++++++++++++++++++++------------ guix/build-system/cmake.scm | 2 +- 2 files changed, 70 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7772fbedb1..b999c0c170 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Maxim Cournoyer + ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,11 +41,16 @@ #:use-module (gnu packages file) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) - #:use-module (gnu packages xml)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1)) -(define-public cmake +;;; This minimal variant of CMake does not include the documentation. It is +;;; used by the cmake-build-system. +(define-public cmake-minimal (package - (name "cmake") + (name "cmake-minimal") (version "3.14.0") (source (origin (method url-fetch) @@ -72,6 +79,23 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (parallel-job-count (number->string (parallel-job-count)))) + (list "--verbose" + (string-append "--parallel=" parallel-job-count) + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; FIXME: Circular dependency. + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append "--docdir=share/doc/cmake-" + (version-major+minor version)))) #:make-flags (let ((skipped-tests (list "BundleUtilities" ; This test fails on Guix. @@ -119,25 +143,10 @@ (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") (getenv "C_INCLUDE_PATH"))) #t))) + ;; CMake uses its own configure script. (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke - "./configure" "--verbose" - (string-append "--parallel=" (number->string (parallel-job-count))) - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version))))))))) + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (apply invoke "./configure" configure-flags)))))) (inputs `(("bzip2" ,bzip2) ("curl" ,curl) @@ -159,12 +168,47 @@ CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice.") - (license (list license:bsd-3 ; cmake - license:bsd-4 ; cmcompress - license:bsd-2 ; cmlibarchive - license:expat ; cmjsoncpp is dual MIT/public domain + (properties '((hidden? . #t))) + (license (list license:bsd-3 ; cmake + license:bsd-4 ; cmcompress + license:bsd-2 ; cmlibarchive + license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c +(define-public cmake + (package + (inherit cmake-minimal) + (name "cmake") + (arguments + (substitute-keyword-arguments (package-arguments cmake-minimal) + ((#:configure-flags configure-flags ''()) + `(append ,configure-flags + ;; Extra configure flags used to generate the documentation. + '("--sphinx-info" + "--sphinx-man" + "--sphinx-html"))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'move-html-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/doc/cmake-" + ,(version-major+minor + (package-version cmake-minimal)) + "/html"))) + (copy-recursively (string-append out html) + (string-append doc html)) + (delete-file-recursively (string-append out html)) + #t))))))) + ;; Extra inputs required to build the documentation. + (native-inputs + `(,@(package-native-inputs cmake-minimal) + ("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) + (outputs '("out" "doc")) + (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ee116c5a4c..ca88fadddf 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -48,7 +48,7 @@ ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake))) + (module-ref module 'cmake-minimal))) (define* (lower name #:key source inputs native-inputs outputs system target -- cgit v1.2.3 From 01a92a70c403ff0883733ec8ff0419f07d6b3ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 17:04:20 +0100 Subject: gnu: fontforge: Build against Python 3. * gnu/packages/fontutils.scm (fontforge)[inputs]: Change from PYTHON-2 to PYTHON. --- gnu/packages/fontutils.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 21f8c7d227..0259e374d9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -586,10 +586,7 @@ definitions.") ("libxml2" ,libxml2) ("pango" ,pango) ("potrace" ,potrace) - ;; FIXME: We use Python 2 here because there is a bug in Python - ;; 3.7 that is triggered when Py_Main is called after Py_Init, as - ;; is done by fontforge. This will be fixed in Python 3.7.1. - ("python" ,python-2) + ("python" ,python) ("zlib" ,zlib))) (arguments '(#:phases -- cgit v1.2.3 From d3b22d488babae461d03831a1bb5f776e53a13cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Mar 2019 18:07:32 +0100 Subject: gnu: stb: Update snapshot. * gnu/packages/stb.scm (stb): Update to commit 2c2908f50515dcd. (stb-image): Update to 2.22. (stb-image-write): Update to 1.13. --- gnu/packages/stb.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index df31bd0f86..5444347644 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -26,8 +26,8 @@ (define stb ;; stb is a collection of libraries developed within the same repository. ;; When updating this, remember to change versions below as appropriate. - (let ((commit "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2") - (revision "0")) + (let ((commit "2c2908f50515dcd939f24be261c3ccbcd277bb49") + (revision "1")) (package (name "stb") (home-page "https://github.com/nothings/stb") @@ -39,7 +39,7 @@ (commit commit))) (sha256 (base32 - "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf")) + "1z753rscqc4clp0rd57bw68i60kz694y1z52bwv6slzmkgds1cki")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -92,12 +92,12 @@ the C programming language.") ;; converted to macros as outlined in . (define-public stb-image (make-stb-header-package - "stb-image" "2.19" + "stb-image" "2.22" "stb-image is a small and self-contained library for image loading or decoding from file or memory. A variety of formats are supported.")) (define-public stb-image-write (make-stb-header-package - "stb-image-write" "1.09" + "stb-image-write" "1.13" "stb-image-write is a small library for writing image files to the C@tie{}@code{stdio} interface.")) -- cgit v1.2.3 From d1659c0fb27c4f71c8ddc6a85d3cd9f3a10cca97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 15:31:09 +0100 Subject: gnu: Python: Remove bundled libraries. Fixes . * gnu/packages/python.scm (python-2.7)[source](snippet): Remove bundled libffi, expat and zlib. Add substitution to make pyexpat use system expat. [arguments]: Add "--with-system-expat" to #:configure-flags. [inputs]: Add EXPAT. * gnu/packages/python.scm (python-3.7)[source](snippet): Delete bundled expat and add the same pyexpat substitution. * gnu/packages/python.scm (python2-minimal, python-minimal)[inputs]: Add EXPAT. --- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 064b8dbf4c..aa2f8addcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -85,6 +85,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -109,11 +110,19 @@ "python-2.7-source-date-epoch.patch" "python-2.7-adjust-tests.patch")) (modules '((guix build utils))) - ;; suboptimal to delete failing tests here, but if we delete them in the - ;; arguments then we need to make sure to strip out that phase when it - ;; gets inherited by python and python-minimal. (snippet '(begin + ;; Ensure the bundled copies of these libraries are not used. + (for-each delete-file-recursively + '("Modules/_ctypes/libffi" "Modules/expat" "Modules/zlib")) + + (substitute* "Modules/Setup.dist" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + + ;; Suboptimal to delete failing tests here, but if we delete them in + ;; the arguments then we need to make sure to strip out that phase + ;; when it gets inherited by python and python-minimal. (for-each delete-file '("Lib/test/test_compileall.py" "Lib/test/test_ctypes.py" ; fails on mips64el @@ -130,6 +139,7 @@ `(#:test-target "test" #:configure-flags (list "--enable-shared" ;allow embedding + "--with-system-expat" ;for XML support "--with-system-ffi" ;build ctypes "--with-ensurepip=install" ;install pip and setuptools "--enable-unicode=ucs4" @@ -258,6 +268,7 @@ #t)))))) (inputs `(("bzip2" ,bzip2) + ("expat" ,expat) ("gdbm" ,gdbm) ("libffi" ,libffi) ; for ctypes ("sqlite" ,sqlite) ; for sqlite extension @@ -311,8 +322,15 @@ data types.") (sha256 (base32 "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) + (modules '((guix build utils))) (snippet '(begin + ;; Delete the bundled copy of libexpat. + (delete-file-recursively "Modules/expat") + (substitute* "Modules/Setup.dist" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + (for-each delete-file '(;; This test may hang and eventually run out of ;; memory on some systems: @@ -379,8 +397,10 @@ data types.") ;; Keep zlib, which is used by 'pip' (via the 'zipimport' module), which ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus - ;; libffi. - (inputs `(("libffi" ,libffi) + ;; libffi. Expat is needed for XML support which is expected by a lot + ;; of libraries out there. + (inputs `(("expat" ,expat) + ("libffi" ,libffi) ("zlib" ,zlib))))) (define-public python-minimal @@ -390,8 +410,10 @@ data types.") ;; Build fails due to missing ctypes without libffi. ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; - ;; zlib is required by 'zipimport', used by pip. - (inputs `(("libffi" ,libffi) + ;; zlib is required by 'zipimport', used by pip. Expat is needed + ;; for XML support, which is generally expected to be available. + (inputs `(("expat" ,expat) + ("libffi" ,libffi) ("openssl" ,openssl) ("zlib" ,zlib))))) -- cgit v1.2.3 From 2eb92ce85fc9e3e06650065e499385e8fba107c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:25:39 +0100 Subject: gnu: poppler: Update to 0.75.0. * gnu/packages/pdf.scm (poppler): Update to 0.75.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 93bb53d801..8a78da854b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -83,14 +83,14 @@ (define-public poppler (package (name "poppler") - (version "0.74.0") + (version "0.75.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j")))) + "16hr0y3pv66s01bcd4k8xjgd1r038ca9srd06g4wm5r7zaqfvfiv")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From e54f0cf68067cbce0ad27baf52d48f968af100ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:27:30 +0100 Subject: gnu: libgpg-error: Update to 1.36. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.36. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d1d55c3a11..5f4badf4ef 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -77,7 +77,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.35") + (version "1.36") (source (origin (method url-fetch) @@ -85,7 +85,7 @@ version ".tar.bz2")) (sha256 (base32 - "0rz00xyrk7qzg7mmcjhvrnm34hddkvyg9zsqq548vj58m1ifxmfb")))) + "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From f882f62c6bdef79f0348f1cdfe7a727f44a9cc63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:29:11 +0100 Subject: gnu: python-pytest: Update to 4.3.1. * gnu/packages/check.scm (python-pytest): Update to 4.3.1. [source](patches): Remove. * gnu/packages/patches/python-pytest-pluggy-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/check.scm | 5 +- .../patches/python-pytest-pluggy-compat.patch | 64 ---------------------- 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/python-pytest-pluggy-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index e936343918..41f42e588f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1188,7 +1188,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ - %D%/packages/patches/python-pytest-pluggy-compat.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 69fe278728..186f4ba09a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -684,15 +684,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.3.0") + (version "4.3.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) - (patches (search-patches "python-pytest-pluggy-compat.patch")) (sha256 (base32 - "077gzimi9xiiyzpc3xjpb5yfgz038xkldg91mmbdvzr7z15isyh6")))) + "08q58ad8vaxyb57ll8m611yb4xwzzhp09kxafmyqrrps6cnalbjr")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/python-pytest-pluggy-compat.patch b/gnu/packages/patches/python-pytest-pluggy-compat.patch deleted file mode 100644 index ac33b862e6..0000000000 --- a/gnu/packages/patches/python-pytest-pluggy-compat.patch +++ /dev/null @@ -1,64 +0,0 @@ -Fix test failures when built against Pluggy 0.9. - -Taken from this upstream commit: -https://github.com/pytest-dev/pytest/commit/a68f4fd2b9e99c82476d0e04ebcf561aeddbcb2e - -diff --git a/testing/test_assertion.py b/testing/test_assertion.py -index b659233eb..e4fe56c6f 100644 ---- a/testing/test_assertion.py -+++ b/testing/test_assertion.py -@@ -209,7 +209,7 @@ def load(self, require=True, *args, **kwargs): - import spamplugin - return spamplugin - -- def iter_entry_points(name): -+ def iter_entry_points(group, name=None): - yield DummyEntryPoint() - - pkg_resources.iter_entry_points = iter_entry_points -diff --git a/testing/test_config.py b/testing/test_config.py -index f9f22a63e..1e29b83f1 100644 ---- a/testing/test_config.py -+++ b/testing/test_config.py -@@ -514,8 +514,8 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch): - pkg_resources = pytest.importorskip("pkg_resources") - monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -552,8 +552,8 @@ def test_setuptools_importerror_issue1479(testdir, monkeypatch): - pkg_resources = pytest.importorskip("pkg_resources") - monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -583,8 +583,8 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block - - plugin_module_placeholder = object() - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -621,7 +621,7 @@ def load(self): - def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load): - pkg_resources = pytest.importorskip("pkg_resources") - -- def my_iter(name): -+ def my_iter(group, name=None): - raise AssertionError("Should not be called") - - class PseudoPlugin(object): -- cgit v1.2.3 From db65a4fd914be10f9170cb8ad049e15eefefd5a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:32:53 +0100 Subject: gnu: python-mako: Update to 1.0.8. * gnu/packages/python-xyz.scm (python-mako): Update to 1.0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db31794225..71727ad1da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8117,23 +8117,15 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) + "0hr89gcda0y0baz25cm4yq7fbl7cvid4zsns8cgv0jfzq102j284")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-setup.cfg - (lambda _ - ;; Adjust setup.cfg for compatibility with Pytest 4. - (substitute* "setup.cfg" - (("\\[pytest\\]") "[tool:pytest]")) - #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From e337061b3a7af892d3a14f5191efb2487ec0fad9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Apr 2019 23:39:39 -0400 Subject: gnu: python: Disable failing tests for Python 2. Fixes issue #35311 (see: https://bugs.gnu.org/35311). * gnu/packages/python.scm (python-2.7)[make-flags]: Exclude the tests test_urllib2_localnet and test_httplib. * gnu/packages/python.scm (python-3.7)[make-flags]: Do not consider tests exclusions inherited from the python2 package, which leaves Python 3 unchanged. --- gnu/packages/python.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aa2f8addcf..a26a88e6d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; @@ -147,7 +147,14 @@ (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. #:make-flags - (list (format #f "TESTOPTS=-j~d" (parallel-job-count))) + (list (string-append + (format #f "TESTOPTS=-j~d" (parallel-job-count)) + ;; Exclude the following tests as they fail + ;; non-deterministically with "error: [Errno 104] Connection + ;; reset by peer." Python 3 seems unaffected. A potential fix, + ;; yet to be backported to Python 2, is available at: + ;; https://github.com/python/cpython/commit/529525fb5a8fd9b96ab4021311a598c77588b918. + " --exclude test_urllib2_localnet test_httplib")) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) @@ -344,6 +351,9 @@ data types.") #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) + ((#:make-flags _) + ;; Strip tests exclusions that have to do with Python 2 only. + `(list (format #f "TESTOPTS=-j~d" (parallel-job-count)))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 2ca3fdc2db1aef96fbf702a2f26f5e18ce832038 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 4 Mar 2019 12:45:59 +0100 Subject: gnu: shishi: Make shishi keys and database administrator-modifiable. Fixes . * gnu/packages/kerberos.scm (shishi)[arguments]<#:configure-flags>: Add --with-key-dir, --with-db-dir. <#:phases>[disable-automatic-key-generation]: New phase. --- gnu/packages/kerberos.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 7cf61c8d0f..1253a58546 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -116,9 +116,19 @@ cryptography.") (build-system gnu-build-system) (arguments '(;; This is required since we patch some of the build scripts. - ;; Remove for the next Shishi release after 1.0.2 or when - ;; removing 'shishi-fix-libgcrypt-detection.patch'. - #:configure-flags '("ac_cv_libgcrypt=yes" "--disable-static"))) + ;; Remove first two items for the next Shishi release after 1.0.2 or + ;; when removing 'shishi-fix-libgcrypt-detection.patch'. + #:configure-flags + '("ac_cv_libgcrypt=yes" "--disable-static" + "--with-key-dir=/etc/shishi" "--with-db-dir=/var/shishi") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'disable-automatic-key-generation + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("^install-data-hook:") + "install-data-hook:\nx:\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("gnutls" ,gnutls) @@ -132,7 +142,10 @@ cryptography.") (description "GNU Shishi is a free implementation of the Kerberos 5 network security system. It is used to allow non-secure network nodes to communicate in a -secure manner through client-server mutual authentication via tickets.") +secure manner through client-server mutual authentication via tickets. + +After installation, the system administrator should generate keys using +@code{shisa -a /etc/shishi/shishi.keys}.") (license license:gpl3+))) (define-public heimdal -- cgit v1.2.3 From c078f1b08b844c7126db2a4a0f83db2217e3bb0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 17:46:59 +0200 Subject: gnu: texlive-bin: Adapt to Poppler 0.75. This is a follow-up to commit 2eb92ce85fc9e3e06650065e499385e8fba107c1. * gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Update for Poppler 0.75. * gnu/packages/tex.scm (texlive-bin)[source](patches): Update pdftex-poppler-0.75.patch. [arguments]: Adjust accordingly. --- .../texlive-bin-luatex-poppler-compat.patch | 313 +++++++++------------ gnu/packages/tex.scm | 16 +- 2 files changed, 137 insertions(+), 192 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch index d8b9bf172a..df6121c6e1 100644 --- a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch +++ b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch @@ -1,23 +1,14 @@ -Fix LuaTeX compatibility with Poppler 0.72. +Fix LuaTeX compatibility with Poppler 0.75. Upstream LuaTeX have moved from Poppler to "pplib" and thus upstream -fixes are unavailable. This is based on Arch Linux patches, with minor -changes for Poppler 0.72: -https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin&id=f1b424435c8fa31d9296c7a6dc17f939a8332780 +fixes are unavailable. This is based on Archs patch, with minor +tweaks to comply with texlive-bin-CVE-2018-17407.patch. +https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin&id=418dd6f008c3d41a461353fdb60f2d73d87c58ed diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w --- a/texk/web2c/luatexdir/image/pdftoepdf.w +++ b/texk/web2c/luatexdir/image/pdftoepdf.w -@@ -35,7 +35,7 @@ - - extern void md5(Guchar *msg, int msgLen, Guchar *digest); - --static GBool isInit = gFalse; -+static bool isInit = false; - - /* Maintain AVL tree of all PDF files for embedding */ - -@@ -363,10 +363,10 @@ void copyReal(PDF pdf, double d) +@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d) static void copyString(PDF pdf, GooString * string) { @@ -25,11 +16,7 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image + const char *p; unsigned char c; size_t i, l; -- p = string->getCString(); -+ p = string->c_str(); - l = (size_t) string->getLength(); - if (pdf->cave) - pdf_out(pdf, ' '); + p = string->getCString(); @@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string) pdf->cave = true; } @@ -39,15 +26,25 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image { pdf_out(pdf, '/'); for (; *s != 0; s++) { -@@ -468,14 +468,14 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) - break; - /* - case objNum: -- GBool isNum() { return type == objInt || type == objReal; } -+ bool isNum() { return type == objInt || type == objReal; } - break; - */ - case objString: +@@ -412,7 +412,7 @@ static void copyArray(PDF pdf, PdfDocument * pdf_doc, Array * array) + Object obj1; + pdf_begin_array(pdf); + for (i = 0, l = array->getLength(); i < l; ++i) { +- obj1 = array->getNF(i); ++ obj1 = array->getNF(i).copy(); + copyObject(pdf, pdf_doc, &obj1); + } + pdf_end_array(pdf); +@@ -425,7 +425,7 @@ static void copyDict(PDF pdf, PdfDocument * pdf_doc, Dict * dict) + pdf_begin_dict(pdf); + for (i = 0, l = dict->getLength(); i < l; ++i) { + copyName(pdf, dict->getKey(i)); +- obj1 = dict->getValNF(i); ++ obj1 = dict->getValNF(i).copy(); + copyObject(pdf, pdf_doc, &obj1); + } + pdf_end_dict(pdf); +@@ -475,7 +475,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) copyString(pdf, (GooString *)obj->getString()); break; case objName: @@ -85,31 +82,37 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image break; } } -@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict) - PDFRectangle *pagebox; - int pdf_major_version_found, pdf_minor_version_found; - float xsize, ysize, xorig, yorig; -- if (isInit == gFalse) { -+ if (isInit == false) { - if (!(globalParams)) - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gFalse); -- isInit = gTrue; -+ globalParams->setErrQuiet(false); -+ isInit = true; - } - if (img_type(idict) == IMG_TYPE_PDF) - pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL); -@@ -966,7 +966,7 @@ void epdf_free() - if (PdfDocumentTree != NULL) - avl_destroy(PdfDocumentTree, destroyPdfDocument); - PdfDocumentTree = NULL; -- if (isInit == gTrue) -+ if (isInit == true) - delete globalParams; -- isInit = gFalse; -+ isInit = false; - } +@@ -788,12 +788,12 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) + Now all relevant parts of the Page dictionary are copied. Metadata validity + check is needed(as a stream it must be indirect). + */ +- obj1 = pageDict->lookupNF("Metadata"); ++ obj1 = pageDict->lookupNF("Metadata").copy(); + if (!obj1.isNull() && !obj1.isRef()) + formatted_warning("pdf inclusion","/Metadata must be indirect object"); + /* copy selected items in Page dictionary */ + for (i = 0; pagedictkeys[i] != NULL; i++) { +- obj1 = pageDict->lookupNF(pagedictkeys[i]); ++ obj1 = pageDict->lookupNF(pagedictkeys[i]).copy(); + if (!obj1.isNull()) { + pdf_add_name(pdf, pagedictkeys[i]); + /* preserves indirection */ +@@ -806,13 +806,13 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) + PDF file, climbing up the tree until the Resources are found. + (This fixes a problem with Scribus 1.3.3.14.) + */ +- obj1 = pageDict->lookupNF("Resources"); ++ obj1 = pageDict->lookupNF("Resources").copy(); + if (obj1.isNull()) { + op1 = &pagesobj1; + op2 = &pagesobj2; + *op1 = pageDict->lookup("Parent"); + while (op1->isDict()) { +- obj1 = op1->dictLookupNF("Resources"); ++ obj1 = op1->dictLookupNF("Resources").copy(); + if (!obj1.isNull()) { + pdf_add_name(pdf, "Resources"); + copyObject(pdf, pdf_doc, &obj1); diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc --- a/texk/web2c/luatexdir/lua/lepdflib.cc +++ b/texk/web2c/luatexdir/lua/lepdflib.cc @@ -122,15 +125,15 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout->atype = ALLOC_LEPDF; uout->pc = uobj->pc; uout->pd = uobj->pd; -@@ -439,7 +439,7 @@ static int l_new_Object(lua_State * L) - break; - case 1: - if (lua_isboolean (L,1)) { -- uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse); -+ uout->d = new Object(lua_toboolean(L, 1)? true : false); - uout->atype = ALLOC_LEPDF; - uout->pc = 0; - uout->pd = NULL; +@@ -496,7 +496,7 @@ static int l_new_Object(lua_State * L) + double numA = lua_tonumber(L,1); + double genA = lua_tonumber(L,2); + if ( ((numA)==(int)(numA)) && ((genA)==(int)(genA)) ){ +- uout->d = new Object((int)(numA), (int)(genA)); ++ uout->d = new Object({(int)(numA), (int)(genA)}); + uout->atype = ALLOC_LEPDF; + uout->pc = 0; + uout->pd = NULL; @@ -596,7 +596,7 @@ static int m_##in##_##function(lua_State * L) \ uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ if (uin->pd != NULL && uin->pd->pc != uin->pc) \ @@ -140,33 +143,15 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep if (o != NULL) { \ uout = new_##out##_userdata(L); \ uout->d = o; \ -@@ -676,7 +676,7 @@ static int m_##in##_##function(lua_State * L) \ - pdfdoc_changed_error(L); \ - gs = (GooString *)((in *) uin->d)->function(); \ - if (gs != NULL) \ -- lua_pushlstring(L, gs->getCString(), gs->getLength()); \ -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \ - else \ - lua_pushnil(L); \ - return 1; \ -@@ -911,7 +911,7 @@ static int m_Array_getString(lua_State * L) +@@ -889,7 +889,7 @@ static int m_Array_getNF(lua_State * L) if (i > 0 && i <= len) { - gs = new GooString(); - if (((Array *) uin->d)->getString(i - 1, gs)) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; -@@ -1063,7 +1063,7 @@ static int m_Catalog_getJS(lua_State * L) - if (i > 0 && i <= len) { - gs = ((Catalog *) uin->d)->getJS(i - 1); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1); ++ *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; @@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength); static int m_Dict_add(lua_State * L) @@ -182,36 +167,42 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); return 0; -@@ -1378,7 +1378,7 @@ static int m_GooString__tostring(lua_State * L) - uin = (udstruct *) luaL_checkudata(L, 1, M_GooString); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- lua_pushlstring(L, ((GooString *) uin->d)->getCString(), -+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(), - ((GooString *) uin->d)->getLength()); - return 1; - } -@@ -1527,9 +1527,9 @@ static int m_Object_initBool(lua_State * L) +@@ -1190,7 +1190,7 @@ static int m_Dict_lookupNF(lua_State * L) + s = luaL_checkstring(L, 2); + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s); ++ *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1263,7 +1263,7 @@ static int m_Dict_getValNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1); ++ *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1653,7 +1653,7 @@ static int m_Object_initRef(lua_State * L) pdfdoc_changed_error(L); - luaL_checktype(L, 2, LUA_TBOOLEAN); - if (lua_toboolean(L, 2) != 0) -- *((Object *) uin->d) = Object(gTrue); -+ *((Object *) uin->d) = Object(true); - else -- *((Object *) uin->d) = Object(gFalse); -+ *((Object *) uin->d) = Object(false); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); +- *((Object *) uin->d) = Object(num, gen); ++ *((Object *) uin->d) = Object({num, gen}); return 0; } -@@ -1814,7 +1814,7 @@ static int m_Object_getString(lua_State * L) - pdfdoc_changed_error(L); - if (((Object *) uin->d)->isString()) { - gs = (GooString *)((Object *) uin->d)->getString(); -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - } else - lua_pushnil(L); - return 1; +@@ -2011,7 +2011,7 @@ static int m_Object_arrayGetNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1); ++ *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; @@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L) pdfdoc_changed_error(L); if (!((Object *) uin->d)->isDict()) @@ -221,30 +212,42 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep return 0; } -@@ -2470,9 +2470,9 @@ static int m_PDFDoc_getFileName(lua_State * L) +@@ -2104,7 +2104,7 @@ static int m_Object_dictLookupNF(lua_State * L) + if (((Object *) uin->d)->isDict()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2169,7 +2169,7 @@ static int m_Object_dictGetValNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2470,7 +2470,7 @@ static int m_PDFDoc_getFileName(lua_State * L) uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); - gs = ((PdfDocument *) uin->d)->doc->getFileName(); + gs = (GooString *) ((PdfDocument *) uin->d)->doc->getFileName(); if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); + lua_pushlstring(L, gs->getCString(), gs->getLength()); else - lua_pushnil(L); - return 1; -@@ -2559,9 +2559,9 @@ static int m_PDFDoc_readMetadata(lua_State * L) +@@ -2559,7 +2559,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { - gs = ((PdfDocument *) uin->d)->doc->readMetadata(); + gs = (GooString *) ((PdfDocument *) uin->d)->doc->readMetadata(); if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); + lua_pushlstring(L, gs->getCString(), gs->getLength()); else - lua_pushnil(L); - } else @@ -2577,7 +2577,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L) if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); @@ -254,65 +257,3 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout = new_StructTreeRoot_userdata(L); uout->d = obj; uout->pc = uin->pc; -@@ -3038,12 +3038,12 @@ m_poppler_get_BOOL(Attribute, isHidden); - - static int m_Attribute_setHidden(lua_State * L) - { -- GBool i; -+ bool i; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = (bool) lua_toboolean(L, 2); - ((Attribute *) uin->d)->setHidden(i); - return 0; - } -@@ -3180,7 +3180,7 @@ static int m_StructElement_getParentRef(lua_State * L) - // Ref is false if the C++ functione return false - static int m_StructElement_getPageRef(lua_State * L) - { -- GBool b; -+ bool b; - Ref *r; - udstruct *uin, *uout; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3226,16 +3226,16 @@ static int m_StructElement_setRevision(lua_State * L) - - static int m_StructElement_getText(lua_State * L) - { -- GBool i; -+ bool i; - GooString *gs; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = (bool) lua_toboolean(L, 2); - gs = ((StructElement *) uin->d)->getText(i); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - return 1; -@@ -3321,7 +3321,7 @@ static int m_StructElement_findAttribute(lua_State * L) - { - Attribute::Type t; - Attribute::Owner o; -- GBool g; -+ bool g; - udstruct *uin, *uout; - const Attribute *a; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3329,7 +3329,7 @@ static int m_StructElement_findAttribute(lua_State * L) - pdfdoc_changed_error(L); - t = (Attribute::Type) luaL_checkint(L,1); - o = (Attribute::Owner) luaL_checkint(L,2); -- g = (GBool) lua_toboolean(L, 3); -+ g = (bool) lua_toboolean(L, 3); - a = ((StructElement *) uin->d)->findAttribute(t,g,o); - - if (a!=NULL){ diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6fedd78f0..2287a2ff08 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -111,12 +111,12 @@ "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "e1975bce0b9d270d7c9773c5beb7e87d61ee8f57")) + (arch-revision "418dd6f008c3d41a461353fdb60f2d73d87c58ed")) (append (search-patches "texlive-bin-CVE-2018-17407.patch" "texlive-bin-luatex-poppler-compat.patch") (list - (arch-patch "pdftex-poppler0.72.patch" arch-revision - "0p46b6xxxg2s3hx67r0wpz16g3qygx65hpc581xs3jz5pvsiq3y7") + (arch-patch "pdftex-poppler0.75.patch" arch-revision + "1cqpcp7h1qyxyp3wjbpcmx2wgvj9ywpz60hvy280mp9w633yzyg3") (arch-patch "xetex-poppler-fixes.patch" arch-revision "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) (build-system gnu-build-system) @@ -197,17 +197,21 @@ #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler (lambda _ - ;; Adjust for deprecated types in Poppler 0.73. + ;; Adjust for deprecated types in Poppler 0.73 and later. (substitute* (append (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") '("texk/web2c/pdftexdir/pdftosrc.cc")) + (("GBool") "bool") + (("gFalse") "false") + (("gTrue") "true") + (("getCString") "c_str") (("Guint") "unsigned int") (("Guchar") "unsigned char")) #t)) -- cgit v1.2.3 From 50943b4878623f17c688766b8ff72d9f3ce7ffb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Apr 2019 01:14:20 +0200 Subject: gnu: lcms: Incorporate grafted changes. * gnu/packages/ghostscript.scm (lcms)[replacement]: Remove. [source](patches): New field. (lcms/fixed): Remove variable. --- gnu/packages/ghostscript.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 53a9b60fdb..f724fe3ff1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -47,12 +47,13 @@ (define-public lcms (package (name "lcms") - (replacement lcms/fixed) (version "2.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lcms/lcms/" version "/lcms2-" version ".tar.gz")) + + (patches (search-patches "lcms-CVE-2018-16435.patch")) (sha256 (base32 "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8")))) (build-system gnu-build-system) @@ -68,14 +69,6 @@ Consortium standard (ICC), approved as ISO 15076-1.") (home-page "http://www.littlecms.com/") (properties '((cpe-name . "little_cms_color_engine"))))) -(define lcms/fixed - (package - (inherit lcms) - (source - (origin - (inherit (package-source lcms)) - (patches (search-patches "lcms-CVE-2018-16435.patch")))))) - (define-public libpaper (package (name "libpaper") -- cgit v1.2.3 From de1b5e4959bb3c499cde5bae14f8ec6a0c85630c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:44:50 +0200 Subject: gnu: openjpeg: Incorporate grafted changes. * gnu/packages/image.scm (openjpeg): Update to 2.3.1. [replacement]: Remove. [source]: Change to GIT-FETCH. --- gnu/packages/image.scm | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 08b4be5148..6c0ae474e8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -580,18 +580,16 @@ work.") (define-public openjpeg (package (name "openjpeg") - (version "2.3.0") - (replacement openjpeg-2.3.1) - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/uclouvain/openjpeg/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx")))) + (version "2.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uclouvain/openjpeg") + (commit (string-append "v" version)))) + (file-name (git-file-name "openjpeg" version)) + (sha256 + (base32 + "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. @@ -615,20 +613,6 @@ error-resilience, a Java-viewer for j2k-images, ...") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2))) -(define-public openjpeg-2.3.1 - (package - (inherit openjpeg) - (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uclouvain/openjpeg") - (commit (string-append "v" version)))) - (file-name (git-file-name "openjpeg" version)) - (sha256 - (base32 - "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))))) - (define-public openjpeg-1 (package (inherit openjpeg) (name "openjpeg") -- cgit v1.2.3 From 8de1979d7c2ad52100bd37ae0180e598e68d1c7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 23:31:58 +0200 Subject: gnu: openjpeg: Don't build 'libopenjp2.a'. * gnu/packages/image.scm (openjpeg)[arguments]: Add #:configure-flags. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6c0ae474e8..9adbf78390 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -592,8 +592,8 @@ work.") "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - ;; Trying to run `$ make check' results in a no rule fault. - '(#:tests? #f)) + '(#:tests? #f ;TODO: requires a 1.1 GiB data repository + #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- cgit v1.2.3 From 8b5b3acab3c98bf58e14fc55399a8b3a098094ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 May 2019 22:39:23 +0200 Subject: gnu: libpng: Remove graft for 1.6.37. * gnu/packages/image.scm (libpng): Update to 1.6.37. [replacement]: Remove field. (libpng-1.6.37): Remove variable. --- gnu/packages/image.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9adbf78390..10c2f82153 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -86,8 +86,7 @@ (define-public libpng (package (name "libpng") - (version "1.6.36") - (replacement libpng-1.6.37) + (version "1.6.37") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" @@ -100,7 +99,7 @@ "/libpng16/libpng-" version ".tar.xz"))) (sha256 (base32 - "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc")))) + "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))) (build-system gnu-build-system) ;; libpng.la says "-lz", so propagate it. @@ -113,25 +112,6 @@ library. It supports almost all PNG features and is extensible.") (license license:zlib) (home-page "http://www.libpng.org/pub/png/libpng.html"))) -;; This graft exists to fix CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317. -(define-public libpng-1.6.37 - (package - (inherit libpng) - (version "1.6.37") - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" - version "/libpng-" version ".tar.xz") - (string-append - "ftp://ftp.simplesystems.org/pub/libpng/png/src" - "/libpng16/libpng-" version ".tar.xz") - (string-append - "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" - "/libpng16/libpng-" version ".tar.xz"))) - (sha256 - (base32 - "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))))) - ;; libpng-apng should be updated when the APNG patch is released: ;; (define-public libpng-apng -- cgit v1.2.3 From 1ec290e27a52f92373d06b76afb0b677ea5d4aa0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:08:36 +0200 Subject: gnu: curl: Update to 7.64.1. * gnu/packages/curl.scm (curl): Update to 7.64.1. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index c8c1b0ca0d..32b120541d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,14 +51,14 @@ (define-public curl (package (name "curl") - (version "7.64.0") + (version "7.64.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) + "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From 2da9b81837fd1e6f08a10952784d3358be982855 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:09:06 +0200 Subject: gnu: harfbuzz: Update to 2.4.0. * gnu/packages/gtk.scm (harfbuzz): Update to 2.4.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0850c2bd5b..0549ca31c8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj")))) + "1mpah6kwqid1kxsj4rwqsniivqbrx231j65v51yncx6s0dch0dch")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 922fbf8a66306c59d5fc0078bd9cf91eafce381e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:10:26 +0200 Subject: gnu: jemalloc: Update to 5.2.0. * gnu/packages/jemalloc.scm (jemalloc): Update to 5.2.0. --- gnu/packages/jemalloc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index cb870208e4..aa8493fd1d 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -32,7 +32,7 @@ (define-public jemalloc (package (name "jemalloc") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append @@ -40,7 +40,7 @@ version "/jemalloc-" version ".tar.bz2")) (sha256 (base32 - "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk")))) + "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1f62621607fa5fa3914303e793ddb56d7455ac94 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:10:49 +0200 Subject: gnu: python-more-itertools: Update to 7.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6d84932a6..bf1c0e3eb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14280,14 +14280,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "6.0.0") + (version "7.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) + "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From f6e25b3358b8db6c115df9915c989c6afa0c007f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:11:16 +0200 Subject: gnu: python: Update to 3.7.3. * gnu/packages/python.scm (python-3.7): Update to 3.7.3. --- 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 a26a88e6d9..4fd7948327 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -317,7 +317,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.2") + (version "3.7.3") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -328,7 +328,7 @@ data types.") "python-3-search-paths.patch")) (sha256 (base32 - "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) + "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 46d258cbe2ad8f038ed805cac640d13604f54ea6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:31:07 +0200 Subject: gnu: pixman: Update to 0.38.4. * gnu/packages/xdisorg.scm (pixman): Update to 0.38.4. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 03b27f35a5..c30e711946 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -353,7 +353,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.38.0") + (version "0.38.4") (source (origin (method url-fetch) (uri (string-append @@ -361,7 +361,7 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "1a0ci5ni7wngh59m0m00wzvhrc39aqj54yj88msw5msn07pjnnd7")) + "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 3d8f6577bf0ff68d5b73ca713d247319bdd30f03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:33:10 +0200 Subject: gnu: util-linux: Update to 2.33.2. * gnu/packages/linux.scm (util-linux): Update to 2.33.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b39f45338f..68d022cffe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -645,7 +645,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.1") + (version "2.33.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -653,7 +653,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) + "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 0a404bdb5ec415357b14b7780d4eae4b42a4014b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:34:28 +0200 Subject: gnu: libuv: Update to 1.28.0. * gnu/packages/libevent.scm (libuv): Update to 1.28.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 0ec707bcb7..e8d2892f74 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.27.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1jndi12800p1r34rc41kaxhwrb3cb3pcsnkyp3v0c1k7ld3p124d")))) + "1b86gsigfviacq47wdk82avzh5ipz6c06in65qclf805ssi8gbrh")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From f1e9999b5f69e4534a0f74acf3080b0e34bdcc98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:37:55 +0200 Subject: gnu: boost: Update to 1.70.0. * gnu/packages/boost.scm (boost): Update to 1.70.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b83bd73a39..73b4cff4c8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -44,7 +44,7 @@ (define-public boost (package (name "boost") - (version "1.69.0") + (version "1.70.0") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -56,7 +56,7 @@ version-with-underscores ".tar.bz2")))) (sha256 (base32 - "01j4n142dz20lcgqji8d8hspp04p1nv7m8i6dz8w5lchfdhx8clg")) + "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) -- cgit v1.2.3 From 56e95d54d209c2428f970d65d9b27ae4168449ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:07:14 +0200 Subject: gnu: python-pytest: Update to 4.4.1. * gnu/packages/check.scm (python-pytest): Update to 4.4.1. [arguments]: Enable previously failing tests. --- gnu/packages/check.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6103f8e3f7..ef6b29f17d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -686,14 +686,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.3.1") + (version "4.4.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "08q58ad8vaxyb57ll8m611yb4xwzzhp09kxafmyqrrps6cnalbjr")))) + "1xcmic8wzaj00rn1lg4ib4prh2f4lzpiaadk35qlv8hcny1j505p")))) (build-system python-build-system) (arguments `(#:phases @@ -707,13 +707,7 @@ standard library.") " and not test_argcomplete" ;; This test tries to override PYTHONPATH, and ;; subsequently fails to locate the test libraries. - " and not test_collection" - ;; These tests fail when run in verbose mode: - ;; . - " and not test_dont_rewrite_if_hasattr_fails" - " and not test_len" - " and not test_custom_repr" - " and not test_name"))))))) + " and not test_collection"))))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) -- cgit v1.2.3 From 123bba720d569e533d45173c472475d655541dae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 May 2019 23:29:03 +0200 Subject: gnu: python-hypothesis: Update to 4.18.3. * gnu/packages/check.scm (python-hypothesis): Update to 4.18.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ef6b29f17d..9172c2c5e0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1497,13 +1497,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "4.7.19") + (version "4.18.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "18740bkpvj4ygmvzxnhakxdmj2igvgyayczyajll9gz5x47d9mjy")))) + "0a35nwqyjnm4cphi43xracqpkws0ip61mndvqb1iqq7gkva83lb1")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From a5e9413ce874d8e26f78361a91965f6ff9735bf4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 3 May 2019 23:46:29 -0400 Subject: gnu: python: Disable failing test. Fixes issue #35556 (see: https://bugs.gnu.org/35556). * gnu/packages/python.scm (python-3.7)[make-flags]: Exclude the test "test_asyncio", which currently fails. --- gnu/packages/python.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4fd7948327..244e0d1a1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -352,8 +352,11 @@ data types.") (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:make-flags _) - ;; Strip tests exclusions that have to do with Python 2 only. - `(list (format #f "TESTOPTS=-j~d" (parallel-job-count)))) + `(list (string-append + (format #f "TESTOPTS=-j~d" (parallel-job-count)) + ;; Exclude the following test, which fails as of 3.7.3 (see: + ;; https://bugs.python.org/issue35998). + " --exclude test_asyncio"))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 176003dafe8bda6cc07c81f4a8c97af8e529427c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:57:49 +0200 Subject: gnu: meson: Update to 0.50.1. * gnu/packages/build-tools.scm (meson): Update to 0.50.1. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 71b1756d3b..34f0037e6a 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -160,7 +160,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.50.0") + (version "0.50.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "07q2wz23wjfk8z66mli1cc9as0ycjp5f39fd4awny82qv8nw86ra")))) + "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From de7dae6e1014c749ce209f67e8db156dd2fc7b9e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:11 +0200 Subject: gnu: CMake: Update to 3.14.3. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.3. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index b999c0c170..179b3fec50 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.0") + (version "3.14.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "00jmwwkr3ybsr4hz4hgiv75zaak5yirp110zf131kby2ndkvlxma")) + "0cmnyk9agdgwnc4svzafhddqgcrhvwp5cgmn54mih1qkx1j0np91")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 3b08c873d857b5585204535da8906e53c8aed568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:30 +0200 Subject: gnu: fontforge: Update to 20190413. * gnu/packages/fontutils.scm (fontforge): Update to 20190413. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 0259e374d9..820dd6f666 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -555,14 +555,14 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190317") + (version "20190413") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) - (sha256 (base32 - "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp")))) + (sha256 + (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 27ed6960beda88e823790f3ab4cd9af9772c00ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:57 +0200 Subject: gnu: icu4c: Update to 64.2. * gnu/packages/icu4c.scm (icu4c): Update to 64.2. [native-inputs]: Add PYTHON. --- gnu/packages/icu4c.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 6e93d6aed9..054c41d361 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -23,6 +23,7 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -32,7 +33,7 @@ (define-public icu4c (package (name "icu4c") - (version "63.1") + (version "64.2") (source (origin (method url-fetch) (uri (string-append @@ -42,8 +43,10 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05")))) + (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) + (native-inputs + `(("python" ,python))) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From e77412362f8217eaa9afa34f44a4b85aba23e91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:59:25 +0200 Subject: gnu: OpenBLAS: Update to 0.3.6. * gnu/packages/maths.scm (openblas): Update to 0.3.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d59028599f..49c8de8979 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2973,7 +2973,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) @@ -2982,7 +2982,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "062kg4ny1ywz7k5grpb4pbf0hba0w6manbajwkmv4f477a31sxpl")))) + "1r2g9zzwq5dm8vjd19pxwggfvfzy56cvkmpmp5d014qr3svgmsap")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 63432c96473e689b9d01c366a507bec1f9e05f22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:59:56 +0200 Subject: gnu: SQLite: Update to 3.28.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.28.0. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index caa98c0861..6d6df17f90 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.27.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal")))) + "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 45a3ad2ea6b902c7f154168fdfd834937af76183 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:00:21 +0200 Subject: gnu: nghttp2: Update to 1.38.0. * gnu/packages/web.scm (nghttp2): Update to 1.38.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 7c3744cc5b..6d591b88cb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6354,7 +6354,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.37.0") + (version "1.38.0") (source (origin (method url-fetch) @@ -6363,7 +6363,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1ds7ilgdsq1dykp285cxrl17xsgkxp0a2413wcgvkx0p9cb0n2da")))) + "1y47xsg7nbfwqx77rc5phi5rh6j8l1x3k9ig6yscchc2hmhwfxgg")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From ae528aaf19f3828d3d7d204b15570800e1bbf100 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:01:04 +0200 Subject: gnu: perl: Update to 5.28.2. * gnu/packages/perl.scm (perl): Update to 5.28.2. --- 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 58d6da2d01..8f953cf3ad 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -65,14 +65,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.1") + (version "5.28.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry")) + "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From 3784b580efcf82f38299eee516dfc5be75e5a4fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:01:36 +0200 Subject: gnu: QPDF: Update to 8.4.1. * gnu/packages/pdf.scm (qpdf): Update to 8.4.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 850e1db3e5..659e9b6bfe 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -663,14 +663,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "8.4.0") + (version "8.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r")) + "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove -- cgit v1.2.3 From 420b013724a99d3b00507669f57c5de135dd758f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 May 2019 16:23:57 +0200 Subject: gnu: libpng: Don't build 'libpng16.a'. * gnu/packages/image.scm (libpng)[arguments]: Add #:configure-flags. --- gnu/packages/image.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 10c2f82153..e76661c7d4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -101,6 +101,8 @@ (base32 "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) ;; libpng.la says "-lz", so propagate it. (propagated-inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From a8bb8fccd82a10a46f127b2235675b4f6cbaaf98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 May 2019 18:01:12 +0200 Subject: gnu: harfbuzz: Update source hash. The previous tarball was modified in-place; see . * gnu/packages/gtk.scm (harfbuzz)[source](sha256): Update. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0549ca31c8..a0308cb036 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "1mpah6kwqid1kxsj4rwqsniivqbrx231j65v51yncx6s0dch0dch")))) + "0vrkvdlmihdg62a4c6h5kx27khc33xmb95l50zgnwnavvpwyyw5l")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 4e933afda42c41a5425fe460a0ee7ba5435e612b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Apr 2019 23:46:40 -0400 Subject: gnu: python-cffi: Fix tests. Fixes issue #35371 (see: https://bugs.gnu.org/35371). * gnu/packages/libffi.scm (python-cffi)[phases] {patch-paths-of-dynamically-loaded-libraries}: Add phase. [home-page]: Update URL. --- gnu/packages/libffi.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index f47f7623b4..3a16b752cd 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,6 +127,30 @@ conversions for values passed between the two languages.") (("'cc testownlib") "'gcc testownlib")) (invoke "py.test" "-v" "c/" "testing/") #t)) + (add-before 'check 'patch-paths-of-dynamically-loaded-libraries + (lambda* (#:key inputs #:allow-other-keys) + ;; Shared libraries should be referred by their absolute path as + ;; using find_library or the like with their name fail when the + ;; resolved .so object is a linker script rather than an ELF + ;; binary (this is a limitation of the ctype library of Python). + (let* ((glibc (assoc-ref inputs "libc")) + (libm (string-append glibc "/lib/libm.so.6")) + (libc (string-append glibc "/lib/libc.so.6"))) + (substitute* '("testing/cffi0/test_function.py" + "testing/cffi0/test_parsing.py" + "testing/cffi0/test_unicode_literals.py" + "testing/cffi0/test_zdistutils.py" + "testing/cffi1/test_recompiler.py") + (("lib_m = ['\"]{1}m['\"]{1}") + (format #f "lib_m = '~a'" libm))) + (substitute* '("testing/cffi0/test_verify.py" + "testing/cffi1/test_verify1.py") + (("lib_m = \\[['\"]{1}m['\"]{1}\\]") + (format #f "lib_m = ['~a']" libm))) + (substitute* "c/test_c.py" + (("find_and_load_library\\(['\"]{1}c['\"]{1}") + (format #f "find_and_load_library('~a'" libc))) + #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 @@ -133,10 +158,9 @@ conversions for values passed between the two languages.") (substitute* "testing/cffi0/test_ownlib.py" (("ret.left") "ownlib.left")) #t))))) - (home-page "https://cffi.readthedocs.org") + (home-page "https://cffi.readthedocs.io/") (synopsis "Foreign function interface for Python") - (description - "Foreign Function Interface for Python calling C code.") + (description "Foreign Function Interface for Python calling C code.") (license expat))) (define-public python2-cffi -- cgit v1.2.3 From 996186b64de91927d2868e43804d97dd95c3794c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 May 2019 15:20:18 +0200 Subject: gnu: lz4: Update to 1.9.1. * gnu/packages/compression.scm (lz4): Update to 1.9.1. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4324ac4d96..890ff7691a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -722,7 +722,7 @@ decompression of some loosely related file formats used by Microsoft.") (define-public lz4 (package (name "lz4") - (version "1.8.3") + (version "1.9.1") (source (origin (method git-fetch) @@ -730,7 +730,7 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 - "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g")) + "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("valgrind" ,valgrind))) ;for tests -- cgit v1.2.3 From fd6983d10ff987ca3fffca601b5edf66a293e380 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 17:14:29 +0100 Subject: gnu: gsasl: Use the MIT Kerberos implementation instead of GSS. * gnu/packages/gsasl.scm (gsasl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: New field. --- gnu/packages/gsasl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 127b476ef3..9296f3d80f 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -95,9 +95,11 @@ the underlying security implementation.") (("test-lock\\$\\(EXEEXT\\) ") "")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-gssapi-impl=mit"))) (inputs `(("libidn" ,libidn) ("libntlm" ,libntlm) - ("gss" ,gss) + ("mit-krb5" ,mit-krb5) ("zlib" ,zlib))) (propagated-inputs ;; Propagate GnuTLS because libgnutls.la reads `-lnettle', and Nettle is a -- cgit v1.2.3 From 828d3765a71ce1b74d1ab122c84d5c16eabf98b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 17:16:25 +0100 Subject: gnu: curl: Build against MIT Kerberos instead of GSS. * gnu/packages/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: Adjust accordingly. --- gnu/packages/curl.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 32b120541d..a83760adc1 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -37,8 +37,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages golang) #:use-module (gnu packages groff) - #:use-module (gnu packages gsasl) #:use-module (gnu packages guile) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -63,7 +63,6 @@ (outputs '("out" "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) - ("gss" ,gss) ("libidn" ,libidn) ;; TODO XXX ;; Curl doesn't actually use or refer to libssh2 because the build @@ -71,6 +70,7 @@ ;; a mass rebuild is appropriate (e.g. core-updates). ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) + ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) (native-inputs @@ -89,8 +89,10 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi" - "--disable-static") + `(#:configure-flags (list "--with-gnutls" + (string-append "--with-gssapi=" + (assoc-ref %build-inputs "mit-krb5")) + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 52cb7748cbdb61b87e5c2bbc99e12284f21a304d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 May 2019 20:08:36 +0200 Subject: gnu: curl: Remove unused input. * gnu/packages/curl.scm (curl)[inputs]: Remove LIBSSH2-1.8.0. * gnu/packages/ssh.scm (libssh2-1.8.0): Remove variable. --- gnu/packages/curl.scm | 5 ----- gnu/packages/ssh.scm | 18 ------------------ 2 files changed, 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a83760adc1..9a13815e3d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -64,11 +64,6 @@ "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) ("libidn" ,libidn) - ;; TODO XXX - ;; Curl doesn't actually use or refer to libssh2 because the build - ;; is not configured with '--with-libssh2'. Remove this input when - ;; a mass rebuild is appropriate (e.g. core-updates). - ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e887cd7e70..a763c6aba2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -143,24 +143,6 @@ a server that supports the SSH-2 protocol.") (license license:bsd-3) (home-page "https://www.libssh2.org/"))) -;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. -;; -(define-public libssh2-1.8.0 - (hidden-package - (package - (inherit libssh2) - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) - (define-public openssh (package (name "openssh") -- cgit v1.2.3 From 43d9ed7792808638eabb43aa6133f1d6186c520b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 May 2019 01:05:30 +0200 Subject: gnu: lzip: Update to 1.21. * gnu/packages/compression.scm (lzip): Update to 1.21. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 890ff7691a..8db1136be0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -536,14 +536,14 @@ some compression ratio).") (define-public lzip (package (name "lzip") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lzip-" version ".tar.gz")) (sha256 (base32 - "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9")))) + "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4")))) (build-system gnu-build-system) (home-page "https://www.nongnu.org/lzip/lzip.html") (synopsis "Lossless data compressor based on the LZMA algorithm") -- cgit v1.2.3 From 74659ebef1f6da73eac2ac1bf357c85e8add1118 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 May 2019 00:30:09 +0200 Subject: gnu: curl: Remove graft for 7.65.0. * gnu/packages/curl.scm (curl): Update to 7.65.0. (curl-7.65.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 338d26d2e3..5be31ff73e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,15 +51,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.65.0) - (version "7.64.1") + (version "7.65.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) + "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -144,19 +143,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.65.0 - (package - (inherit curl) - (version "7.65.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From 1b4c3faff4a412e8478184bc7b41fa23c78c4320 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 May 2019 18:16:45 +0200 Subject: gnu: curl: Remove unused module import. This is a follow-up to commit 52cb7748cbdb61b87e5c2bbc99e12284f21a304d. * gnu/packages/curl.scm: Don't import (gnu packages ssh). --- gnu/packages/curl.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 5be31ff73e..6d1ab81d07 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages web)) -- cgit v1.2.3 From a3e53041b87932e2a44b109d7f28cc331bc5021b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 May 2019 18:14:01 +0200 Subject: gnu: perl: Update to 5.30.0. * gnu/packages/patches/perl-no-sys-dirs.patch: Adjust Errno.h hunk. * gnu/packages/perl.scm (perl): Update to 5.30.0. --- gnu/packages/patches/perl-no-sys-dirs.patch | 23 ++++++++++++++++------- gnu/packages/perl.scm | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/perl-no-sys-dirs.patch b/gnu/packages/patches/perl-no-sys-dirs.patch index 31d53e0353..2269d715c7 100644 --- a/gnu/packages/patches/perl-no-sys-dirs.patch +++ b/gnu/packages/patches/perl-no-sys-dirs.patch @@ -112,20 +112,29 @@ Only in perl-5.20.0/: Configure.orig diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL --- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 +++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -126,11 +126,7 @@ +@@ -114,7 +114,7 @@ sub get_files { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + my $linux_errno_h; +- if ($^O eq 'linux') { ++ if (0) { + # Some Linuxes have weird errno.hs which generate + # no #file or #line directives + ($linux_errno_h) = grep { -e $_ } map { "$_/errno.h" } +@@ -134,13 +134,6 @@ sub get_files { if ($dep =~ /(\S+errno\.h)/) { $file{$1} = 1; } - } elsif ($^O eq 'linux' && - $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i +- $Config{gccversion} !~ /intel/i && - # might be using, say, Intel's icc +- $linux_errno_h - ) { -+ } elsif (0) { - # When cross-compiling we may store a path for gcc's "sysroot" option: - my $sysroot = $Config{sysroot} || ''; - # Some Linuxes have weird errno.hs which generate -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +- $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place + $file{'/boot/develop/headers/posix/errno.h'} = 1; diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh --- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 +++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9ec802472a..8ae7558e7d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -65,14 +65,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.2") + (version "5.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da")) + "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From e7809d96aa3853e09a90c42d4b5a5dbd84765964 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:38:52 +0200 Subject: gnu: bison: Update to 3.4.1. * gnu/packages/bison.scm (bison): Update to 3.4.1. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index ae37a8f80c..5f50ebf6b8 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.3.2") + (version "3.4.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "016qp59wxakz3ckxwyrmzxk406q0h286ydz8ww1m0pnrc5dy97h3")))) + "03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From 45771d63c5b8e3c65b0bc5dfaca57c44e87128e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:40:41 +0200 Subject: gnu: cmake: Update to 3.14.4. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.4. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e49654a6d5..e77c97e11f 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.3") + (version "3.14.4") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0cmnyk9agdgwnc4svzafhddqgcrhvwp5cgmn54mih1qkx1j0np91")) + "1n9nzxq1dzbpa0pisdv7g57a8qr9b7n35vbfy489s1v602dxrd00")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 98be913d5b467bbc56b9fddeca6e9e7b6d402b21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:41:33 +0200 Subject: gnu: dbus: Update to 1.12.14. * gnu/packages/glib.scm (dbus): Update to 1.12.14. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2f70e8d875..b2d4bf5554 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -82,7 +82,7 @@ (define dbus (package (name "dbus") - (version "1.12.12") + (version "1.12.14") (source (origin (method url-fetch) (uri (string-append @@ -90,7 +90,7 @@ version ".tar.gz")) (sha256 (base32 - "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm")) + "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 91cf806425f3ebd7a5256c904ed882095e5ea12b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:41:58 +0200 Subject: gnu: libuv: Update to 1.29.1. * gnu/packages/libevent.scm (libuv): Update to 1.29.1. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index e8d2892f74..263fe7630f 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.28.0") + (version "1.29.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1b86gsigfviacq47wdk82avzh5ipz6c06in65qclf805ssi8gbrh")))) + "032pr9366qsxl78bd4id2c5pfrjv1j997zm5a7a8dbycllyh91hl")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From 5dc3de3ac7cc1b748500072de730f84d3e63961e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:42:22 +0200 Subject: gnu: libidn2: Update to 2.2.0. * gnu/packages/libidn.scm (libidn2): Update to 2.2.0. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 1487a7644d..ea9ce70dfb 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -59,14 +59,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.1.1a") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "1pdvar50hsgma40gmd7rgrwxhfbqfdpx5slxhl3jjpy1rcjgy9bd")))) + "1a5cv79q6b719jv4fpwjl3r0mmx9qcpla98v9dk64cgxn8f8di10")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From bb9dec546f839c38b7955f78d46b5405af505f76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 20:50:38 +0200 Subject: gnu: gawk: Update to 5.0.0. * gnu/packages/patches/libgpg-error-gawk-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (libgpg-error)[source](modules, patches): New fields. * gnu/packages/gawk.scm (gawk): Update to 5.0.0. --- gnu/local.mk | 1 + gnu/packages/gawk.scm | 4 +- gnu/packages/gnupg.scm | 11 +- .../patches/libgpg-error-gawk-compat.patch | 155 +++++++++++++++++++++ 4 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-gawk-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d531050254..06f3f3a802 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,6 +994,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 487020ad3b..9b7b93651f 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -30,13 +30,13 @@ (define-public gawk (package (name "gawk") - (version "4.2.1") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi")))) + (base32 "01j409gharghgf7h0pjzywkimhz2ldrxf85nvf3sv1dl1vnr3w2h")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 47fcf5569d..230df101d5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -85,7 +85,16 @@ version ".tar.bz2")) (sha256 (base32 - "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")))) + "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")) + (patches (search-patches "libgpg-error-gawk-compat.patch")) + ;; XXX: Remove this snippet with the gawk patch above. It avoids having + ;; to call autoreconf for the Makefile.am change to take effect. + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "src/Makefile.in" + (("namespace=errnos") "pkg_namespace=errnos")) + #t)))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") diff --git a/gnu/packages/patches/libgpg-error-gawk-compat.patch b/gnu/packages/patches/libgpg-error-gawk-compat.patch new file mode 100644 index 0000000000..85477b0be6 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-gawk-compat.patch @@ -0,0 +1,155 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk +index ae29043..9a1fc18 100644 +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/Makefile.am b/src/Makefile.am +index ce1b882..f2590cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk +index 46d436c..e9c857c 100644 +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk +index a771a73..4578e29 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk +index ea58503..188f7a4 100644 +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk +index f79df66..15b1aad 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index c9de9c1..285e45f 100644 +--- a/src/mkstrtable.awk ++++ b/src/mkstrtable.awk +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ header { + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ END { + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ END { + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + -- cgit v1.2.3 From 848e600d71bc7420ff08cc1f1fd40498b7817ab4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 May 2019 00:53:04 +0200 Subject: gnu: Remove help2man@1.47.6. * gnu/packages/man.scm (help2man): Update to 1.47.10. (help2man/latest): Remove variable. --- gnu/packages/man.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 04c800e95f..a24c7eff22 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -198,7 +198,7 @@ Linux kernel and C library interfaces employed by user-space programs.") (define-public help2man (package (name "help2man") - (version "1.47.6") + (version "1.47.10") (source (origin (method url-fetch) @@ -206,7 +206,7 @@ Linux kernel and C library interfaces employed by user-space programs.") version ".tar.xz")) (sha256 (base32 - "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr")))) + "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))) (build-system gnu-build-system) (arguments `(;; There's no `check' target. #:tests? #f)) @@ -224,18 +224,6 @@ Linux kernel and C library interfaces employed by user-space programs.") automatically.") (license gpl3+))) -(define-public help2man/latest - (package - (inherit help2man) - (version "1.47.10") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/help2man/help2man-" - version ".tar.xz")) - (sha256 - (base32 - "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))))) - (define-public scdoc (package (name "scdoc") -- cgit v1.2.3 From 13f3893b600e77c04b9962b8eea409f50e8efdbf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 May 2019 21:18:48 +0300 Subject: gnu: bash: Update to patch level 7. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 3 through 7. --- gnu/packages/bash.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 4a884e6175..31c9a8b0cf 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -62,7 +62,12 @@ ;; 'download-patches' below. (patch-series (1 "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") - (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47"))) + (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") + (3 "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") + (4 "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") + (5 "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") + (6 "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") + (7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of -- cgit v1.2.3 From f87a7cc60e058d2e07560d0d602747b567d9dce4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 May 2019 14:07:56 +0200 Subject: gnu: libev: Update to 4.25. * gnu/packages/libevent.scm (libev): Update to 4.25. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 263fe7630f..962a228e4b 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -100,7 +100,7 @@ loop.") (define-public libev (package (name "libev") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/libev/Attic/libev-" @@ -108,7 +108,7 @@ loop.") ".tar.gz")) (sha256 (base32 - "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp")))) + "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq")))) (build-system gnu-build-system) (home-page "http://software.schmorp.de/pkg/libev.html") (synopsis "Event loop loosely modelled after libevent") -- cgit v1.2.3 From b644008ca2ea2cb588a1deec8cddaf8e4f07e004 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Jun 2019 18:09:21 +0200 Subject: gnu: mes-boot, tcc-boot0: Require nyacc 0.86. This is a followup to b8016467273d06ffe3780ac97d38acfd72ce15d9. * gnu/packages/commencement.scm (mes-boot, tcc-boot0): Use source from NYACC-0.86 instead of NYACC. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8f59087ff4..13b813f806 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -91,7 +91,7 @@ (propagated-inputs '()) (native-inputs `(("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc)) + ("nyacc-source" ,(package-source nyacc-0.86)) ("coreutils" , %bootstrap-coreutils&co) ("bootstrap-mes" ,%bootstrap-mes))) @@ -182,7 +182,7 @@ (native-inputs `(("mes" ,mes-boot) ("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc)) + ("nyacc-source" ,(package-source nyacc-0.86)) ("coreutils" , %bootstrap-coreutils&co) ("bootstrap-mes" ,%bootstrap-mes))) -- cgit v1.2.3 From 44f07d1dc6806e97c4e9ee3e6be883cc59dc666e Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 28 May 2019 15:40:26 +0000 Subject: gnu: guile: Disable unreliable out-of-memory test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/guile-2.2-skip-oom-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-2.2)[source](patches): Add "guile-2.2-skip-oom-test.patch". Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/guile.scm | 2 ++ gnu/packages/patches/guile-2.2-skip-oom-test.patch | 25 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/guile-2.2-skip-oom-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index a212dbc799..b92f82e7cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,6 +891,7 @@ dist_patch_DATA = \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ + %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 67825ffc30..ae5fca513a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -228,6 +228,8 @@ without requiring the source code to be rewritten.") (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) (modules '((guix build utils))) + (patches (search-patches + "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything ;; from source, at the expense of significantly longer build diff --git a/gnu/packages/patches/guile-2.2-skip-oom-test.patch b/gnu/packages/patches/guile-2.2-skip-oom-test.patch new file mode 100644 index 0000000000..765577653f --- /dev/null +++ b/gnu/packages/patches/guile-2.2-skip-oom-test.patch @@ -0,0 +1,25 @@ +Skip 'test-out-of-memory', which is unreliable in Guile 2.2.4: + + https://bugs.gnu.org/34155 + +--- a/test-suite/standalone/Makefile.in 1969-12-31 19:00:00.000000000 -0500 ++++ b/test-suite/standalone/Makefile.in 2019-05-27 16:44:32.302355990 -0400 +@@ -103,7 +103,7 @@ + test-scm-c-bind-keyword-arguments$(EXEEXT) \ + test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \ + test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \ +- test-stack-overflow test-out-of-memory ++ test-stack-overflow + check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \ + test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \ + test-unwind$(EXEEXT) test-conversion$(EXEEXT) \ +@@ -1938,8 +1938,7 @@ + test-command-line-encoding test-command-line-encoding2 \ + test-language test-guild-compile $(am__append_3) \ + test-foreign-object-scm test-fast-slot-ref test-mb-regexp \ +- test-use-srfi $(am__append_5) test-stack-overflow \ +- test-out-of-memory ++ test-use-srfi $(am__append_5) test-stack-overflow + BUILT_SOURCES = $(am__append_2) + EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \ + test-import-order-c.scm test-import-order-d.scm \ -- cgit v1.2.3 From 836a85da0e8609d40716581be00802ee43463038 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2019 15:10:45 +0200 Subject: gnu: bootstrap: Download the bootstrap bash, mkdir, tar, and xz binaries. * gnu/packages/bootstrap.scm (%bootstrap-executables): New variable. (bootstrap-executable-url, bootstrap-executable): New procedure. (raw-build)[->store]: Use 'run-with-store' and 'origin->derivation'. Add calls to 'derivation->output-path', and remove the list of references passed to 'add-text-to-store' for BUILDER. Augment the list of #:inputs passed to 'derivation'. (package-from-tarball): Use 'bootstrap-executable' instead of 'search-bootstrap-binary'. (%bootstrap-glibc, %bootstrap-gcc, %bootstrap-mescc-tools) (%bootstrap-mes): Likewise. * guix/scripts/environment.scm (environment-bash): Use 'bootstrap-executable' instead of 'search-bootstrap-binary'. (guix-environment): Adjust CONTAINER? case accordingly. * po/guix/POTFILES.in: Add gnu/packages/bootstrap.scm. --- gnu/packages/bootstrap.scm | 123 +++++++++++++++++++++++++++++++++++-------- guix/scripts/environment.scm | 10 ++-- po/guix/POTFILES.in | 1 + 3 files changed, 107 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 50786d9f21..255141ae87 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen @@ -33,8 +33,11 @@ #:select (derivation derivation->output-path)) #:use-module ((guix utils) #:select (gnu-triplet->nix-system)) #:use-module (guix memoization) + #:use-module (guix i18n) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (bootstrap-origin package-with-bootstrap-guile @@ -60,6 +63,82 @@ ;;; Code: + +;;; +;;; The bootstrap executables: 'bash', 'mkdir', 'tar', 'xz'. They allow us to +;;; extract the very first tarball. +;;; + +(define %bootstrap-executables + ;; List of bootstrap executables and their recursive hashes (as per 'guix + ;; hash -r'), taking their executable bit into account. + `(("aarch64-linux" + ("bash" + ,(base32 "13aqhqb8nydlwq1ah9974q0iadx1pb95v13wzzyf7vgv6nasrwzr")) + ("mkdir" + ,(base32 "1pxhdp7ldwavmm71xbh9wc197cb2nr66acjn26yjx3732cixh9ws")) + ("tar" + ,(base32 "1j51gv08sfg277yxj73xd564wjq3f8xwd6s9rbcg8v9gms47m4cx")) + ("xz" + ,(base32 "1d779rwsrasphg5g3r37qppcqy3p7ay1jb1y83w7x4i3qsc7zjy2"))) + ("armhf-linux" + ("bash" + ,(base32 "0s6f1s26g4dsrrkl39zblvwpxmbzi6n9mgqf6vxsqz42gik6bgyn")) + ("mkdir" + ,(base32 "1r5rcp35niyxfkrdf00y2ba8ifrq9bi76cr63lwjf2l655j1i5p7")) + ("tar" + ,(base32 "0dksx5im3fv8ximz7368bsax9f26nn47ds74298flm5lnvpv9xly")) + ("xz" + ,(base32 "1cqqavghjfr0iwxqf61lrssv27wfigysgq2rs4rm1gkmn04yn1k3"))) + ("i686-linux" + ("bash" + ,(base32 "0rjaxyzjdllfkf1abczvgaf3cdcc7mmahyvdbkjmjzhgz92pv23g")) + ("mkdir" + ,(base32 "133ybmfpkmsnysrzbngwvbysqnsmfi8is8zifs7i7n6n600h4s1w")) + ("tar" + ,(base32 "07830bx29ad5i0l1ykj0g0b1jayjdblf01sr3ww9wbnwdbzinqms")) + ("xz" + ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) + ("mips64el-linux" + ("bash" + ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) + ("mkdir" + ,(base32 "0c9j6qgyw84zxbry3ypifzll13gy8ax71w40kdk1h11jbgla3f5k")) + ("tar" + ,(base32 "06gmqdjq3rl8lr47b9fyx4ifnm5x56ymc8lyryp1ax1j2s4y5jb4")) + ("xz" + ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))))) + +(define (bootstrap-executable-url program system) + "Return the URL where PROGRAM can be found for SYSTEM." + (string-append + "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" + system "/" program + "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")) + +(define bootstrap-executable + (mlambda (program system) + "Return an origin for PROGRAM, a statically-linked bootstrap executable +built for SYSTEM." + (let ((system (if (string=? system "x86_64-linux") + "i686-linux" + system))) + (match (assoc-ref (assoc-ref %bootstrap-executables system) + program) + (#f + (raise (condition + (&message + (message + (format #f (G_ "could not find bootstrap binary '~a' \ +for system '~a'") + program system)))))) + ((sha256) + (origin + (method url-fetch/executable) + (uri (bootstrap-executable-url program system)) + (file-name program) + (sha256 sha256))))))) + ;;; ;;; Helper procedures. @@ -133,8 +212,8 @@ or false to signal an error." (invoke (string-append "bin/" ,program-to-test) "--version")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (source (%current-system)))))) (source #f) (synopsis description) @@ -258,11 +337,9 @@ or false to signal an error." #:key outputs system search-paths #:allow-other-keys) (define (->store file) - (add-to-store store file #t "sha256" - (or (search-bootstrap-binary file - system) - (error "bootstrap binary not found" - file system)))) + (run-with-store store + (origin->derivation (bootstrap-executable file system) + system))) (let* ((tar (->store "tar")) (xz (->store "xz")) @@ -312,14 +389,16 @@ $out/bin/guile -c ~s $out ~a # Sanity check. $out/bin/guile --version~%" - mkdir xz tar + (derivation->output-path mkdir) + (derivation->output-path xz) + (derivation->output-path tar) (format #f "~s" make-guile-wrapper) - bash) - (list mkdir xz tar bash)))) + (derivation->output-path bash))))) (derivation store name - bash `(,builder) + (derivation->output-path bash) `(,builder) #:system system - #:inputs `((,bash) (,builder) (,guile)) + #:inputs `((,bash) (,mkdir) (,tar) (,xz) + (,builder) (,guile)) #:env-vars `(("GUILE_TARBALL" . ,(derivation->output-path guile)))))) @@ -486,8 +565,8 @@ $out/bin/guile --version~%" #t)))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin (method url-fetch) @@ -570,9 +649,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (chmod "gcc" #o555) #t)))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("bash" ,(search-bootstrap-binary "bash" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) + ("bash" ,(bootstrap-executable "bash" (%current-system))) ("libc" ,%bootstrap-glibc) ("tarball" ,(bootstrap-origin (origin @@ -644,8 +723,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (invoke tar "xvf" (string-append builddir "/binaries.tar")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin @@ -693,8 +772,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (invoke tar "xvf" (string-append builddir "/binaries.tar")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index c1341628a8..ac269083c8 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -29,7 +29,7 @@ #:use-module (guix search-paths) #:use-module (guix build utils) #:use-module (guix monads) - #:use-module ((guix gexp) #:select (lower-inputs)) + #:use-module ((guix gexp) #:select (lower-object)) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (gnu build linux-container) @@ -40,7 +40,8 @@ #:use-module (gnu packages bash) #:use-module (gnu packages commencement) #:use-module (gnu packages guile) - #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile)) + #:use-module ((gnu packages bootstrap) + #:select (bootstrap-executable %bootstrap-guile)) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -600,8 +601,7 @@ Otherwise, return the derivation for the Bash package." (package->derivation bash)) ;; Use the bootstrap Bash instead. ((and container? bootstrap?) - (interned-file - (search-bootstrap-binary "bash" system))) + (lower-object (bootstrap-executable "bash" system))) (else (return #f))))) @@ -730,7 +730,7 @@ message if any test fails." (container? (let ((bash-binary (if bootstrap? - bash + (derivation->output-path bash) (string-append (derivation->output-path bash) "/bin/sh")))) (launch-environment/container #:command command diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index ceee589b2e..5172345e5a 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -36,6 +36,7 @@ gnu/installer/steps.scm gnu/installer/timezone.scm gnu/installer/user.scm gnu/installer/utils.scm +gnu/packages/bootstrap.scm guix/scripts.scm guix/scripts/build.scm guix/discovery.scm -- cgit v1.2.3 From 03d76577b96ba81c9921eb3a297d42db8644280b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2019 21:26:22 +0200 Subject: tests: Make builds less expensive. The switch to the reduced bootstrap broke build time assumptions made by tests, notably the assumption that GNU-MAKE-BOOT0 was cheap to build. This commit adjusts this to make these tests cheaper. * gnu/packages/bootstrap.scm (%bootstrap-inputs-for-tests): New variable. * guix/tests.scm (gnu-make-for-tests): New variable. * tests/guix-environment.sh: Use GNU-MAKE-FOR-TESTS instead of GNU-MAKE-BOOT0. Remove test with FINDUTILS-BOOT0. * tests/guix-package-net.sh (boot_make): Use GNU-MAKE-FOR-TESTS. * tests/packages.scm ("GNU Make, bootstrap"): Likewise. * tests/profiles.scm ("profile-derivation relative symlinks, two entries"): Likewise. * tests/union.scm (%bootstrap-inputs): Remove. ("union-build"): Use %BOOTSTRAP-INPUTS-FOR-TESTS instead of %BOOTSTRAP-INPUTS. --- gnu/packages/bootstrap.scm | 14 +++++++++++++- guix/tests.scm | 33 ++++++++++++++++++++++++++++++++- tests/guix-environment.sh | 27 ++++++--------------------- tests/guix-package-net.sh | 2 +- tests/packages.scm | 6 +++--- tests/profiles.scm | 7 +++---- tests/union.scm | 9 +++------ 7 files changed, 61 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 255141ae87..c78aaa33d0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -53,7 +53,9 @@ %bootstrap-glibc %bootstrap-inputs %bootstrap-mescc-tools - %bootstrap-mes)) + %bootstrap-mes + + %bootstrap-inputs-for-tests)) ;;; Commentary: ;;; @@ -809,4 +811,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ;; In gnu-build-system.scm, we rely on the availability of Bash. ("bash" ,%bootstrap-coreutils&co))) +(define %bootstrap-inputs-for-tests + ;; These are bootstrap inputs that are cheap to produce (no compilation + ;; needed) and that are meant to be used for testing. (These are those we + ;; used before the Mes-based reduced bootstrap.) + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils) + ("coreutils&co" ,%bootstrap-coreutils&co) + ("bash" ,%bootstrap-coreutils&co))) + ;;; bootstrap.scm ends here diff --git a/guix/tests.scm b/guix/tests.scm index 66d60e964e..9df6353798 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -23,8 +23,10 @@ #:use-module (guix packages) #:use-module (guix base32) #:use-module (guix serialization) + #:use-module ((guix utils) #:select (substitute-keyword-arguments)) #:use-module (gcrypt hash) #:use-module (guix build-system gnu) + #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) @@ -50,7 +52,9 @@ with-derivation-narinfo with-derivation-substitute dummy-package - dummy-origin)) + dummy-origin + + gnu-make-for-tests)) ;;; Commentary: ;;; @@ -364,6 +368,33 @@ default values, and with EXTRA-FIELDS set as specified." (sha256 (base32 (make-string 52 #\x)))))) (origin (inherit o) extra-fields ...))) +(define gnu-make-for-tests + ;; This is a variant of 'gnu-make-boot0' that can be built with minimal + ;; resources. + (package-with-bootstrap-guile + (package + (inherit gnu-make) + (name "make-test-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + #:tests? #f ;cannot run "make check" + ,@(substitute-keyword-arguments (package-arguments gnu-make) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda _ + (invoke "./build.sh") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin) + #t)))))))) + (native-inputs '()) ;no need for 'pkg-config' + (inputs %bootstrap-inputs-for-tests)))) + ;; Local Variables: ;; eval: (put 'call-with-derivation-narinfo 'scheme-indent-function 1) ;; eval: (put 'call-with-derivation-substitute 'scheme-indent-function 2) diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index a670db36be..fb1c1a022d 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -156,7 +156,7 @@ if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null then # Compute the build environment for the initial GNU Make. guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' > "$tmpdir/a" + -e '(@ (guix tests) gnu-make-for-tests)' > "$tmpdir/a" # Make sure bootstrap binaries are in the profile. profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` @@ -177,30 +177,15 @@ then # Make sure that the shell spawned with '--exec' sees the same environment # as returned by '--search-paths'. guix environment --bootstrap --no-substitutes --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' \ + -e '(@ (guix tests) gnu-make-for-tests)' \ -- /bin/sh -c 'echo $PATH $CPATH $LIBRARY_PATH' > "$tmpdir/b" ( . "$tmpdir/a" ; echo $PATH $CPATH $LIBRARY_PATH ) > "$tmpdir/c" cmp "$tmpdir/b" "$tmpdir/c" rm "$tmpdir"/* - # Compute the build environment for the initial GNU Findutils. - guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) findutils-boot0)' > "$tmpdir/a" - profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` - - # Make sure the bootstrap binaries are all listed where they belong. - grep -E "^export PATH=\"$profile/bin\"" "$tmpdir/a" - grep -E "^export CPATH=\"$profile/include\"" "$tmpdir/a" - grep -E "^export LIBRARY_PATH=\"$profile/lib\"" "$tmpdir/a" - for dep in bootstrap-binaries-0 gcc-bootstrap-0 glibc-bootstrap-0 \ - make-boot0 - do - guix gc --references "$profile" | grep "$dep" - done - # The following test assumes 'make-boot0' has a "debug" output. - make_boot0_debug="`guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' | grep -e -debug`" + make_boot0_debug="`guix build -e '(@ (guix tests) gnu-make-for-tests)' | grep -e -debug`" test "x$make_boot0_debug" != "x" # Make sure the "debug" output is not listed. @@ -210,7 +195,7 @@ then # Compute the build environment for the initial GNU Make, but add in the # bootstrap Guile as an ad-hoc addition. guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' \ + -e '(@ (guix tests) gnu-make-for-tests)' \ --ad-hoc guile-bootstrap > "$tmpdir/a" profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` @@ -227,14 +212,14 @@ then # Make sure a package list with plain package objects and package+output # tuples can be used with -e. expr_list_test_code=" -(list (@@ (gnu packages commencement) gnu-make-boot0) +(list (@ (guix tests) gnu-make-for-tests) (list (@ (gnu packages bootstrap) %bootstrap-guile) \"out\"))" guix environment --bootstrap --ad-hoc --no-substitutes --search-paths \ --pure -e "$expr_list_test_code" > "$tmpdir/a" profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` - for dep in make-boot0 guile-bootstrap + for dep in make-test-boot0 guile-bootstrap do guix gc --references "$profile" | grep "$dep" done diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh index 82c346dd4c..48a94865e1 100644 --- a/tests/guix-package-net.sh +++ b/tests/guix-package-net.sh @@ -57,7 +57,7 @@ test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" -boot_make="(@@ (gnu packages commencement) gnu-make-boot0)" +boot_make="(@ (guix tests) gnu-make-for-tests)" boot_make_drv="`guix build -e "$boot_make" | grep -v -e -debug`" guix package --bootstrap -p "$profile" -i "$boot_make_drv" test -L "$profile-2-link" diff --git a/tests/packages.scm b/tests/packages.scm index af1f76e36d..bd100bea5b 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -935,9 +935,9 @@ (when (or (not (network-reachable?)) (shebang-too-long?)) (test-skip 1)) (test-assert "GNU Make, bootstrap" - ;; GNU Make is the first program built during bootstrap; we choose it - ;; here so that the test doesn't last for too long. - (let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0))) + ;; GNU-MAKE-FOR-TESTS can be built cheaply; we choose it here so that the + ;; test doesn't last for too long. + (let ((gnu-make gnu-make-for-tests)) (and (package? gnu-make) (or (location? (package-location gnu-make)) (not (package-location gnu-make))) diff --git a/tests/profiles.scm b/tests/profiles.scm index eef93e24cf..a4e28672b5 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -239,11 +239,10 @@ (unless (network-reachable?) (test-skip 1)) (test-assertm "profile-derivation relative symlinks, two entries" (mlet* %store-monad - ((gnu-make-boot0 -> (@@ (gnu packages commencement) gnu-make-boot0)) - (manifest -> (packages->manifest - (list %bootstrap-guile gnu-make-boot0))) + ((manifest -> (packages->manifest + (list %bootstrap-guile gnu-make-for-tests))) (guile (package->derivation %bootstrap-guile)) - (make (package->derivation gnu-make-boot0)) + (make (package->derivation gnu-make-for-tests)) (drv (profile-derivation manifest #:relative-symlinks? #t #:hooks '() diff --git a/tests/union.scm b/tests/union.scm index 091895ff8e..a8387edf42 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -32,9 +32,6 @@ #:use-module (rnrs io ports) #:use-module (ice-9 match)) -(define %bootstrap-inputs - (@@ (gnu packages commencement) %bootstrap-inputs+toolchain)) - ;; Exercise the (guix build union) module. (define %store @@ -99,8 +96,8 @@ ;; Purposefully leave duplicate entries. (filter (compose package? cadr) - (append (%bootstrap-inputs) - (take (%bootstrap-inputs) 3))))) + (append %bootstrap-inputs-for-tests + (take %bootstrap-inputs-for-tests 3))))) (builder `(begin (use-modules (guix build union)) (union-build (assoc-ref %outputs "out") -- cgit v1.2.3 From 1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2019 21:35:08 +0200 Subject: packages: Remove 'search-bootstrap-binary'. * gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary): Remove. * gnu/packages/bootstrap.scm (bootstrap-executable): Export. * guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary): Export. * tests/derivations.scm: Remove (gnu packages) import. * tests/grafts.scm: Likewise. * tests/guix-daemon.sh: Likewise. --- gnu/packages.scm | 25 +------------------------ gnu/packages/bootstrap.scm | 1 + guix/tests.scm | 35 +++++++++++++++++++++++++++++++++++ tests/derivations.scm | 1 - tests/grafts.scm | 3 +-- tests/guix-daemon.sh | 4 ++-- 6 files changed, 40 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages.scm b/gnu/packages.scm index 4742f49405..2d7622d397 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -46,10 +46,8 @@ #:export (search-patch search-patches search-auxiliary-file - search-bootstrap-binary %patch-path %auxiliary-files-path - %bootstrap-binaries-path %package-module-path %default-package-module-path @@ -75,18 +73,13 @@ ;;; ;;; Code: -;; By default, we store patches, auxiliary files and bootstrap binaries +;; By default, we store patches and auxiliary files ;; alongside Guile modules. This is so that these extra files can be ;; found without requiring a special setup, such as a specific ;; installation directory and an extra environment variable. One ;; advantage of this setup is that everything just works in an ;; auto-compilation setting. -(define %bootstrap-binaries-path - (make-parameter - (map (cut string-append <> "/gnu/packages/bootstrap") - %load-path))) - (define %auxiliary-files-path (make-parameter (map (cut string-append <> "/gnu/packages/aux-files") @@ -108,22 +101,6 @@ FILE-NAME found in %PATCH-PATH." (list (search-patch file-name) ...)) -(define (search-bootstrap-binary file-name system) - "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not -found." - ;; On x86_64 always use the i686 binaries. - (let ((system (match system - ("x86_64-linux" "i686-linux") - (_ system)))) - (or (search-path (%bootstrap-binaries-path) - (string-append system "/" file-name)) - (raise (condition - (&message - (message - (format #f (G_ "could not find bootstrap binary '~a' \ -for system '~a'") - file-name system)))))))) - (define %distro-root-directory ;; Absolute file name of the module hierarchy. Since (gnu packages …) might ;; live in a directory different from (guix), try to get the best match. diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c78aaa33d0..428a89e927 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -43,6 +43,7 @@ package-with-bootstrap-guile glibc-dynamic-linker + bootstrap-executable bootstrap-guile-origin %bootstrap-guile diff --git a/guix/tests.scm b/guix/tests.scm index 9df6353798..ff31bcad44 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -23,14 +23,18 @@ #:use-module (guix packages) #:use-module (guix base32) #:use-module (guix serialization) + #:use-module (guix monads) #:use-module ((guix utils) #:select (substitute-keyword-arguments)) + #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (gcrypt hash) #:use-module (guix build-system gnu) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) #:use-module (rnrs bytevectors) + #:use-module (ice-9 match) #:use-module (ice-9 binary-ports) #:use-module (web uri) #:export (open-connection-for-tests @@ -44,6 +48,8 @@ shebang-too-long? with-environment-variable + search-bootstrap-binary + mock %test-substitute-urls test-assertm @@ -87,6 +93,35 @@ store))) +(define (bootstrap-binary-file program system) + "Return the absolute file name where bootstrap binary PROGRAM for SYSTEM is +stored." + (string-append (dirname (search-path %load-path + "gnu/packages/bootstrap.scm")) + "/bootstrap/" system "/" program)) + +(define (search-bootstrap-binary file-name system) + "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not +found." + ;; Note: Keep bootstrap binaries on the local file system so that the 'guix' + ;; package can provide them as inputs and copy them to the right place. + (let* ((system (match system + ("x86_64-linux" "i686-linux") + (_ system))) + (file (bootstrap-binary-file file-name system))) + (if (file-exists? file) + file + (with-store store + (run-with-store store + (mlet %store-monad ((drv (origin->derivation + (bootstrap-executable file-name system)))) + (mbegin %store-monad + (built-derivations (list drv)) + (begin + (mkdir-p (dirname file)) + (copy-file (derivation->output-path drv) file) + (return file))))))))) + (define (call-with-external-store proc) "Call PROC with an open connection to the external store or #f it there is no external store to talk to." diff --git a/tests/derivations.scm b/tests/derivations.scm index c421d094a4..25ba4c9fa0 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -29,7 +29,6 @@ #:use-module (guix tests http) #:use-module ((guix packages) #:select (package-derivation base32)) #:use-module ((guix build utils) #:select (executable-file?)) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module ((gnu packages guile) #:select (guile-1.8)) #:use-module (srfi srfi-1) diff --git a/tests/grafts.scm b/tests/grafts.scm index f85f3c6913..e5356decc5 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +24,6 @@ #:use-module (guix utils) #:use-module (guix grafts) #:use-module (guix tests) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index ce82cfd1e6..ca46e34ce9 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -141,7 +141,7 @@ daemon_pid=$! GUIX_DAEMON_SOCKET="$socket" \ guile -c ' - (use-modules (guix) (gnu packages) (guix tests)) + (use-modules (guix) (guix tests)) (with-store store (let* ((build (add-text-to-store store "build.sh" @@ -165,7 +165,7 @@ kill "$daemon_pid" # honored. client_code=' - (use-modules (guix) (gnu packages) (guix tests) (srfi srfi-34)) + (use-modules (guix) (guix tests) (srfi srfi-34)) (with-store store (let* ((build (add-text-to-store store "build.sh" -- cgit v1.2.3 From 92d00ca4661e186022732a47956a2bc0ef16be96 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2019 21:53:25 +0200 Subject: build: Remove 'gnu/packages/bootstrap' and its binaries. * gnu/local.mk (bootstrapdir, bootstrap_i686_linuxdir) (bootstrap_armhf_linuxdir, bootstrap_aarch64_linuxdir) (bootstrap_mips64el_linuxdir, dist_bootstrap_i686_linux_DATA) (dist_bootstrap_armhf_linux_DATA, dist_bootstrap_aarch64_linux_DATA) (dist_bootstrap_mips64el_linux_DATA): Remove. (set-bootstrap-executable-permissions): Remove target. * Makefile.am (install-data-hook): Remove dependency on 'set-bootstrap-executable-permissions'. * gnu/packages/bootstrap: Remove directory. * tests/search-paths.scm ("evaluate-search-paths, separator is #f"): Adjust to match .../aux-files/linux-libre. --- .gitignore | 1 + Makefile.am | 2 +- gnu/local.mk | 35 ---------------------------- gnu/packages/bootstrap/aarch64-linux/bash | Bin 1162056 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/mkdir | Bin 558216 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/tar | Bin 1085128 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/xz | Bin 738576 -> 0 bytes gnu/packages/bootstrap/armhf-linux/bash | Bin 802224 -> 0 bytes gnu/packages/bootstrap/armhf-linux/mkdir | Bin 401544 -> 0 bytes gnu/packages/bootstrap/armhf-linux/tar | Bin 755356 -> 0 bytes gnu/packages/bootstrap/armhf-linux/xz | Bin 502884 -> 0 bytes gnu/packages/bootstrap/i686-linux/bash | Bin 1351732 -> 0 bytes gnu/packages/bootstrap/i686-linux/mkdir | Bin 714316 -> 0 bytes gnu/packages/bootstrap/i686-linux/tar | Bin 1285420 -> 0 bytes gnu/packages/bootstrap/i686-linux/xz | Bin 861836 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/bash | Bin 1409080 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/mkdir | Bin 698500 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/tar | Bin 1283708 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/xz | Bin 851736 -> 0 bytes tests/search-paths.scm | 8 +++---- 20 files changed, 6 insertions(+), 40 deletions(-) delete mode 100755 gnu/packages/bootstrap/aarch64-linux/bash delete mode 100755 gnu/packages/bootstrap/aarch64-linux/mkdir delete mode 100755 gnu/packages/bootstrap/aarch64-linux/tar delete mode 100755 gnu/packages/bootstrap/aarch64-linux/xz delete mode 100755 gnu/packages/bootstrap/armhf-linux/bash delete mode 100755 gnu/packages/bootstrap/armhf-linux/mkdir delete mode 100755 gnu/packages/bootstrap/armhf-linux/tar delete mode 100755 gnu/packages/bootstrap/armhf-linux/xz delete mode 100755 gnu/packages/bootstrap/i686-linux/bash delete mode 100755 gnu/packages/bootstrap/i686-linux/mkdir delete mode 100755 gnu/packages/bootstrap/i686-linux/tar delete mode 100755 gnu/packages/bootstrap/i686-linux/xz delete mode 100755 gnu/packages/bootstrap/mips64el-linux/bash delete mode 100755 gnu/packages/bootstrap/mips64el-linux/mkdir delete mode 100755 gnu/packages/bootstrap/mips64el-linux/tar delete mode 100755 gnu/packages/bootstrap/mips64el-linux/xz (limited to 'gnu/packages') diff --git a/.gitignore b/.gitignore index 93d2ec9801..aa374b54b9 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ tmp /etc/indent-code.el /.version /doc/stamp-[0-9] +/gnu/packages/bootstrap diff --git a/Makefile.am b/Makefile.am index 80be73e4bf..ec1e0285ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -589,7 +589,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA # The above trick doesn't work for 'config.go' because both 'config.scm' and # 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it # special treatment. -install-data-hook: set-bootstrap-executable-permissions +install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" # Assuming Guix is already installed and the daemon is up and running, this diff --git a/gnu/local.mk b/gnu/local.mk index b92f82e7cb..0ba0d1f194 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,38 +1385,3 @@ dist_patch_DATA = \ MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in - -bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap -bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux -bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux -bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux -bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux - -dist_bootstrap_i686_linux_DATA = \ - %D%/packages/bootstrap/i686-linux/bash \ - %D%/packages/bootstrap/i686-linux/mkdir \ - %D%/packages/bootstrap/i686-linux/tar \ - %D%/packages/bootstrap/i686-linux/xz - -dist_bootstrap_armhf_linux_DATA = \ - %D%/packages/bootstrap/armhf-linux/bash \ - %D%/packages/bootstrap/armhf-linux/mkdir \ - %D%/packages/bootstrap/armhf-linux/tar \ - %D%/packages/bootstrap/armhf-linux/xz - -dist_bootstrap_aarch64_linux_DATA = \ - %D%/packages/bootstrap/aarch64-linux/bash \ - %D%/packages/bootstrap/aarch64-linux/mkdir \ - %D%/packages/bootstrap/aarch64-linux/tar \ - %D%/packages/bootstrap/aarch64-linux/xz - -dist_bootstrap_mips64el_linux_DATA = \ - %D%/packages/bootstrap/mips64el-linux/bash \ - %D%/packages/bootstrap/mips64el-linux/mkdir \ - %D%/packages/bootstrap/mips64el-linux/tar \ - %D%/packages/bootstrap/mips64el-linux/xz - -# Those files must remain executable, so they remain executable once -# imported into the store. -set-bootstrap-executable-permissions: - chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} diff --git a/gnu/packages/bootstrap/aarch64-linux/bash b/gnu/packages/bootstrap/aarch64-linux/bash deleted file mode 100755 index 0bfb9d1824..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/mkdir b/gnu/packages/bootstrap/aarch64-linux/mkdir deleted file mode 100755 index 35cd1815fd..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/tar b/gnu/packages/bootstrap/aarch64-linux/tar deleted file mode 100755 index 7e68edb0be..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/xz b/gnu/packages/bootstrap/aarch64-linux/xz deleted file mode 100755 index 5aa18c9234..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/bash b/gnu/packages/bootstrap/armhf-linux/bash deleted file mode 100755 index 212a22c8ce..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/mkdir b/gnu/packages/bootstrap/armhf-linux/mkdir deleted file mode 100755 index c3e5246e92..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/tar b/gnu/packages/bootstrap/armhf-linux/tar deleted file mode 100755 index 5a6aac8a58..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/xz b/gnu/packages/bootstrap/armhf-linux/xz deleted file mode 100755 index a77aebc268..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/bash b/gnu/packages/bootstrap/i686-linux/bash deleted file mode 100755 index 4b99d7eb4a..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/mkdir b/gnu/packages/bootstrap/i686-linux/mkdir deleted file mode 100755 index 6623a38404..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/tar b/gnu/packages/bootstrap/i686-linux/tar deleted file mode 100755 index d33cd391f1..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/xz b/gnu/packages/bootstrap/i686-linux/xz deleted file mode 100755 index f94dbde77c..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/bash b/gnu/packages/bootstrap/mips64el-linux/bash deleted file mode 100755 index 403671d2fa..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/mkdir b/gnu/packages/bootstrap/mips64el-linux/mkdir deleted file mode 100755 index c8d3285b38..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/tar b/gnu/packages/bootstrap/mips64el-linux/tar deleted file mode 100755 index 0cdf7cce2c..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/xz b/gnu/packages/bootstrap/mips64el-linux/xz deleted file mode 100755 index b0622ba946..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/xz and /dev/null differ diff --git a/tests/search-paths.scm b/tests/search-paths.scm index 8dad424415..767a80b76c 100644 --- a/tests/search-paths.scm +++ b/tests/search-paths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,17 +29,17 @@ (test-equal "evaluate-search-paths, separator is #f" (string-append %top-srcdir - "/gnu/packages/bootstrap/aarch64-linux") + "/gnu/packages/aux-files/linux-libre") ;; The following search path spec should evaluate to a single item: the ;; first directory that matches the "-linux$" pattern in ;; gnu/packages/bootstrap. (let ((spec (search-path-specification (variable "CHBOUIB") - (files '("gnu/packages/bootstrap")) + (files '("gnu/packages/aux-files")) (file-type 'directory) (separator #f) - (file-pattern "-linux$")))) + (file-pattern "^linux")))) (match (evaluate-search-paths (list spec) (list %top-srcdir)) (((spec* . value)) -- cgit v1.2.3 From 4bf8500384fe29d511007444cb6edb7aeeba6c91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 15 Jun 2019 15:14:06 +0200 Subject: gnu: libcap: Update to 2.27. * gnu/packages/linux.scm (libcap): Update to 2.27. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 15473b06bd..eeb3a0a3e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1537,7 +1537,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) (uri (string-append @@ -1545,7 +1545,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) + "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fefa75f39898bda746bf8119104ab42571ec10f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Jun 2019 18:07:20 +0200 Subject: gnu: freetype: Update to 2.10.0. * gnu/packages/fontutils.scm (freetype): Update to 2.10.0. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 820dd6f666..cddd067517 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -57,13 +57,13 @@ (define-public freetype (package (name "freetype") - (version "2.9.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) + "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From 2489acc9bd1b23f989eca2612cabf95d48d3f17b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:54:20 +0200 Subject: gnu: CMake: Update to 3.14.5. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.5. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e77c97e11f..8a0bba2e8f 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.4") + (version "3.14.5") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1n9nzxq1dzbpa0pisdv7g57a8qr9b7n35vbfy489s1v602dxrd00")) + "01lcl6ynxfgqn09ncfz1gr24ha5pv1slk0azzaawaqrwpsgf8njh")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 755e81aba157b720b2c9d32100adb239cd96b5ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:54:48 +0200 Subject: gnu: curl: Update to 7.65.1. * gnu/packages/curl.scm (curl): Update to 7.65.1. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 6d1ab81d07..8605c12124 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.0") + (version "7.65.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) + "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From 731d471a37bf23326ae3e042bb384f376f6fec99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:55:35 +0200 Subject: gnu: harfbuzz: Update to 2.5.1. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.1. [source]: Update source file name. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4fb7d3579b..a8bc2e42ce 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,15 +178,15 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.4.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" "harfbuzz/release/harfbuzz-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "0vrkvdlmihdg62a4c6h5kx27khc33xmb95l50zgnwnavvpwyyw5l")))) + "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 7892edc256e9f94acad57f698622b48dc741385f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:56:33 +0200 Subject: gnu: GnuTLS: Update to 3.6.8. * gnu/packages/tls.scm (gnutls): Update to 3.6.8. [arguments]: Add "--with-guile-{site,site-ccache,extension-dir}" to #:configure-flags. --- gnu/packages/tls.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index eb853da1bf..912069c26d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -161,7 +161,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.6") + (version "3.6.8") (source (origin (method url-fetch) (uri @@ -173,7 +173,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv")))) + "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. @@ -191,6 +191,15 @@ living in the same process.") ;; independently. This seems suboptimal. "--with-default-trust-store-dir=/etc/ssl/certs" + ;; Tell the build system that we want Guile bindings installed to + ;; the output instead of Guiles own module directory. + (string-append "--with-guile-site-dir=" + "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") + (string-append "--with-guile-site-ccache-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache") + (string-append "--with-guile-extension-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions") + ;; FIXME: Temporarily disable p11-kit support since it is not ;; working on mips64el. "--without-p11-kit") -- cgit v1.2.3 From e2083575d7857d18b1ab00ae380987cbed278eab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:57:37 +0200 Subject: gnu: nghttp2: Update to 1.39.1. * gnu/packages/web.scm (nghttp2): Update to 1.39.1. --- 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 6ddeb48d2c..695552c3e2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6313,7 +6313,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.38.0") + (version "1.39.1") (source (origin (method url-fetch) @@ -6322,7 +6322,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1y47xsg7nbfwqx77rc5phi5rh6j8l1x3k9ig6yscchc2hmhwfxgg")))) + "0j0lk37k8k3f61r9nw647hg4b22z1753l36n3xrp9x01civ614b7")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 549f4091c15568015fafa03ab04a37db5679edea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:58:57 +0200 Subject: gnu: libarchive: Update to 3.4.0. * gnu/packages/patches/libarchive-CVE-2018-1000877.patch, gnu/packages/patches/libarchive-CVE-2018-1000878.patch, gnu/packages/patches/libarchive-CVE-2018-1000880.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/backup.scm (libarchive): Update to 3.4.0. [source](uri): Add alternative download location. [source](patches): Remove. --- gnu/local.mk | 3 - gnu/packages/backup.scm | 14 ++-- .../patches/libarchive-CVE-2018-1000877.patch | 45 ----------- .../patches/libarchive-CVE-2018-1000878.patch | 86 ---------------------- .../patches/libarchive-CVE-2018-1000880.patch | 51 ------------- 5 files changed, 7 insertions(+), 192 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000877.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000878.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000880.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0ba0d1f194..7c68b40976 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -982,9 +982,6 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000877.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000878.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000880.patch \ %D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f62c5c3c00..beb3b09077 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -197,18 +197,18 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (version "3.3.3") + (version "3.4.0") (source (origin (method url-fetch) - (uri (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2018-1000877.patch" - "libarchive-CVE-2018-1000878.patch" - "libarchive-CVE-2018-1000880.patch")) + (uri (list (string-append "https://libarchive.org/downloads/libarchive-" + version ".tar.gz") + (string-append "https://github.com/libarchive/libarchive" + "/releases/download/v" version "/libarchive-" + version ".tar.gz"))) (sha256 (base32 - "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))) + "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000877.patch b/gnu/packages/patches/libarchive-CVE-2018-1000877.patch deleted file mode 100644 index 5b68884a0f..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000877.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2018-1000877: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000877 -https://security-tracker.debian.org/tracker/CVE-2018-1000877 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/021efa522ad729ff0f5806c4ce53e4a6cc1daa31 - -From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 20 Nov 2018 17:56:29 +1100 -Subject: [PATCH] Avoid a double-free when a window size of 0 is specified - -new_size can be 0 with a malicious or corrupted RAR archive. - -realloc(area, 0) is equivalent to free(area), so the region would -be free()d here and the free()d again in the cleanup function. - -Found with a setup running AFL, afl-rb, and qsym. ---- - libarchive/archive_read_support_format_rar.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 23452222..6f419c27 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a) - new_size = DICTIONARY_MAX_SIZE; - else - new_size = rar_fls((unsigned int)rar->unp_size) << 1; -+ if (new_size == 0) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Zero window size is invalid."); -+ return (ARCHIVE_FATAL); -+ } - new_window = realloc(rar->lzss.window, new_size); - if (new_window == NULL) { - archive_set_error(&a->archive, ENOMEM, --- -2.20.1 - diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000878.patch b/gnu/packages/patches/libarchive-CVE-2018-1000878.patch deleted file mode 100644 index fef0881320..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000878.patch +++ /dev/null @@ -1,86 +0,0 @@ -Fix CVE-2018-1000878: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000878 -https://security-tracker.debian.org/tracker/CVE-2018-1000878 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 - -From bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 00:55:22 +1100 -Subject: [PATCH] rar: file split across multi-part archives must match - -Fuzzing uncovered some UAF and memory overrun bugs where a file in a -single file archive reported that it was split across multiple -volumes. This was caused by ppmd7 operations calling -rar_br_fillup. This would invoke rar_read_ahead, which would in some -situations invoke archive_read_format_rar_read_header. That would -check the new file name against the old file name, and if they didn't -match up it would free the ppmd7 buffer and allocate a new -one. However, because the ppmd7 decoder wasn't actually done with the -buffer, it would continue to used the freed buffer. Both reads and -writes to the freed region can be observed. - -This is quite tricky to solve: once the buffer has been freed it is -too late, as the ppmd7 decoder functions almost universally assume -success - there's no way for ppmd_read to signal error, nor are there -good ways for functions like Range_Normalise to propagate them. So we -can't detect after the fact that we're in an invalid state - e.g. by -checking rar->cursor, we have to prevent ourselves from ever ending up -there. So, when we are in the dangerous part or rar_read_ahead that -assumes a valid split, we set a flag force read_header to either go -down the path for split files or bail. This means that the ppmd7 -decoder keeps a valid buffer and just runs out of data. - -Found with a combination of AFL, afl-rb and qsym. ---- - libarchive/archive_read_support_format_rar.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 6f419c27..a8cc5c94 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -258,6 +258,7 @@ struct rar - struct data_block_offsets *dbo; - unsigned int cursor; - unsigned int nodes; -+ char filename_must_match; - - /* LZSS members */ - struct huffman_code maincode; -@@ -1560,6 +1561,12 @@ read_header(struct archive_read *a, struct archive_entry *entry, - } - return ret; - } -+ else if (rar->filename_must_match) -+ { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mismatch of file parts split across multi-volume archive"); -+ return (ARCHIVE_FATAL); -+ } - - rar->filename_save = (char*)realloc(rar->filename_save, - filename_size + 1); -@@ -2933,12 +2940,14 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail) - else if (*avail == 0 && rar->main_flags & MHD_VOLUME && - rar->file_flags & FHD_SPLIT_AFTER) - { -+ rar->filename_must_match = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - if (ret == (ARCHIVE_EOF)) - { - rar->has_endarc_header = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - } -+ rar->filename_must_match = 0; - if (ret != (ARCHIVE_OK)) - return NULL; - return rar_read_ahead(a, min, avail); --- -2.20.1 - diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000880.patch b/gnu/packages/patches/libarchive-CVE-2018-1000880.patch deleted file mode 100644 index 6834cabda0..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000880.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fix CVE-2018-1000880: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000880 -https://security-tracker.debian.org/tracker/CVE-2018-1000880 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/9c84b7426660c09c18cc349f6d70b5f8168b5680 - -From 9c84b7426660c09c18cc349f6d70b5f8168b5680 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 16:33:42 +1100 -Subject: [PATCH] warc: consume data once read - -The warc decoder only used read ahead, it wouldn't actually consume -data that had previously been printed. This means that if you specify -an invalid content length, it will just reprint the same data over -and over and over again until it hits the desired length. - -This means that a WARC resource with e.g. -Content-Length: 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666665 -but only a few hundred bytes of data, causes a quasi-infinite loop. - -Consume data in subsequent calls to _warc_read. - -Found with an AFL + afl-rb + qsym setup. ---- - libarchive/archive_read_support_format_warc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c -index e8753853..e8fc8428 100644 ---- a/libarchive/archive_read_support_format_warc.c -+++ b/libarchive/archive_read_support_format_warc.c -@@ -386,6 +386,11 @@ _warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off) - return (ARCHIVE_EOF); - } - -+ if (w->unconsumed) { -+ __archive_read_consume(a, w->unconsumed); -+ w->unconsumed = 0U; -+ } -+ - rab = __archive_read_ahead(a, 1U, &nrd); - if (nrd < 0) { - *bsz = 0U; --- -2.20.1 - -- cgit v1.2.3 From e9b27c70e3b4bca441d5c2d9f5b743da3cce182a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 22:54:52 +0200 Subject: gnu: texlive-bin: Remove GCC5 workaround. * gnu/packages/tex.scm (texlive-bin)[arguments]: Remove "CXXFLAGS" from #:configure-flags. --- gnu/packages/tex.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 765eaf4be4..e28b36fd98 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -153,9 +153,6 @@ `(#:out-of-source? #t #:configure-flags `("--disable-native-texlive-build" - ;; XXX: This is needed because recent Poppler requires C++11 or later. - ;; Remove after switch to GCC >= 6. - "CXXFLAGS=-std=gnu++11" "--with-system-cairo" "--with-system-freetype2" "--with-system-gd" -- cgit v1.2.3 From 1a753d5673b7613727177cb1d3b4c7e343534545 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Jun 2019 12:31:49 +0200 Subject: gnu: poppler: Update to 0.77.0. * gnu/packages/patches/inkscape-poppler-0.76.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/inkscape.scm (inkscape)[source](patches): New field. * gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Add two new hunks. * gnu/packages/pdf.scm (poppler): Update to 0.77.0. * gnu/packages/tex.scm (texlive-bin)[source]: Update Arch patches. [arguments]: Adjust accordingly. * gnu/packages/scribus.scm (scribus)[source](patches): Add two new origins. --- gnu/local.mk | 1 + gnu/packages/inkscape.scm | 1 + gnu/packages/patches/inkscape-poppler-0.76.patch | 36 ++++++++++++++++++++++ .../texlive-bin-luatex-poppler-compat.patch | 34 ++++++++++++++++++++ gnu/packages/pdf.scm | 4 +-- gnu/packages/scribus.scm | 29 +++++++++++++++-- gnu/packages/tex.scm | 10 +++--- 7 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/inkscape-poppler-0.76.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 7c68b40976..2a6908d4bb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -938,6 +938,7 @@ dist_patch_DATA = \ %D%/packages/patches/idris-test-no-node.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inkscape-poppler-compat3.patch \ + %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index a2c6778b57..1ad23a92d4 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -52,6 +52,7 @@ (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.bz2")) + (patches (search-patches "inkscape-poppler-0.76.patch")) (sha256 (base32 "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p")))) diff --git a/gnu/packages/patches/inkscape-poppler-0.76.patch b/gnu/packages/patches/inkscape-poppler-0.76.patch new file mode 100644 index 0000000000..08e8303892 --- /dev/null +++ b/gnu/packages/patches/inkscape-poppler-0.76.patch @@ -0,0 +1,36 @@ +This patch adds support for Poppler 0.76 and later. + +Taken from upstream: + + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 8484984bdf..4f798e35bf 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new _POPPLER_NEW_PARSER(xref, obj); + go(topLevel); + delete parser; + parser = nullptr; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 61a15083a0..5e8bc4ae90 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -14,6 +14,13 @@ + + #include + ++#if POPPLER_CHECK_VERSION(0, 76, 0) ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) ++#else ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch index df6121c6e1..024ff416af 100644 --- a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch +++ b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch @@ -257,3 +257,37 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout = new_StructTreeRoot_userdata(L); uout->d = obj; uout->pc = uin->pc; +--- texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2019-04-24 09:41:05.090522664 +0000 ++++ texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc 2019-04-24 09:43:37.119184926 +0000 +@@ -994,7 +994,8 @@ + pdfdoc_changed_error(L); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); +- i = ((Catalog *) uin->d)->findPage(num, gen); ++ Ref numgen = {num, gen}; ++ i = ((Catalog *) uin->d)->findPage(numgen); + if (i > 0) + lua_pushinteger(L, i); + else +@@ -2596,8 +2597,9 @@ + pdfdoc_changed_error(L); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); ++ Ref numgen = {num, gen}; + if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { +- i = ((PdfDocument *) uin->d)->doc->findPage(num, gen); ++ i = ((PdfDocument *) uin->d)->doc->findPage(numgen); + if (i > 0) + lua_pushinteger(L, i); + else +--- texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w.orig 2019-04-24 09:56:38.406498975 +0000 ++++ texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w 2019-04-24 09:56:57.020081327 +0000 +@@ -630,7 +630,7 @@ + if (link == NULL || !link->isOk()) + formatted_error("pdf inclusion","invalid destination '%s'",img_pagename(idict)); + Ref ref = link->getPageRef(); +- img_pagenum(idict) = catalog->findPage(ref.num, ref.gen); ++ img_pagenum(idict) = catalog->findPage(ref); + if (img_pagenum(idict) == 0) + formatted_error("pdf inclusion","destination is not a page '%s'",img_pagename(idict)); + delete link; diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index eab97a1a52..9cfac6fb9d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -84,14 +84,14 @@ (define-public poppler (package (name "poppler") - (version "0.75.0") + (version "0.77.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "16hr0y3pv66s01bcd4k8xjgd1r038ca9srd06g4wm5r7zaqfvfiv")))) + "0szk09hk8r98ck9cx97nqwrbzdn1q41ic8dq8j1aar6dpi6fnrvj")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 5b770fd696..322a096414 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,9 +98,33 @@ (file-name "scribus-poppler-0.70.patch") (sha256 (base32 - "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))) - + "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr"))) + ;; This and the preceding patch are taken from Arch Linux + ;; because they are adjusted for the Scribus release tarball + ;; rather than the upstream master branch. + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit/" + "community.git/plain/trunk/scribus-" + "poppler-0.75.patch?h=packages/scribus&id=" + "4d35c4ad4869c1dcce9243c4786ff303bdd5c601")) + (file-name "scribus-poppler-0.75.patch") + (sha256 + (base32 + "1lhf2srp7iv44zzdbr3kqa0lfjmm77nalxnx80jqaixhr5yq2s8f"))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/scribusproject/scribus/commit/" + "9449265592a5195153d72c2a511d2010b0cf5b0b.patch")) + (file-name "scribus-poppler-0.76.patch") + (sha256 + (base32 + "0zghiqra9s6f6v06fdr97gdhiw41zr8r6vqh4ar4yw7rqn2771jd")))) (search-patches "scribus-poppler-0.73.patch"))) + ;; The --binary flag is required for 'scribus-poppler-0.75.patch', because + ;; we need to retain the CRLF line endings. + (patch-flags '("-p1" "--binary")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e28b36fd98..10233a05b7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -111,12 +111,12 @@ "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "418dd6f008c3d41a461353fdb60f2d73d87c58ed")) + (arch-revision "c4b99aba97213ea554b6592a4916d3c7394a6d7b")) (append (search-patches "texlive-bin-CVE-2018-17407.patch" "texlive-bin-luatex-poppler-compat.patch") (list - (arch-patch "pdftex-poppler0.75.patch" arch-revision - "1cqpcp7h1qyxyp3wjbpcmx2wgvj9ywpz60hvy280mp9w633yzyg3") + (arch-patch "pdftex-poppler0.76.patch" arch-revision + "15ypbh21amfsdxy7ca825x28lkmmkklxk1w660gpgvzdi7s70h0b") (arch-patch "xetex-poppler-fixes.patch" arch-revision "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) (build-system gnu-build-system) @@ -194,9 +194,9 @@ #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler -- cgit v1.2.3 From e960c20a0613b8e9561385eef67c4427f1ec0296 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Jun 2019 12:41:58 +0200 Subject: gnu: adb: Build against OpenSSL 1.0. * gnu/packages/android.scm (adb)[inputs]: Change OPENSSL to OPENSSL-1.0. --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 7d5de08be9..8ab5377537 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -362,7 +362,7 @@ various Android core host applications.") `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) - ("openssl" ,openssl))) + ("openssl" ,openssl-1.0))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") (description -- cgit v1.2.3 From b70ffe4e949062e37049f1ef3603a98703bd153e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:19:53 +0200 Subject: gnu: jbig2dec: Update to 0.16. * gnu/packages/image.scm (jbig2dec): Update to 0.16. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index eabb6aee41..390b74c333 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -534,15 +534,15 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://github.com/ArtifexSoftware" "/ghostpdl-downloads/releases/download" - "/gs924/" name "-" version ".tar.gz")) + "/gs927/" name "-" version ".tar.gz")) (sha256 (base32 - "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")) + "00h61y7bh3z6mqfzxyb318gyh0f8jwarg4hvlrm83rqps8avzxm4")) (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 3f151d90a3ceb9445305ba84588ea56b802e5ce5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:20:23 +0200 Subject: gnu: ghostscript: Update to 9.27. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.27. [arguments]: Add <#:parallel-tests?>. --- gnu/packages/ghostscript.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index f724fe3ff1..817104cde1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -137,7 +137,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.26") + (version "9.27") (source (origin (method url-fetch) @@ -147,7 +147,7 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1645f47all5w27bfhiq15vycdm954lmr6agqkrp68ksq6xglgvch")) + "06dnj0mxyaryfbwlsjwaqf847w91w2h8f108kxxcc41nrnx1y3zw")) (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -165,6 +165,13 @@ printing, and psresize, for adjusting page sizes.") (outputs '("out" "doc")) ;19 MiB of HTML/PS doc + examples (arguments `(#:disallowed-references ("doc") + ;; XXX: Starting with version 9.27, building the tests in parallel + ;; occasionally fails like this: + ;; In file included from ./base/memory_.h:23:0, + ;; from ./obj/gsmd5.h:1, + ;; from ./obj/gsmd5.c:56: + ;; ./base/std.h:25:10: fatal error: arch.h: No such file or directory + #:parallel-tests? #f #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") -- cgit v1.2.3 From 871dbd6c6e2414353045cf5f5d0045fff945f862 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Jun 2019 19:33:05 +0200 Subject: gnu: cross-base: Fix C++ cross-compilation problems with GCC 7. * gnu/packages/cross-base.scm (cross-gcc-arguments)[#:configure-flags]: Add "--with-sysroot=/". --- gnu/packages/cross-base.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 3d36dc6198..3fc9ba6540 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -121,7 +121,15 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,@(if libc `( ;; Disable libcilkrts because it is not ;; ported to GNU/Hurd. - "--disable-libcilkrts") + "--disable-libcilkrts" + ;; When building a cross compiler, --with-sysroot is + ;; implicitly set to "$gcc_tooldir/sys-root". This does + ;; not work for us, because --with-native-system-header-dir + ;; is searched for relative to this location. Thus, we set + ;; it to "/" so GCC is able to find the target libc headers. + ;; This is safe because in practice GCC uses CROSS_CPATH + ;; & co to separate target and host libraries. + "--with-sysroot=/") `( ;; Disable features not needed at this stage. "--disable-shared" "--enable-static" "--enable-languages=c,c++" -- cgit v1.2.3 From b1593c1c4fd8f4fc6df4c43cab51334426e3aa76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 09:39:00 +0200 Subject: gnu: bison: Disable parallel build. Fixes . * gnu/packages/bison.scm (bison)[arguments]: New field. --- gnu/packages/bison.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 5f50ebf6b8..2d7383ce98 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -41,6 +41,11 @@ (base32 "03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597")))) (build-system gnu-build-system) + (arguments + '(;; Building in parallel on many-core systems may cause an error such as + ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or + ;; directory". See . + #:parallel-build? #f)) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) -- cgit v1.2.3 From 2c35ae82192fd6f1732b15fa41aec87aa61a1879 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 11:23:44 +0200 Subject: gnu: bison: Disable parallel tests, too. * gnu/packages/bison.scm (bison)[arguments]: Add #:parallel-tests?. --- gnu/packages/bison.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 2d7383ce98..5ebc883d53 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -45,7 +45,11 @@ '(;; Building in parallel on many-core systems may cause an error such as ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or ;; directory". See . - #:parallel-build? #f)) + #:parallel-build? #f + ;; Similarly, when building tests in parallel, Make may produce this error: + ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file + ;; or directory". Full log in . + #:parallel-tests? #f)) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) -- cgit v1.2.3 From 1380be3c73bb8734622df8972f80f9a5bfaf06dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Jun 2019 12:10:24 +0200 Subject: gnu: commencement: '%bootstrap-inputs+toolchain' no longer contains Mes. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): On i686-linux and x86_64-linux, remove "bootstrap-mescc-tools" and "mes" from %BOOTSTRAP-INPUTS. --- gnu/packages/commencement.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 13b813f806..9a5f6b0929 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1388,15 +1388,16 @@ exec " gcc "/bin/" program (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. - (append (match (%current-system) - ((or "i686-linux" "x86_64-linux") - `(("libc" ,glibc-mesboot) - ("binutils" ,binutils-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gcc" ,gcc-mesboot))) - (_ - '())) - (%bootstrap-inputs))) + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot) + ,@(fold alist-delete (%bootstrap-inputs) + '("bootstrap-mescc-tools" "mes")))) + (_ + (%bootstrap-inputs)))) (define gnu-make-boot0 (package-with-bootstrap-guile -- cgit v1.2.3 From 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Jun 2019 17:14:46 +0200 Subject: gnu: gcc-mesboot-wrapper: Fix 'version' field. Until now the 'version' field would match 'gcc-mesboot1-wrapper' ("4.7.4") instead of that of 'gcc-mesboot' ("4.9.4"). * gnu/packages/commencement.scm (gcc-mesboot-wrapper)[version]: New field. --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9a5f6b0929..08a34895f5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1350,6 +1350,7 @@ exec " gcc "/bin/" program (package (inherit gcc-mesboot1-wrapper) (name "gcc-mesboot-wrapper") + (version (package-version gcc-mesboot)) (source #f) (inputs '()) (native-inputs `(("bash" ,%bootstrap-coreutils&co) -- cgit v1.2.3 From a9a78d8bfbabcd306115684c99d3b2aa8fc75be8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:40:52 +0200 Subject: gnu: dbus: Update to 1.12.16. * gnu/packages/patches/dbus-CVE-2019-12749.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus): Update to 1.12.16. [replacement]: Remove. (dbus/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 13 +-- gnu/packages/patches/dbus-CVE-2019-12749.patch | 116 ------------------------- 3 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 gnu/packages/patches/dbus-CVE-2019-12749.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 3be9c9d60e..42b34ab90e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -740,7 +740,6 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ - %D%/packages/patches/dbus-CVE-2019-12749.patch \ %D%/packages/patches/dealii-mpi-deprecations.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d93a928c20..9fba2310d6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -82,8 +82,7 @@ (define dbus (package (name "dbus") - (version "1.12.14") - (replacement dbus/fixed) + (version "1.12.16") (source (origin (method url-fetch) (uri (string-append @@ -91,7 +90,7 @@ version ".tar.gz")) (sha256 (base32 - "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4")) + "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments @@ -157,14 +156,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 -(define dbus/fixed - (package - (inherit dbus) - (source (origin - (inherit (package-source dbus)) - (patches (append (search-patches "dbus-CVE-2019-12749.patch") - (origin-patches (package-source dbus)))))))) - (define glib (package (name "glib") diff --git a/gnu/packages/patches/dbus-CVE-2019-12749.patch b/gnu/packages/patches/dbus-CVE-2019-12749.patch deleted file mode 100644 index 12106f4589..0000000000 --- a/gnu/packages/patches/dbus-CVE-2019-12749.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 47b1a4c41004bf494b87370987b222c934b19016 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 30 May 2019 12:53:03 +0100 -Subject: [PATCH] auth: Reject DBUS_COOKIE_SHA1 for users other than the server - owner - -The DBUS_COOKIE_SHA1 authentication mechanism aims to prove ownership -of a shared home directory by having the server write a secret "cookie" -into a .dbus-keyrings subdirectory of the desired identity's home -directory with 0700 permissions, and having the client prove that it can -read the cookie. This never actually worked for non-malicious clients in -the case where server uid != client uid (unless the server and client -both have privileges, such as Linux CAP_DAC_OVERRIDE or traditional -Unix uid 0) because an unprivileged server would fail to write out the -cookie, and an unprivileged client would be unable to read the resulting -file owned by the server. - -Additionally, since dbus 1.7.10 we have checked that ~/.dbus-keyrings -is owned by the uid of the server (a side-effect of a check added to -harden our use of XDG_RUNTIME_DIR), further ruling out successful use -by a non-malicious client with a uid differing from the server's. - -Joe Vennix of Apple Information Security discovered that the -implementation of DBUS_COOKIE_SHA1 was susceptible to a symbolic link -attack: a malicious client with write access to its own home directory -could manipulate a ~/.dbus-keyrings symlink to cause the DBusServer to -read and write in unintended locations. In the worst case this could -result in the DBusServer reusing a cookie that is known to the -malicious client, and treating that cookie as evidence that a subsequent -client connection came from an attacker-chosen uid, allowing -authentication bypass. - -This is mitigated by the fact that by default, the well-known system -dbus-daemon (since 2003) and the well-known session dbus-daemon (in -stable releases since dbus 1.10.0 in 2015) only accept the EXTERNAL -authentication mechanism, and as a result will reject DBUS_COOKIE_SHA1 -at an early stage, before manipulating cookies. As a result, this -vulnerability only applies to: - -* system or session dbus-daemons with non-standard configuration -* third-party dbus-daemon invocations such as at-spi2-core (although - in practice at-spi2-core also only accepts EXTERNAL by default) -* third-party uses of DBusServer such as the one in Upstart - -Avoiding symlink attacks in a portable way is difficult, because APIs -like openat() and Linux /proc/self/fd are not universally available. -However, because DBUS_COOKIE_SHA1 already doesn't work in practice for -a non-matching uid, we can solve this vulnerability in an easier way -without regressions, by rejecting it early (before looking at -~/.dbus-keyrings) whenever the requested identity doesn't match the -identity of the process hosting the DBusServer. - -Signed-off-by: Simon McVittie -Closes: https://gitlab.freedesktop.org/dbus/dbus/issues/269 -Closes: CVE-2019-12749 ---- - dbus/dbus-auth.c | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c -index 37d8d4c9..7390a9d5 100644 ---- a/dbus/dbus-auth.c -+++ b/dbus/dbus-auth.c -@@ -529,6 +529,7 @@ sha1_handle_first_client_response (DBusAuth *auth, - DBusString tmp2; - dbus_bool_t retval = FALSE; - DBusError error = DBUS_ERROR_INIT; -+ DBusCredentials *myself = NULL; - - _dbus_string_set_length (&auth->challenge, 0); - -@@ -565,6 +566,34 @@ sha1_handle_first_client_response (DBusAuth *auth, - return FALSE; - } - -+ myself = _dbus_credentials_new_from_current_process (); -+ -+ if (myself == NULL) -+ goto out; -+ -+ if (!_dbus_credentials_same_user (myself, auth->desired_identity)) -+ { -+ /* -+ * DBUS_COOKIE_SHA1 is not suitable for authenticating that the -+ * client is anyone other than the user owning the process -+ * containing the DBusServer: we probably aren't allowed to write -+ * to other users' home directories. Even if we can (for example -+ * uid 0 on traditional Unix or CAP_DAC_OVERRIDE on Linux), we -+ * must not, because the other user controls their home directory, -+ * and could carry out symlink attacks to make us read from or -+ * write to unintended locations. It's difficult to avoid symlink -+ * attacks in a portable way, so we just don't try. This isn't a -+ * regression, because DBUS_COOKIE_SHA1 never worked for other -+ * users anyway. -+ */ -+ _dbus_verbose ("%s: client tried to authenticate as \"%s\", " -+ "but that doesn't match this process", -+ DBUS_AUTH_NAME (auth), -+ _dbus_string_get_const_data (data)); -+ retval = send_rejected (auth); -+ goto out; -+ } -+ - /* we cache the keyring for speed, so here we drop it if it's the - * wrong one. FIXME caching the keyring here is useless since we use - * a different DBusAuth for every connection. -@@ -679,6 +708,9 @@ sha1_handle_first_client_response (DBusAuth *auth, - _dbus_string_zero (&tmp2); - _dbus_string_free (&tmp2); - -+ if (myself != NULL) -+ _dbus_credentials_unref (myself); -+ - return retval; - } - -- cgit v1.2.3 From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/ibus.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/simulation.scm | 2 +- gnu/packages/squirrel.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c38f6d2db7..f4966276a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3052,7 +3052,7 @@ algorithm implementations.") ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bf101ab31..176aa90eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3470,7 +3470,7 @@ to a key in your preferred mode.") (inputs `(("supercollider" ,supercollider))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (home-page "https://github.com/supercollider/scel") (synopsis "SuperCollider Emacs interface") (description "@code{emacs-scel} is an Emacs interface to SuperCollider. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90cb8845cf..8f0b6cb15e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -84,7 +84,7 @@ ;; Use our own tool chain for that. (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) ("cross-binutils" ,(cross-binutils "xtensa-elf")) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b177c0b2f0..8e8c6c8058 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4779,7 +4779,7 @@ fight against their plot and save his fellow rabbits from slavery.") ("zlib" ,zlib))) (native-inputs `(("boost" ,boost) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("mesa" ,mesa) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) @@ -5272,7 +5272,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) ("qttools" ,qttools))) (synopsis "Realistic physics puzzle game") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c455b2838..ab2bd4e3e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -299,7 +299,7 @@ features to enable users to create their discs easily and quickly.") ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake" ,cmake))) + ("cmake" ,cmake-minimal))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ Method Engine.") ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 43725c64ce..f90bc52506 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,7 @@ test = { path = \"../libtest\" } (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests ("procps" ,procps) ; For the tests diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a8d214794e..edc8d6e190 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -620,7 +620,7 @@ user interface to the FEniCS core components and external libraries.") ("python-matplotlib" ,python-matplotlib) ,@(alist-delete "python" (package-inputs fenics-dolfin)))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 2c3ed6e570..1b9489882f 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -71,7 +71,7 @@ (find-files "../squirrel3/include"))) #t))))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) (home-page "https://squirrel-lang.org/") (synopsis "High level imperative, object-oriented programming language") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc6d2fb9b4..9859c55f98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2604,7 +2604,7 @@ supported players in addition to this package.") (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) - ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py + ("cmake" ,cmake-minimal) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87839490b2..303171e61d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1291,7 +1291,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (native-inputs `(("dev86" ,dev86) ("bison" ,bison) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("figlet" ,figlet) ("flex" ,flex) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ API.") `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) -- cgit v1.2.3 From 74c1c8daf543f72249f32216b41f3143c54acb4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:52:35 +0200 Subject: gnu: libx11: Update to 1.6.8. * gnu/packages/xorg.scm (libx11): Update to 1.6.8. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 919d2e62a6..794aefe7f8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5236,7 +5236,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.7") + (version "1.6.8") (source (origin (method url-fetch) @@ -5246,7 +5246,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li")))) + "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML -- cgit v1.2.3 From ac3842ef3e6ecdaa7a147cfe6ab59f017544a8a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:12:54 +0200 Subject: gnu: util-linux: Update to 2.34. * gnu/packages/linux.scm (util-linux): Update to 2.34. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e2cde4b693..f0fa6bba92 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -723,7 +723,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.2") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -731,7 +731,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) + "1db2kydkwjmvgd1glkcba3adhidxw0f1x735dcjdpdjjf869sgvl")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 70530036b8313d5273fca286cd62c73bd2225110 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:20:22 +0200 Subject: gnu: meson: Update to 0.51.0. * gnu/packages/build-tools.scm (meson): Update to 0.51.0. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index c435e72824..68d5b77d49 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -162,7 +162,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.50.1") + (version "0.51.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -170,7 +170,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) + "0gynkr02mlillh35ksizsf6zc4dfxb8gqym00df5klw6spvgsx9g")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 2b5e412b30f5d3fb66ee4f697629e86d536ff5a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 21:18:54 +0200 Subject: gnu: commencement: Return #t from all phases. While at it, remove useless (and ...) indirections, because the procedures never return #f anyway: instead they would raise an exception upon failure. * gnu/packages/commencement.scm (mes-boot, tcc-boot0, tcc-boot, diffutils-mesboot, binutils-mesboot0, gcc-core-mesboot, gcc-mesboot0, glibc-headers-mesboot, glibc-mesboot, gnu-make-boot0): Return #t from phases and remove (and ...) blocks. --- gnu/packages/commencement.scm | 129 +++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 66 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 08a34895f5..10b0bd67f5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -106,11 +106,10 @@ (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." - (and - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") - #t))))) + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -130,12 +129,11 @@ (invoke "sh" "bootstrap.sh")))) (replace 'check (lambda _ - (and - (setenv "DIFF" "sh scripts/diff.scm") - ;; fail fast tests - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") - (invoke "sh" "check.sh")))) + (setenv "DIFF" "sh scripts/diff.scm") + ;; fail fast tests + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "check.sh"))) (replace 'install (lambda _ (invoke "sh" "install.sh")))))) @@ -201,12 +199,11 @@ coreutils "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (with-directory-excursion ".." - (and - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" - "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") - #t))))) + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" + "-xvf" nyacc-source) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) @@ -353,20 +350,19 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out")) (tcc (assoc-ref %build-inputs "tcc"))) - (and - (mkdir-p (string-append out "/bin")) - (copy-file "tcc" (string-append out "/bin/tcc")) - (mkdir-p (string-append out "/lib/tcc")) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) - (copy-recursively (string-append tcc "/lib") - (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") - (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) - (delete-file (string-append out "/lib/tcc/libtcc1.a")) - (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) - #t)))))))))) + (mkdir-p (string-append out "/bin")) + (copy-file "tcc" (string-append out "/bin/tcc")) + (mkdir-p (string-append out "/lib/tcc")) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + (copy-recursively (string-append tcc "/lib") + (string-append out "/lib")) + (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) + (delete-file (string-append out "/lib/tcc/libtcc1.a")) + (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) + #t))))))))) (define make-mesboot0 (package-with-bootstrap-guile @@ -413,7 +409,8 @@ (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (install-file "make" bin)))))))))) + (install-file "make" bin) + #t))))))))) (define diffutils-mesboot (package-with-bootstrap-guile @@ -457,8 +454,8 @@ (add-before 'configure 'remove-diff3-sdiff (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile.in" - (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))))))))) - + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")) + #t)))))))) (define binutils-mesboot0 (package-with-bootstrap-guile @@ -585,7 +582,8 @@ (lambda _ (display " ac_cv_c_float_format='IEEE (little-endian)' -")))))) +"))) + #t))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) @@ -603,23 +601,22 @@ ac_cv_c_float_format='IEEE (little-endian)' (out (assoc-ref outputs "out")) (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) - (and - (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) - (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) - (copy-file (string-append tcc "/lib/libtcc1.a") - (string-append out "/lib/libtcc1.a")) - (invoke "ar" "r" (string-append gcc-dir "/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ar" "r" (string-append out "/lib/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ls" "-ltrF" gcc-dir) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) - #t))))))) + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + (copy-file (string-append tcc "/lib/libtcc1.a") + (string-append out "/lib/libtcc1.a")) + (invoke "ar" "r" (string-append gcc-dir "/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ar" "r" (string-append out "/lib/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ls" "-ltrF" gcc-dir) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + #t)))))) (native-search-paths ;; Use the language-specific variables rather than 'CPATH' because they ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. @@ -818,11 +815,11 @@ ac_cv_c_float_format='IEEE (little-endian)' (let* ((out (assoc-ref outputs "out")) (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) - (and - (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) - (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")))))))) + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + #t))))) ((#:configure-flags configure-flags) `(let ((out (assoc-ref %outputs "out"))) `("--disable-shared" @@ -1179,14 +1176,15 @@ exec " gcc "/bin/" program (("/bin/pwd") (string-append coreutils "/bin/pwd"))) (setenv "C_INCLUDE_PATH" (string-append libc "/include" headers "/include")) - (setenv "LIBRARY_PATH" (string-append libc "/lib"))))) + (setenv "LIBRARY_PATH" (string-append libc "/lib")) + #t))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out"))) - (and (apply invoke "make" make-flags) - (copy-recursively kernel-headers out) - #t)))) + (apply invoke "make" make-flags) + (copy-recursively kernel-headers out) + #t))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ../configure ~a\n" (string-join configure-flags)) @@ -1237,9 +1235,9 @@ exec " gcc "/bin/" program (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out")) (install-flags (cons "install" make-flags))) - (and (apply invoke "make" install-flags) - (copy-recursively kernel-headers out) - #t))))))))) + (apply invoke "make" install-flags) + (copy-recursively kernel-headers out) + #t)))))))) (native-search-paths ;; FIXME: move to glibc-mesboot0 ;; Use the language-specific variables rather than 'CPATH' because they ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. @@ -1413,8 +1411,7 @@ exec " gcc "/bin/" program `(modify-phases ,phases (replace 'build (lambda _ - (invoke "./build.sh") - #t)) + (invoke "./build.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 1bd364364dbbff2b51a7822b13bdbeecfd9f2d34 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Jun 2019 16:54:45 +0200 Subject: gnu: ncurses: Update to 6.1-20190909. * gnu/packages/ncurses.scm (ncurses): Update to 6.1-20190609. [arguments]: Reinstate 'apply-rollup-patch' phase. Move 'remove-unneeded-shebang' phase later to prevent conflict with patch. [native-inputs]: Add "rollup-patch" origin. --- gnu/packages/ncurses.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index a35ff9b400..78e9ba1377 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -40,7 +40,7 @@ (define-public ncurses (package (name "ncurses") - (version "6.1") + (version "6.1-20190609") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ncurses/ncurses-" @@ -84,8 +84,7 @@ (copy-file (assoc-ref (or native-inputs inputs) "rollup-patch") (string-append (getcwd) "/rollup-patch.sh.bz2")) (invoke "bzip2" "-d" "rollup-patch.sh.bz2") - (invoke "sh" "rollup-patch.sh") - #t)) + (invoke "sh" "rollup-patch.sh"))) (remove-shebang-phase '(lambda _ ;; To avoid retaining a reference to the bootstrap Bash via the @@ -189,17 +188,31 @@ ,@(if (target-mingw?) '("--enable-term-driver") '())))) #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases + (add-after 'unpack 'apply-rollup-patch + ,apply-rollup-patch-phase) (replace 'configure ,configure-phase) (add-after 'install 'post-install ,post-install-phase) (add-before 'configure 'patch-makefile-SHELL ,patch-makefile-phase) - (add-after 'unpack 'remove-unneeded-shebang + (add-before 'patch-source-shebangs 'remove-unneeded-shebang ,remove-shebang-phase))))) (native-inputs `(,@(if (%current-target-system) `(("self" ,this-package)) ;for `tic' '()) + + ("rollup-patch" + ,(origin + (method url-fetch) + (uri (string-append + "https://invisible-mirror.net/archives/ncurses/" + (car (string-split version #\-)) + "/ncurses-" version "-patch.sh.bz2")) + (sha256 + (base32 + "0hqlqdqmh7lfs6dwj763qksb4j9nk0pv6crzx5gnp6n4caz3i46g")))) + ("pkg-config" ,pkg-config))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 9f1da6ced3ea41cee93b5a1944a5526c6805359d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 14:39:58 +0200 Subject: gnu: isl: Fix fallback URL. * gnu/packages/gcc.scm (isl, isl-0.18, isl-0.11)[source](uri): Use '.bz2' tarball. --- gnu/packages/gcc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 345fa4c745..5d4acbce8a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -868,7 +868,7 @@ as the 'native-search-paths' field." version ".tar.bz2") (string-append %gcc-infrastructure - name "-" version ".tar.gz"))) + name "-" version ".tar.bz2"))) (sha256 (base32 "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) @@ -898,7 +898,7 @@ dependence analysis and bounds on piecewise step-polynomials.") (uri (list (string-append "http://isl.gforge.inria.fr/isl-" version ".tar.bz2") (string-append %gcc-infrastructure - "isl-" version ".tar.gz"))) + "isl-" version ".tar.bz2"))) (sha256 (base32 "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))))) @@ -915,7 +915,7 @@ dependence analysis and bounds on piecewise step-polynomials.") version ".tar.bz2") (string-append %gcc-infrastructure - name "-" version ".tar.gz"))) + name "-" version ".tar.bz2"))) (sha256 (base32 "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9")) -- cgit v1.2.3 From 8449cc133aac735cceb1caf1910506dfab099e40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 14:41:41 +0200 Subject: gnu: isl: Update to 0.21. * gnu/packages/gcc.scm (isl): Update to 0.21. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5d4acbce8a..41d66fc130 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -860,7 +860,7 @@ as the 'native-search-paths' field." (define-public isl (package (name "isl") - (version "0.19") + (version "0.21") (source (origin (method url-fetch) (uri (list (string-append @@ -871,7 +871,7 @@ as the 'native-search-paths' field." name "-" version ".tar.bz2"))) (sha256 (base32 - "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) + "0ng8l3q1px9lkzb44nxnzhh6fhdbclrwng9xs2v9m8yii8gs336i")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") -- cgit v1.2.3 From 78b036ddcedb76b623bc54de880b133d2c33acf8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:13:51 +0200 Subject: gnu: libxi: Update to 1.7.10. * gnu/packages/xorg.scm (libxi): Update to 1.7.10. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 794aefe7f8..1f6fd35c60 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4919,7 +4919,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxi (package (name "libxi") - (version "1.7.9") + (version "1.7.10") (source (origin (method url-fetch) @@ -4929,7 +4929,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2")))) + "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto) -- cgit v1.2.3 From d0828b07573c547345632acc3220a532fdc7d6ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:14:47 +0200 Subject: gnu: xorgproto: Update to 2019.1. * gnu/packages/xorg.scm (xorgproto): Update to 2019.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1f6fd35c60..ee345742a5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -211,14 +211,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2018.4") + (version "2019.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto/" name "-" version ".tar.bz2")) (sha256 (base32 - "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y")))) + "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. -- cgit v1.2.3 From fc9e5973d6ffbf016dc09085467d146ad99e2f93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:16:50 +0200 Subject: gnu: expat: Update to 2.2.7. * gnu/packages/xml.scm (expat): Update to 2.2.7. [source](uri): Use XZ compressed archive. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e71448e8a7..8dce027827 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -65,14 +65,14 @@ (define-public expat (package (name "expat") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" - version "/expat-" version ".tar.bz2")) + version "/expat-" version ".tar.xz")) (sha256 (base32 - "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))) + "1y5yax6bq8p9xk49zqkd62pxk8bq266wrgbrqgaxp3wsrw5g9qrh")))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") -- cgit v1.2.3 From e7041c8ef8b9137f40e0a5377b8224314168e226 Mon Sep 17 00:00:00 2001 From: "Jeremiah@pdp10.guru" Date: Tue, 11 Jun 2019 20:57:01 +0000 Subject: gnu: python: Allow building on low-memory systems. * gnu/packages/python.scm (python-3.7)[source]: Delete memory-intensive test. Signed-off-by: Marius Bakke --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8565e60f71..f3bea4a51d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -345,6 +345,9 @@ data types.") ;; "Lib/test/test_socket.py" + ;; Delete test that fails on low-memory systems. + "Lib/test/test_mmap.py" + ;; These tests fail on AArch64. "Lib/ctypes/test/test_win32.py" "Lib/test/test_fcntl.py" -- cgit v1.2.3 From 6c237a2d7bfa3c7be02c069e5c24a2b401a51864 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Dec 2018 16:11:52 +0100 Subject: gnu: glib: Update to 2.58.1. * gnu/packages/glib.scm (glib): Update to 2.58.1. [build-system]: Use meson-build-system. [outputs]: Remove "doc" as the documentation files are no longer included. [inputs]: Move libffi, util-linux, and zlib from here... [propagated-inputs]: ...to here; add libselinux. [arguments]: Remove key "disallowed-references" as it is not supported by the meson-build-system; delete "bootstrap" phase to prevent use of autotools; adjust "pre-build" phase; move "disable-failing-tests" phase after "unpack"; disable two more tests in "disable-failing-tests" phase; add phase "move-executables"; remove configure flags. --- gnu/packages/glib.scm | 72 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9fba2310d6..b5b4b5e039 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -159,7 +160,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.3") + (version "2.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -167,19 +168,20 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1cjcqz77m62zrx7224vl3f2cxwqf28r5xpqb2jy7av0vr2scb959")) + "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp")) (patches (search-patches "glib-tests-timer.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on Python - "doc")) ; 20 MiB of GTK-Doc reference + "bin")) ; glib-mkenums, gtester, etc.; depends on Python (propagated-inputs - `(("pcre" ,pcre))) ; in the Requires.private field of glib-2.0.pc - (inputs - `(("coreutils" ,coreutils) + `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc + ;; These are in the Requires.private field of gio-2.0.pc ("util-linux" ,util-linux) ; for libmount - ("libffi" ,libffi) + ("libselinux" ,libselinux) ("zlib" ,zlib))) + (inputs + `(("coreutils" ,coreutils))) (native-inputs `(("gettext" ,gettext-minimal) ("dbus" ,dbus) ; for GDBus tests @@ -189,11 +191,14 @@ shared NFS home directories.") ("bash" ,bash) ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases + `(#:phases (modify-phases %standard-phases + (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For building deterministic pyc files + (setenv "DETERMINISTIC_BUILD" "1") + ;; For tests/gdatetime.c. (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") @@ -202,14 +207,8 @@ shared NFS home directories.") ;; Some tests want write access there. (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) - - (substitute* '("glib/gspawn.c" - "glib/tests/utils.c" - "tests/spawn-test.c") - (("/bin/sh") - (string-append (assoc-ref inputs "bash") "/bin/sh"))) #t)) - (add-before 'check 'disable-failing-tests + (add-after 'unpack 'disable-failing-tests (lambda _ (let ((disable (lambda (test-file test-paths) @@ -228,6 +227,15 @@ shared NFS home directories.") ;; recognize it. "/thread/thread4")) + ;; This tries to find programs in FHS directories. + ("glib/tests/utils.c" + ("/utils/find-program")) + + ;; This fails because "glib/tests/echo-script" cannot be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" (;; fails if compiler optimizations are enabled, which they ;; are by default. @@ -273,12 +281,30 @@ shared NFS home directories.") (;; Requires /etc/machine-id. "/gdbus/x11-autolaunch"))))) (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + ;; TODO: meson does not permit the bindir to be outside of prefix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; Do not refer to "bindir", which points to "${prefix}/bin". + ;; We don't patch "bindir" to point to "$bin/bin", because that + ;; would create a reference cycle between the "out" and "bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) + (("bindir=\\$\\{prefix\\}/bin") "") + (("=\\$\\{bindir\\}/") "=")) #t)))) - - ;; Note: `--docdir' and `--htmldir' are not honored, so work around it. - #:configure-flags (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=" + ;; (assoc-ref %outputs "bin") + ;; "/bin")) ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a ;; file that gets compiled possibly before it has been fully generated. -- cgit v1.2.3 From 036c86be5ad6d960d3f8e3b06e15bc368c77957d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Dec 2018 16:21:35 +0100 Subject: gnu: gobject-introspection: Update to 1.58.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.58.1. [source]: Remove snippet. [arguments]: Add phase "do-not-use-/usr/bin/env". [inputs]: Replace python-2 with python-wrapper; add zlib. [native-inputs]: Add autoconf and automake to be able to keep using the gnu-build-system. * gnu/packages/patches/gobject-introspection-cc.patch: Update patch to apply to latest version. --- gnu/packages/glib.scm | 40 +++++++++++++--------- .../patches/gobject-introspection-cc.patch | 11 +++--- 2 files changed, 30 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b5b4b5e039..e438e56a59 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -28,6 +28,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -335,32 +336,44 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.56.1") + (version "1.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "0jx2kryjd7l0vl5gb3qp1qjfy3cjiizvcd1snsm7pzwrzz67aa2v")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tools/g-ir-tool-template.in" - (("#!/usr/bin/env @PYTHON@") "#!@PYTHON@")) - #t)) + (base32 "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" "gobject-introspection-absolute-shlib-path.patch")))) (build-system gnu-build-system) + (arguments + `(;; The build system has at least one race condition involving Gio-2.0.gir + ;; which causes intermittent failures, as of 1.56.0. + #:parallel-build? #f + ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes + ;; some tests to fail. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-/usr/bin/env + (lambda _ + (substitute* "tools/g-ir-tool-template.in" + (("#!@PYTHON_CMD@") + (string-append "#!" (which "python3")))) + #t))))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) - ("python-2" ,python-2))) + ("python" ,python-wrapper) + ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using @@ -371,13 +384,6 @@ dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (arguments - `(;; The build system has at least one race condition involving Gio-2.0.gir - ;; which causes intermittent failures, as of 1.56.0. - #:parallel-build? #f - ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes - ;; some tests to fail. - #:tests? #f)) (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index d9cacf4ca7..6a86b56b44 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,11 +1,14 @@ Use gcc as the default C compiler if CC is not set. - ---- gobject-introspection-1.44.0.orig/giscanner/__init__.py 2014-08-04 22:37:07.000000000 +0800 -+++ gobject-introspection-1.44.0/giscanner/__init__.py 2015-04-20 17:30:26.507697234 +0800 -@@ -22,3 +22,5 @@ +diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py +--- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 ++++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 +@@ -22,6 +22,8 @@ builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') if builddir is not None: __path__.append(os.path.join(builddir, 'giscanner')) +if not 'CC' in os.environ: + os.environ['CC'] = 'gcc' + try: + from ._version import __version__ + except ImportError: -- cgit v1.2.3 From 8a9ac0477dde61a5ce7cbf927b7a5f15f19a82e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:02:07 +0100 Subject: gnu: glibmm: Update to 2.58.0. * gnu/packages/glib.scm (glibmm): Update to 2.58.0. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e438e56a59..35d2e685a4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -551,7 +551,7 @@ has an ease of use unmatched by other C++ callback libraries.") (define glibmm (package (name "glibmm") - (version "2.56.0") + (version "2.58.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -559,7 +559,7 @@ has an ease of use unmatched by other C++ callback libraries.") "/glibmm-" version ".tar.xz")) (sha256 (base32 - "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f")))) + "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk")))) (build-system gnu-build-system) (arguments `(;; XXX: Some tests uses C++14 features. Remove this when the default -- cgit v1.2.3 From 3387ee41ac1469200db3cf7f914285905024e871 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:06:54 +0100 Subject: gnu: gnome-desktop: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab2bd4e3e9..32f70b1394 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -468,7 +468,7 @@ commonly used macros.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -477,7 +477,7 @@ commonly used macros.") name "-" version ".tar.xz")) (sha256 (base32 - "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30")))) + "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0dd65d5a0ab462ef49653e8ccdecf9ed795f1f1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:14 +0100 Subject: gnu: gnome-disk-utility: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 32f70b1394..44b81e67c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -556,7 +556,7 @@ and keep up to date translations of documentation.") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -564,7 +564,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m")))) + "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 2dfc16d14ae5c702f989ebb4fa7dc14d84e9946e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:32 +0100 Subject: gnu: evince: Update to 3.30.2. * gnu/packages/gnome.scm (evince): Update to 3.30.2. [inputs]: Add gspell. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 44b81e67c3..3374229a8c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -755,7 +755,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -763,7 +763,7 @@ forgotten when the session ends.") name "-" version ".tar.xz")) (sha256 (base32 - "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89")))) + "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") @@ -788,6 +788,7 @@ forgotten when the session ends.") ;; ("libkpathsea" ,texlive-bin) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gspell" ,gspell) ("libgnome-keyring" ,libgnome-keyring) ("adwaita-icon-theme" ,adwaita-icon-theme) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 10ff872f77ff01cee56e07e0364d49047c629beb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:48 +0100 Subject: gnu: gsettings-desktop-schemas: Update to 3.28.1. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.28.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3374229a8c..9cf1a0a7ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -829,7 +829,7 @@ on the GNOME Desktop with a single simple application.") (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) @@ -838,7 +838,7 @@ on the GNOME Desktop with a single simple application.") name "-" version ".tar.xz")) (sha256 (base32 - "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c")))) + "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit v1.2.3 From 412e53024aa43e49b7545b09312d75d132fce7cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:07 +0100 Subject: gnu: adwaita-icon-theme: Update to 3.30.1. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9cf1a0a7ff..8b94c30526 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -927,7 +927,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (define-public adwaita-icon-theme (package (inherit gnome-icon-theme) (name "adwaita-icon-theme") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -935,7 +935,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") name "-" version ".tar.xz")) (sha256 (base32 - "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks")))) + "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd")))) (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) -- cgit v1.2.3 From d19db454feb717e0f822a6d5c1faf88af3f427e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:24 +0100 Subject: gnu: libgnomeprint: Update to 2.18.8. * gnu/packages/gnome.scm (libgnomeprint): Update to 2.18.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b94c30526..9b58150a9d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1902,7 +1902,7 @@ widgets built in the loading process.") ;; . (package (name "libgnomeprint") - (version "2.8.2") + (version "2.18.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1910,7 +1910,7 @@ widgets built in the loading process.") name "-" version ".tar.bz2")) (sha256 (base32 - "129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm")))) + "14cnimvlc7ky22g2snyf4362412k3jk1syjf8b9887q5a63fqd0h")))) (build-system gnu-build-system) (inputs `(("popt" ,popt) -- cgit v1.2.3 From 36053d7f1d601f77e7dcb614a4d0301f74743294 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:40 +0100 Subject: gnu: libgnomeprintui: Update to 2.18.6. * gnu/packages/gnome.scm (libgnomeprintui): Update to 2.18.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9b58150a9d..255867be59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1933,7 +1933,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.") ;; Deprecated; see libgnomeprint. (package (name "libgnomeprintui") - (version "2.8.2") + (version "2.18.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1941,7 +1941,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.") name "-" version ".tar.bz2")) (sha256 (base32 - "1ivipk7r61rg90p9kp889j28xlyyj6466ypvwa4jvnrcllnaajsw")))) + "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm")))) (build-system gnu-build-system) ;; Mentioned as Required in the .pc file (propagated-inputs `(("libgnomeprint" ,libgnomeprint))) -- cgit v1.2.3 From 6cc6e3e514823dae0daad8310356f219701be5b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:58 +0100 Subject: gnu: libwnck: Update to 3.30.0. * gnu/packages/gnome.scm (libwnck): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 255867be59..5063b4fe4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2006,7 +2006,7 @@ controls using the Bonobo component framework.") (define-public libwnck (package (name "libwnck") - (version "3.24.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2014,7 +2014,7 @@ controls using the Bonobo component framework.") name "-" version ".tar.xz")) (sha256 (base32 - "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg")))) + "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 0db6bafb3d4a68c59c84da344be93a70d602540c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:09:43 +0100 Subject: gnu: seahorse: Update to 3.30. * gnu/packages/gnome.scm (seahorse): Update to 3.30. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5063b4fe4f..4a82dfe488 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2214,7 +2214,7 @@ engineering.") (define-public seahorse (package (name "seahorse") - (version "3.20.0") + (version "3.30") (source (origin (method url-fetch) @@ -2223,7 +2223,7 @@ engineering.") version ".tar.xz")) (sha256 (base32 - "1py6fj19kb8aaxvg6yrpd0876azc2zjvis98aqz37a2lxmhp9c72")))) + "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp")))) (build-system glib-or-gtk-build-system) (inputs `(("gtk+" ,gtk+) -- cgit v1.2.3 From 91185fe8f3d164ccf93ceb7cd41c4a760d8c75f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:00 +0100 Subject: gnu: vala: Update to 0.42.3. * gnu/packages/gnome.scm (vala): Update to 0.42.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a82dfe488..e9e3180b51 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.40.9") + (version "0.42.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0yvaijkpahzz26sa37cyzbj75a9vbcbgvxbqzzb7hbcvfy009zy7")))) + "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 5f36c5eb12c321dda992691638169192133e1ae6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:16 +0100 Subject: gnu: vte: Update to 0.54.2. * gnu/packages/gnome.scm (vte): Update to 0.54.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9e3180b51..7da3143be6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2297,7 +2297,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.52.2") + (version "0.54.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2305,7 +2305,7 @@ libraries written in C.") name "-" version ".tar.xz")) (sha256 (base32 - "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg")))) + "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fd0557f84c03ccfdcab4ba2f6342c87b2bd53264 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:20 +0100 Subject: gnu: five-or-more: Update to 3.30.0. * gnu/packages/gnome.scm (five-or-more): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7da3143be6..7ecc468088 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2838,7 +2838,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public five-or-more (package (name "five-or-more") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2847,7 +2847,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") name "-" version ".tar.xz")) (sha256 (base32 - "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c")))) + "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f7a584f4e37af3916ff818ea3b04230fa607eeb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:40 +0100 Subject: gnu: gnome-mines: Update to 3.30.1.1. * gnu/packages/gnome.scm (gnome-mines): Update to 3.30.1.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ecc468088..a312fce0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2869,7 +2869,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public gnome-mines (package (name "gnome-mines") - (version "3.28.0") + (version "3.30.1.1") (source (origin (method url-fetch) @@ -2878,7 +2878,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") name "-" version ".tar.xz")) (sha256 (base32 - "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf")))) + "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From b3f95507dff75790546ec22bd1b0f5b293a0dcc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:57 +0100 Subject: gnu: gnome-sudoku: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a312fce0fc..c71b24614a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2907,7 +2907,7 @@ floating in an ocean using only your brain and a little bit of luck.") (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2916,7 +2916,7 @@ floating in an ocean using only your brain and a little bit of luck.") name "-" version ".tar.xz")) (sha256 (base32 - "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav")))) + "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 1d7cb36e8ebe04f347cb8b9e0e6ff0658d8e80df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 19:06:58 +0100 Subject: gnu: gnome-terminal: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c71b24614a..9ae2d5fe97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2942,7 +2942,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -2951,7 +2951,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2")))) + "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 220bcf6fbac7eca3db16727d2f9e3bbc85c53cf5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 12:08:51 +0100 Subject: gnu: glib: Install m4 macros. * gnu/packages/glib.scm (glib)[native-inputs]: Add m4. --- gnu/packages/glib.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 35d2e685a4..9acbfd8386 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -185,6 +185,7 @@ shared NFS home directories.") `(("coreutils" ,coreutils))) (native-inputs `(("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros ("dbus" ,dbus) ; for GDBus tests ("pkg-config" ,pkg-config) ("python" ,python-wrapper) -- cgit v1.2.3 From 0ecf6612c7d7a10df8ee697e92e9593e60242e78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:14:46 +0100 Subject: gnu: gtkmm: Update to 3.24.0. * gnu/packages/gtk.scm (gtkmm): Update to 3.24.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a8bc2e42ce..64bf802c6f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1094,7 +1094,7 @@ toolkit.") (define-public gtkmm (package (name "gtkmm") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1102,7 +1102,7 @@ toolkit.") name "-" version ".tar.xz")) (sha256 (base32 - "1400535lhyya462pfx8bp11k3mg3jsbdghlpygskd5ai665dkbwi")))) + "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' -- cgit v1.2.3 From 3ec19e960c28e7f61d5b39f23d695646217b84f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:15:00 +0100 Subject: gnu: atkmm: Update to 2.28.0. * gnu/packages/gtk.scm (atkmm): Update to 2.28.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 64bf802c6f..f797cd942c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1071,7 +1071,7 @@ library.") (define-public atkmm (package (name "atkmm") - (version "2.24.2") + (version "2.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1079,7 +1079,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1gaqwhviadsmy0fsr47686yglv1p4mpkamj0in127bz2b5bki5gz")))) + "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From 13b0a85dfa8dfc12adab0b7a558736814ddfc33b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:15:11 +0100 Subject: gnu: pangomm: Update to 2.42.0. * gnu/packages/gtk.scm (pangomm): Update to 2.42.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f797cd942c..1353dbb261 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1045,7 +1045,7 @@ library.") (define-public pangomm (package (name "pangomm") - (version "2.40.1") + (version "2.42.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1053,7 +1053,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1bz3gciff23bpw9bqc4v2l3lkq9w7394v3a4jxkvx0ap5lmfwqlp")))) + "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From 85fb3df35d7ef134c146d70eda695d97ffe157d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:21:26 +0100 Subject: gnu: gnome-system-monitor: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 3.30.0. [build-system]: Use meson-build-system. [arguments]: Add configure flags to build without systemd. [native-inputs]: Add gtk+:bin. --- gnu/packages/gnome.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ae2d5fe97..960a3a999c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7348,7 +7348,7 @@ Bluefish supports many programming and markup languages.") (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "3.28.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -7357,10 +7357,14 @@ Bluefish supports many programming and markup languages.") name "-" version ".tar.xz")) (sha256 (base32 - "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb")))) - (build-system glib-or-gtk-build-system) + "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t + #:configure-flags '("-Dsystemd=false"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums. + ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) ("libgtop" ,libgtop) -- cgit v1.2.3 From 2d475910fbcb33de9da4629264d12cb4854120ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:22:44 +0100 Subject: gnu: gnome-calculator: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add gtk+:bin and vala. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 960a3a999c..c1ab5d85ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7179,7 +7179,7 @@ handling the startup notification side.") (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) @@ -7188,12 +7188,15 @@ handling the startup notification side.") name "-" version ".tar.xz")) (sha256 (base32 - "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s")))) - (build-system glib-or-gtk-build-system) + "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + (build-system meson-build-system) + (arguments '(#:glib-or-gtk? #t)) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) + ("vala" ,vala) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From 8c6d7b61bf05ee3c4154d8fc4279a20f509d2740 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:24:44 +0100 Subject: gnu: network-manager-applet: Update to 1.8.18. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.8.18. [inputs]: Add mobile-broadband-provider-info. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c1ab5d85ab..4a8c8049cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5487,7 +5487,7 @@ to virtual private networks (VPNs) via OpenVPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.8.14") + (version "1.8.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5495,7 +5495,7 @@ to virtual private networks (VPNs) via OpenVPN.") name "-" version ".tar.xz")) (sha256 (base32 - "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya")))) + "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-migration") #:phases -- cgit v1.2.3 From b74ef0bae75525227de092c4844b920625095f65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:25:57 +0100 Subject: gnu: gdm: Update to 3.30.2. * gnu/packages/gnome.scm (gdm): Update to 3.30.2. [arguments]: Add --with-udevdir configure flag. [source]: Remove patch. * gnu/packages/patches/gdm-CVE-2018-14424.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 8 +- gnu/packages/patches/gdm-CVE-2018-14424.patch | 172 -------------------------- 3 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 gnu/packages/patches/gdm-CVE-2018-14424.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 42b34ab90e..12a64b23f9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -836,7 +836,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2019-6978.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ - %D%/packages/patches/gdm-CVE-2018-14424.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a8c8049cf..787d9ab074 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5584,16 +5584,15 @@ libxml2.") (define-public gdm (package (name "gdm") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gdm-CVE-2018-14424.patch")) (sha256 (base32 - "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0")))) + "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags @@ -5609,6 +5608,9 @@ libxml2.") ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" + ,(string-append "--with-udevdir=" + (assoc-ref %outputs "out") "/lib/udev") + "--localstatedir=/var" ,(string-append "--with-default-path=" (string-join '("/run/setuid-programs" diff --git a/gnu/packages/patches/gdm-CVE-2018-14424.patch b/gnu/packages/patches/gdm-CVE-2018-14424.patch deleted file mode 100644 index 88a71f4151..0000000000 --- a/gnu/packages/patches/gdm-CVE-2018-14424.patch +++ /dev/null @@ -1,172 +0,0 @@ -Fix CVE-2018-14424: - -https://gitlab.gnome.org/GNOME/gdm/issues/401 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14424 - -Patch copied from upstream source repository: - -https://gitlab.gnome.org/GNOME/gdm/commit/1ac1697b3b019f50729a6e992065959586e170da - -From 1ac1697b3b019f50729a6e992065959586e170da Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 19 Jul 2018 18:26:05 +0100 -Subject: [PATCH] display-store: Pass the display object rather than the id in - the removed signal - -By the time GdmDisplayStore emits the "display-removed" signal, the display -is no longer in the store and gdm_display_store_lookup will not work in -signal handlers. - -Change the "display-removed" parameter from the display id to the GdmDisplay -object, so that signal handers can perform any cleanup they need to do - -CVE-2018-14424 - -Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401 ---- - daemon/gdm-display-store.c | 11 +++-------- - daemon/gdm-display-store.h | 2 +- - daemon/gdm-local-display-factory.c | 13 +++---------- - daemon/gdm-manager.c | 19 +++++++++---------- - daemon/gdm-manager.h | 3 ++- - 5 files changed, 18 insertions(+), 30 deletions(-) - -diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c -index af76f519..fd24334e 100644 ---- a/daemon/gdm-display-store.c -+++ b/daemon/gdm-display-store.c -@@ -76,15 +76,10 @@ stored_display_new (GdmDisplayStore *store, - static void - stored_display_free (StoredDisplay *stored_display) - { -- char *id; -- -- gdm_display_get_id (stored_display->display, &id, NULL); -- - g_signal_emit (G_OBJECT (stored_display->store), - signals[DISPLAY_REMOVED], - 0, -- id); -- g_free (id); -+ stored_display->display); - - g_debug ("GdmDisplayStore: Unreffing display: %p", - stored_display->display); -@@ -281,9 +276,9 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass) - G_STRUCT_OFFSET (GdmDisplayStoreClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate)); - } -diff --git a/daemon/gdm-display-store.h b/daemon/gdm-display-store.h -index 28359933..0aff8ee2 100644 ---- a/daemon/gdm-display-store.h -+++ b/daemon/gdm-display-store.h -@@ -49,7 +49,7 @@ typedef struct - void (* display_added) (GdmDisplayStore *display_store, - const char *id); - void (* display_removed) (GdmDisplayStore *display_store, -- const char *id); -+ GdmDisplay *display); - } GdmDisplayStoreClass; - - typedef enum -diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 5f1ae89e..39f3e30a 100644 ---- a/daemon/gdm-local-display-factory.c -+++ b/daemon/gdm-local-display-factory.c -@@ -805,18 +805,11 @@ on_display_added (GdmDisplayStore *display_store, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmLocalDisplayFactory *factory) - { -- GdmDisplay *display; -- -- display = gdm_display_store_lookup (display_store, id); -- -- if (display != NULL) { -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -- g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); -- -- } -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -+ g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); - } - - static gboolean -diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index f17bd1a5..f6684a8b 100644 ---- a/daemon/gdm-manager.c -+++ b/daemon/gdm-manager.c -@@ -1541,19 +1541,18 @@ on_display_status_changed (GdmDisplay *display, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmManager *manager) - { -- GdmDisplay *display; -+ char *id; - -- display = gdm_display_store_lookup (display_store, id); -- if (display != NULL) { -- g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ gdm_display_get_id (display, &id, NULL); -+ g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ g_free (id); - -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); - -- g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id); -- } -+ g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display); - } - - static void -@@ -2535,9 +2534,9 @@ gdm_manager_class_init (GdmManagerClass *klass) - G_STRUCT_OFFSET (GdmManagerClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_object_class_install_property (object_class, - PROP_XDMCP_ENABLED, -diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h -index 41c68a7a..c8fb3f22 100644 ---- a/daemon/gdm-manager.h -+++ b/daemon/gdm-manager.h -@@ -24,6 +24,7 @@ - - #include - -+#include "gdm-display.h" - #include "gdm-manager-glue.h" - - G_BEGIN_DECLS -@@ -50,7 +51,7 @@ typedef struct - void (* display_added) (GdmManager *manager, - const char *id); - void (* display_removed) (GdmManager *manager, -- const char *id); -+ GdmDisplay *display); - } GdmManagerClass; - - typedef enum --- -2.17.1 - -- cgit v1.2.3 From 5120f24f0eec81d44754f0bcc645d3aa06d31e3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:30:02 +0100 Subject: gnu: gnome-keyring: Add missing input. * gnu/packages/gnome.scm (gnome-keyring)[native-inputs]: Add glib. [arguments]: Move "fix-docbook" phase after "unpack" phase. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 787d9ab074..ff102d40ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -705,25 +705,24 @@ GNOME Desktop.") (substitute* "po/Makefile.in.in" (("/bin/sh") (which "sh"))) #t)) - (add-before - 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.am" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) - ;; Rerun the whole thing to avoid version mismatch ("This is - ;; Automake 1.15.1, but the definition used by this - ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't - ;; use 'autoreconf' because it insists on running 'libtoolize'. - (invoke "autoconf") - (invoke "aclocal") - (invoke "automake" "-ac")))))) + (add-after 'unpack 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "docs/Makefile.am" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")) + ;; Rerun the whole thing to avoid version mismatch ("This is + ;; Automake 1.15.1, but the definition used by this + ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't + ;; use 'autoreconf' because it insists on running 'libtoolize'. + (invoke "autoconf") + (invoke "aclocal") + (invoke "automake" "-ac")))))) (inputs `(("libgcrypt" ,libgcrypt) ("linux-pam" ,linux-pam) @@ -733,6 +732,7 @@ GNOME Desktop.") (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") + ("glib" ,glib) ; for m4 macros ("python" ,python-2) ;for tests ("intltool" ,intltool) ("autoconf" ,autoconf) -- cgit v1.2.3 From 2fbe8cdb435a450133432bac8e232f8caa0939a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:32:15 +0100 Subject: gnu: gnome-settings-daemon: Update to 3.30.1.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.1.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ff102d40ee..886ad6dc6f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3240,7 +3240,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.28.1") + (version "3.30.1.2") (source (origin (method url-fetch) @@ -3249,7 +3249,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr")))) + "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 02710a9b558db8c5e56ab34a41ac6e30a1681a3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 19:50:29 +0100 Subject: gnu: network-manager: Update to 1.14.4. * gnu/packages/gnome.scm (network-manager): Update to 1.14.4. [source]: Simplify snippet. [arguments]: Pass more configure flags to use elogind; add phase "patch-ls-invocation"; adjust tests. [inputs]: Add coreutils. --- gnu/packages/gnome.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 886ad6dc6f..725a256e8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5290,7 +5290,7 @@ users.") (define-public network-manager (package (name "network-manager") - (version "1.10.10") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -5298,20 +5298,13 @@ users.") "NetworkManager-" version ".tar.xz")) (sha256 (base32 - "1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4")) + "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm")) + (modules '((guix build utils))) (snippet - '(begin - (use-modules (guix build utils)) - (substitute* "configure" - ;; Replace libsystemd-login with libelogind. - (("libsystemd-login") "libelogind")) - (substitute* "src/devices/wwan/nm-modem-manager.c" - (("systemd") "elogind")) - (substitute* "src/nm-session-monitor.c" - (("systemd") "elogind")) - (substitute* "./src/nm-logging.c" - (("systemd") "elogind")) - #t)))) + '(begin + (substitute* "src/devices/wwan/nm-modem-manager.c" + (("systemd") "elogind")) + #t)))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML @@ -5321,7 +5314,10 @@ users.") (doc (assoc-ref %outputs "doc")) (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") "/sbin/dhclient"))) - (list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind. + (list "--with-libnm-glib" ; needed by network-manager-applet + "--with-systemd-journal=no" + "--with-session-tracking=elogind" + "--with-suspend-resume=elogind" "--with-consolekit=no" "--with-crypto=gnutls" "--disable-config-plugin-ibft" @@ -5336,6 +5332,13 @@ users.") (string-append "--with-dhclient=" dhclient))) #:phases (modify-phases %standard-phases + ;; This bare "ls" invocation breaks some tests. + (add-after 'unpack 'patch-ls-invocation + (lambda _ + (substitute* "build-aux/ltmain.sh" + (("`ls -") + (string-append "`" (which "ls") " -"))) + #t)) (add-before 'configure 'pre-configure (lambda _ ;; These tests try to test aspects of network-manager's @@ -5348,26 +5351,24 @@ users.") (("src/platform/tests/test-cleanup-linux") " ") (("src/platform/tests/test-link-linux") " ") (("src/platform/tests/test-route-linux") " ") + (("src/devices/tests/test-acd") "") (("src/devices/tests/test-arping") " ") (("src/devices/tests/test-lldp") " ") (("src/tests/test-route-manager-linux") " ")) #t)) (add-after 'unpack 'delete-failing-tests (lambda _ - ;; FIXME: These four tests fail for unknown reasons. + ;; FIXME: These three tests fail for unknown reasons. ;; ERROR:libnm-core/tests/test-general.c:5842: ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0) ;; ERROR:libnm-core/tests/test-keyfile.c:647: ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL) ;; ERROR:libnm-core/tests/test-setting.c:907: ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner)) - ;; NetworkManager:ERROR:src/platform/tests/test-nmp-object.c:397: - ;; test_cache_link: assertion failed: (nmp_object_is_visible (obj_new)) (substitute* "Makefile.in" (("libnm-core/tests/test-general") " ") (("libnm-core/tests/test-keyfile") " ") - (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ") - (("src/platform/tests/test-nmp-object") " ")) + (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ")) #t)) (add-before 'check 'pre-check (lambda _ @@ -5398,7 +5399,8 @@ users.") ("python-dbus" ,python-dbus) ("python-pygobject" ,python-pygobject))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) ; for ls + ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("dbus-glib" ,dbus-glib) ("dnsmasq" ,dnsmasq) -- cgit v1.2.3 From cd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:17:59 +0100 Subject: gnu: network-manager-applet: Use meson build system. * gnu/packages/gnome.scm (network-manager-applet)[build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gcr. --- gnu/packages/gnome.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 725a256e8b..c584edc245 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5498,28 +5498,14 @@ to virtual private networks (VPNs) via OpenVPN.") (sha256 (base32 "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) - (build-system glib-or-gtk-build-system) - (arguments '(#:configure-flags '("--disable-migration") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (let ((mbpi (assoc-ref inputs - "mobile-broadband-provider-info")) - (iso-codes (assoc-ref inputs "iso-codes"))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end) - (string-append start "\"" mbpi "/share\", " end))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (ISO_3166_COUNTRY_CODES.*)" all start end) - (string-append start "\"" iso-codes - "/share\", " end))) - #t)))))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (native-inputs `(("intltool" ,intltool) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -5527,7 +5513,8 @@ to virtual private networks (VPNs) via OpenVPN.") ("gtk+" ,gtk+) ("network-manager" ,network-manager))) (inputs - `(("iso-codes" ,iso-codes) + `(("gcr" ,gcr) + ("iso-codes" ,iso-codes) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 817b3fd1d57f51db04b608769beffa1b4d7cf72b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:21:06 +0100 Subject: gnu: libdazzle: Update to 3.30.2. * gnu/packages/gnome.scm (libdazzle): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c584edc245..bc59c58d4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7903,7 +7903,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -7911,7 +7911,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From d0b19e445cd542b8336e47801c6aacd9361ed5a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 22:32:10 +0100 Subject: gnu: libgdata: Update to 0.17.9. * gnu/packages/gnome.scm (libgdata): Update to 0.17.9. [inputs]: Move glib, json-glib, and libsoup from here... [propagated-inputs]: ...to here. * gnu/packages/patches/libgdata-fix-tests.patch: Remove file. * gnu/packages/patches/libgdata-glib-duplicate-tests.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Remove patches. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 17 +- gnu/packages/patches/libgdata-fix-tests.patch | 325 --------------------- .../patches/libgdata-glib-duplicate-tests.patch | 16 - 4 files changed, 8 insertions(+), 352 deletions(-) delete mode 100644 gnu/packages/patches/libgdata-fix-tests.patch delete mode 100644 gnu/packages/patches/libgdata-glib-duplicate-tests.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 12a64b23f9..2051df8d85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,8 +997,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ - %D%/packages/patches/libgdata-fix-tests.patch \ - %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc59c58d4f..221c79e6a9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -357,10 +357,12 @@ relationship modeling, and network diagrams. The program supports various file formats like PNG, SVG, PDF and EPS.") (license license:gpl2+)))) +;; This is the unstable release, but it is required for the current stable +;; release of gvfs (1.38.1). (define-public libgdata (package (name "libgdata") - (version "0.16.1") + (version "0.17.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -368,10 +370,7 @@ formats like PNG, SVG, PDF and EPS.") name "-" version ".tar.xz")) (sha256 (base32 - "09q8h1129xjpw33rvzz7856drygxwlm0s64z9cm0vbmjxiqy0h47")) - (patches - (search-patches "libgdata-fix-tests.patch" - "libgdata-glib-duplicate-tests.patch")))) + "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45")))) (build-system gnu-build-system) (arguments '(#:phases @@ -391,14 +390,14 @@ formats like PNG, SVG, PDF and EPS.") ("uhttpmock" ,uhttpmock))) (inputs `(("cyrus-sasl" ,cyrus-sasl) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("json-glib" ,json-glib) - ("libsoup" ,libsoup))) + ("glib-networking" ,glib-networking))) (propagated-inputs `(("gcr" ,gcr) + ("glib" ,glib) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("json-glib" ,json-glib) ("liboauth" ,liboauth) + ("libsoup" ,libsoup) ("libxml2" ,libxml2))) (home-page "https://wiki.gnome.org/Projects/libgdata") (synopsis "Library for accessing online service APIs") diff --git a/gnu/packages/patches/libgdata-fix-tests.patch b/gnu/packages/patches/libgdata-fix-tests.patch deleted file mode 100644 index dc86b3ab5a..0000000000 --- a/gnu/packages/patches/libgdata-fix-tests.patch +++ /dev/null @@ -1,325 +0,0 @@ -From c87a112246e0bcbd5c3a8aa484a50c617d710dbf Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Fri, 12 Dec 2014 17:31:01 +0000 -Subject: [PATCH] tests: Eliminate ISO 8601 formatting workaround for dates - -Follow up to commit 732017e4e5235e28c578cc3367fa0c4548b65495. - -https://bugzilla.gnome.org/show_bug.cgi?id=739956 ---- - gdata/tests/calendar.c | 20 ++++++++++---------- - gdata/tests/general.c | 34 +++++++++++++++++----------------- - gdata/tests/tasks.c | 34 +++++++++++++++++----------------- - gdata/tests/youtube.c | 16 ++++++++-------- - 4 files changed, 52 insertions(+), 52 deletions(-) - -diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c -index bb1d609..c54ddda 100644 ---- a/gdata/tests/calendar.c -+++ b/gdata/tests/calendar.c -@@ -620,7 +620,7 @@ test_event_xml (void) - "" - "" - "" -- "" -+ "" - "" -@@ -706,7 +706,7 @@ test_event_xml_dates (void) - "" - "" - "" -- "" -+ "" - "" - ""); - -@@ -934,25 +934,25 @@ test_query_uri (void) - - /* Check the built query URI with a normal feed URI */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" -- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" -- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" -+ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" -+ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" - "&showdeleted=true"); - g_free (query_uri); - - /* …with a feed URI with a trailing slash */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/"); -- g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" -- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" -- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" -+ g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" -+ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" -+ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" - "&showdeleted=true"); - g_free (query_uri); - - /* …with a feed URI with pre-existing arguments */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/bar/?test=test&this=that"); - g_assert_cmpstr (query_uri, ==, "http://example.com/bar/?test=test&this=that&q=q&futureevents=true&orderby=starttime" -- "&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00" -- "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00" -+ "&recurrence-expansion-start=2009-04-17T15:00:00Z&recurrence-expansion-end=2010-04-17T15:00:00Z" -+ "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z" - "&ctz=America%2FLos_Angeles&max-attendees=15&showdeleted=true"); - g_free (query_uri); - -diff --git a/gdata/tests/general.c b/gdata/tests/general.c -index 237a908..f828d2e 100644 ---- a/gdata/tests/general.c -+++ b/gdata/tests/general.c -@@ -528,8 +528,8 @@ test_entry_parse_xml (void) - "" - "" - "Testing unhandled XML" -- "2009-01-25T14:07:37.000001+00:00" -- "2009-01-23T14:06:37.000001+00:00" -+ "2009-01-25T14:07:37Z" -+ "2009-01-23T14:06:37Z" - "Here we test unhandled XML elements." - "Test!" - "" -@@ -569,8 +569,8 @@ test_entry_parse_xml_kind_category (void) - "" - "" - "Testing kind categories" -- "2009-01-25T14:07:37.000001+00:00" -- "2009-01-23T14:06:37.000001+00:00" -+ "2009-01-25T14:07:37Z" -+ "2009-01-23T14:06:37Z" - "Here we test kind categories." - "" - "Escaped content & stuff" - "http://foo.com/?foo&bar" -- "2010-12-10T17:21:24.000001+00:00" -- "2010-12-10T17:21:24.000001+00:00" -+ "2010-12-10T17:21:24Z" -+ "2010-12-10T17:21:24Z" - "Summary & stuff" - "Free & open source" - "Content & things." -@@ -1106,7 +1106,7 @@ test_feed_escaping (void) - "" - "Test feed & stuff." - "http://foo.com?foo&bar" -- "2010-12-10T17:49:15.000001+00:00" -+ "2010-12-10T17:49:15Z" - ""); - g_object_unref (feed); - } -@@ -1157,28 +1157,28 @@ test_query_dates (void) - /* updated-min */ - gdata_query_set_updated_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_updated_min (query, -1); - - /* updated-max */ - gdata_query_set_updated_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_updated_max (query, -1); - - /* published-min */ - gdata_query_set_published_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_published_min (query, -1); - - /* published-max */ - gdata_query_set_published_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_published_max (query, -1); - -@@ -3127,7 +3127,7 @@ test_gd_reminder (void) - gdata_test_assert_xml (reminder, - "" - ""); -+ "absoluteTime='2005-06-07T00:55:00Z' method='alert'/>"); - g_object_unref (reminder); - } - -@@ -3218,8 +3218,8 @@ test_gd_when (void) - /* Check the outputted XML is the same */ - gdata_test_assert_xml (when, - "" -- ""); -+ ""); - g_object_unref (when); - - /* Now parse a time with different information */ -@@ -3258,7 +3258,7 @@ test_gd_when (void) - "" - "" -- "" -+ "" - "" - ""); - g_object_unref (when); -@@ -3278,7 +3278,7 @@ test_gd_when_escaping (void) - gdata_test_assert_xml (when, - "" - ""); -+ "startTime='2005-06-07T01:00:00Z' valueString='Value string & stuff!'/>"); - g_object_unref (when); - } - -diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c -index 7a5bc7e..7bf3174 100644 ---- a/gdata/tests/tasks.c -+++ b/gdata/tests/tasks.c -@@ -122,11 +122,11 @@ test_query_uri (void) - g_assert_cmpstr (query_uri, ==, - "http://example.com" - "?maxResults=10" -- "&updatedMin=1970-01-01T01:53:09.000001+00:00" -- "&completedMin=1970-01-01T01:34:38.000001+00:00" -- "&completedMax=1970-01-01T00:20:34.000001+00:00" -- "&dueMin=1970-01-01T00:39:05.000001+00:00" -- "&dueMax=1970-01-01T00:57:36.000001+00:00" -+ "&updatedMin=1970-01-01T01:53:09Z" -+ "&completedMin=1970-01-01T01:34:38Z" -+ "&completedMax=1970-01-01T00:20:34Z" -+ "&dueMin=1970-01-01T00:39:05Z" -+ "&dueMax=1970-01-01T00:57:36Z" - "&showCompleted=true" - "&showDeleted=true" - "&showHidden=true"); -@@ -148,11 +148,11 @@ test_query_uri (void) - g_assert_cmpstr (query_uri, ==, - "http://example.com" - "?maxResults=10" -- "&updatedMin=1970-01-01T01:53:09.000001+00:00" -- "&completedMin=1970-01-01T01:34:38.000001+00:00" -- "&completedMax=1970-01-01T00:20:34.000001+00:00" -- "&dueMin=1970-01-01T00:39:05.000001+00:00" -- "&dueMax=1970-01-01T00:57:36.000001+00:00" -+ "&updatedMin=1970-01-01T01:53:09Z" -+ "&completedMin=1970-01-01T01:34:38Z" -+ "&completedMax=1970-01-01T00:20:34Z" -+ "&dueMin=1970-01-01T00:39:05Z" -+ "&dueMax=1970-01-01T00:57:36Z" - "&showCompleted=false" - "&showDeleted=false" - "&showHidden=false"); -@@ -317,8 +317,8 @@ test_task_properties (void) - "\"title\": \"some-other-title\"," - "\"notes\": \"more-notes\"," - "\"status\": \"completed\"," -- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," -+ "\"due\": \"2014-08-30T17:20:00Z\"," -+ "\"completed\": \"2014-08-30T17:20:00Z\"," - "\"deleted\": true," - "\"hidden\": false" - "}"); -@@ -332,8 +332,8 @@ test_task_properties (void) - "\"title\": \"some-other-title\"," - "\"notes\": \"more-notes\"," - "\"status\": \"completed\"," -- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," -+ "\"due\": \"2014-08-30T17:20:00Z\"," -+ "\"completed\": \"2014-08-30T17:20:00Z\"," - "\"deleted\": false," - "\"hidden\": false" - "}"); -@@ -496,14 +496,14 @@ test_task_parser_normal (void) - "\"id\": \"some-id\"," - "\"etag\": \"some-etag\"," - "\"title\": \"some-title \\\"with quotes\\\"\"," -- "\"updated\": \"2014-08-30T19:40:00.000001+00:00\"," -+ "\"updated\": \"2014-08-30T19:40:00Z\"," - "\"selfLink\": \"http://some-uri/\"," - "\"parent\": \"some-parent-id\"," - "\"position\": \"some-position\"," - "\"notes\": \"Some notes!\"," - "\"status\": \"needsAction\"," -- "\"due\": \"2014-08-30T20:00:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T20:10:05.000001+00:00\"," -+ "\"due\": \"2014-08-30T20:00:00Z\"," -+ "\"completed\": \"2014-08-30T20:10:05Z\"," - "\"deleted\": false," - "\"hidden\": true," - /* Unhandled for the moment: */ -diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c -index a1e070a..1195bc3 100644 ---- a/gdata/tests/youtube.c -+++ b/gdata/tests/youtube.c -@@ -967,8 +967,8 @@ test_parsing_yt_recorded (void) - "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" - "Judas Priest - Painkiller" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1055,8 +1055,8 @@ test_parsing_yt_access_control (void) - "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" - "Judas Priest - Painkiller" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1255,8 +1255,8 @@ test_parsing_georss_where (void) - "xmlns:gml='http://www.opengis.net/gml'>" - "Some video somewhere" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1295,8 +1295,8 @@ test_parsing_georss_where (void) - "xmlns:gml='http://www.opengis.net/gml'>" - "Some video somewhere" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" --- -1.9.3 diff --git a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch b/gnu/packages/patches/libgdata-glib-duplicate-tests.patch deleted file mode 100644 index d5d8d064de..0000000000 --- a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c ---- a/gdata/tests/oauth1-authorizer.c 1969-12-31 19:00:00.000000000 -0500 -+++ b/gdata/tests/oauth1-authorizer.c 2017-05-27 19:35:30.551725678 -0400 -@@ -1045,10 +1045,10 @@ - /* Sync request-authentication-uri tests */ - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_request_authentication_uri_sync, tear_down_oauth1_authorizer_data); -- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, -+ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains1", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); -- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, -+ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains2", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_locale, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/cancellation", OAuth1AuthorizerData, NULL, -- cgit v1.2.3 From e762d943e5eebcc57b3f86ed117cd5ba203e54f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:33:01 +0100 Subject: gnu: gvfs: Update to 1.38.1. * gnu/packages/gnome.scm (gvfs): Update to 1.38.1. [build-system]: Use meson-build-system. [arguments]: Remove custom phases; add configure flags to build without systemd; set glib-or-gtk? flag; enable tests; add sub-directory to RUNPATH. [native-inputs]: Remove autoconf, automake, and libtool. [inputs]: Add elogind, gnome-online-accounts, libgdata, libnfs, and openssh. --- gnu/packages/gnome.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 221c79e6a9..cdf361e5fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages enchant) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) @@ -4161,7 +4162,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.36.2") + (version "1.38.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4169,21 +4170,20 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") name "-" version ".tar.xz")) (sha256 (base32 - "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4")))) - (build-system gnu-build-system) + "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + (build-system meson-build-system) (arguments - '(#:tests? #f ; XXX: requiring `pidof' - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-broken-autogen-script - (lambda _ (delete-file "autogen.sh") #t))))) + '(#:glib-or-gtk? #t + #:configure-flags + (list "-Dsystemduserunitdir=no" + "-Dtmpfilesdir=no" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/gvfs")))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("autoconf" ,autoconf) - ("automake" ,automake) ("gettext" ,gettext-minimal) ("gtk-doc" ,gtk-doc) - ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -4191,23 +4191,28 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("dbus" ,dbus) + ("elogind" ,elogind) ("fuse" ,fuse) ("gcr" ,gcr) ("glib" ,glib) + ("gnome-online-accounts" ,gnome-online-accounts) ("libarchive" ,libarchive) ("libbluray" ,libbluray) ("libcap" ,libcap) ("libcdio-paranoia" ,libcdio-paranoia) ("libgcrypt" ,libgcrypt) + ("libgdata" ,libgdata) ("libgphoto2" ,libgphoto2) ("libgudev" ,libgudev) ("libimobiledevice" ,libimobiledevice) ("libmtp" ,libmtp) + ("libnfs" ,libnfs) ("libsecret" ,libsecret) ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("nettle" ,nettle) ; XXX: required by libarchive.pc + ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) (home-page "https://wiki.gnome.org/gvfs/") -- cgit v1.2.3 From ec66ebd4cd97f05d3f968062557ed92b2f4e1c4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 11:05:26 +0100 Subject: gnu: nautilus: Update to 3.30.4. * gnu/packages/gnome.scm (nautilus): Update to 3.30.4. [inputs]: Add libseccomp. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cdf361e5fc..84c3615974 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6238,7 +6238,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "3.28.1") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6246,7 +6246,7 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w")))) + "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -6267,6 +6267,7 @@ shared object databases, search tools and indexing.") ("exempi" ,exempi) ("gnome-desktop" ,gnome-desktop) ("gnome-autoar" ,gnome-autoar) + ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) -- cgit v1.2.3 From bf6cb316864d975fad392b771c7ffe2056d5f0c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 12:22:34 +0100 Subject: gnu: gnome-tweak-tool: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-tweak-tool): Deprecate and rename... (gnome-tweaks): ...to this. Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Adjust configure flags; pass glib-or-gtk? flag; remove custom phases that are now provided by the meson-build-system; add phases "wrap" and "wrap-gi-typelib". [native-inputs]: Remove meson-for-build and ninja. [home-page]: Update. [description]: Use "Tweaks" instead of "Tweak Tool". * gnu/packages/patches/gnome-tweak-tool-search-paths.patch: Rename file... * gnu/packages/patches/gnome-tweaks-search-paths.patch: ...to this. * gnu/local.mk (dist_patch_DATA): Update patch file name. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 84c3615974..47100579b8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6792,7 +6792,7 @@ existing databases over the internet.") (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6802,7 +6802,7 @@ existing databases over the internet.") (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp")))) + "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From a68544a81dafb7e1b5bb1ce90d9200fb5a883551 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:39:55 +0100 Subject: gnu: colord: Update to 1.4.3. * gnu/packages/gnome.scm (colord): Update to 1.4.3. [build-system]: Use meson-build-system. [arguments]: Add glib-or-gtk? flag; update configure flags; remove phase "patch-/bin/true"; add phase "patch-build-system". [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gusb and python-wrapper. --- gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47100579b8..87e997c630 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2992,7 +2992,7 @@ keyboard shortcuts.") (define-public colord (package (name "colord") - (version "1.1.8") + (version "1.4.3") (source (origin (method url-fetch) @@ -3000,38 +3000,42 @@ keyboard shortcuts.") name "-" version ".tar.xz")) (sha256 (base32 - "01w97rgzk4qi6fp03scq5jyw0ayx11b479p7dkm2r77k84b9agph")))) - (build-system glib-or-gtk-build-system) + "1xwxahg9mgmapc16xkb4kgmc40zpadrwav33xqmn6cgaw6g6d3ls")))) + (build-system meson-build-system) (arguments - '(;; The tests want to run valgrind. Punt for now. + '(;; FIXME: One test fails: + ;; /colord/icc-store (in lib/colord/colord-self-test-private): + ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got + ;; application/x-zerosize #:tests? #f - #:configure-flags (list "--localstatedir=/var" - ;; GUSB not packaged yet. - "--disable-gusb" + #:glib-or-gtk? #t + #:configure-flags (list "-Dlocalstatedir=/var" ;; No dep on systemd. - "--disable-systemd-login" + "-Dsystemd=false" ;; Wants to install to global completion dir; ;; punt. - "--disable-bash-completion" + "-Dbash_completion=false" ;; colord-gtk not packaged yet. - "--disable-session-example" - "--with-daemon-user=colord" - "--enable-sane" - (string-append "--with-udevrulesdir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) + "-Dsession_example=false" + "-Ddaemon_user=colord" + "-Dsane=true" + ;; Requires spotread + "-Dargyllcms_sensor=false" + ;; TODO: Requires docbook2x + "-Dman=false") #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true"))) - (substitute* "src/Makefile.in" - (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;") - "if test -w $(DESTDIR)$(localstatedir);"))))))) + (add-before 'configure 'patch-build-system + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "rules/meson.build" + (("udev.get_pkgconfig_variable\\('udevdir'\\)") + (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("libtool" ,libtool) ("intltool" ,intltool))) (propagated-inputs @@ -3041,10 +3045,12 @@ keyboard shortcuts.") ("lcms" ,lcms))) (inputs `(("dbus-glib" ,dbus-glib) + ("gusb" ,gusb) ("libgudev" ,libgudev) ("libusb" ,libusb) ("sqlite" ,sqlite) ("polkit" ,polkit) + ("python" ,python-wrapper) ("sane-backends" ,sane-backends))) (home-page "https://www.freedesktop.org/software/colord/") (synopsis "Color management service") -- cgit v1.2.3 From ec7d4bc7ac1e812508cbcb15bf93bb0e5cf101b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:02 +0100 Subject: gnu: eog: Update to 3.28.4. * gnu/packages/gnome.scm (eog): Update to 3.28.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87e997c630..6cb78ad55d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4037,7 +4037,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (define-public eog (package (name "eog") - (version "3.28.2") + (version "3.28.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4045,7 +4045,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") name "-" version ".tar.xz")) (sha256 (base32 - "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0")))) + "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8748e29c563d9315ce34579b0a2ae26d739a5f21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:31 +0100 Subject: gnu: epiphany: Update to 3.30.2. * gnu/packages/gnome.scm (epiphany): Update to 3.30.2. [inputs]: Add libdazzle. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6cb78ad55d..699026386b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4385,7 +4385,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.28.3.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4393,7 +4393,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9")))) + "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) (build-system meson-build-system) (arguments @@ -4427,6 +4427,7 @@ a secret password store, an adblocker, and a modern UI.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("json-glib" ,json-glib) ("iso-codes" ,iso-codes) + ("libdazzle" ,libdazzle) ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libxslt" ,libxslt) -- cgit v1.2.3 From 9d029b7fc948208812be989457b28955246cbf7e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:43:01 +0100 Subject: gnu: yelp: Update to 3.30.0. * gnu/packages/gnome.scm (yelp): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 699026386b..0c10de7c18 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4527,7 +4527,7 @@ to format Docbook and Mallard documents.") (define-public yelp (package (name "yelp") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4535,7 +4535,7 @@ to format Docbook and Mallard documents.") name "-" version ".tar.xz")) (sha256 (base32 - "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8")))) + "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 9583e8a5c13dca13b1425c5e833ba1ba3d7a177e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:45:06 +0100 Subject: gnu: yelp-xsl: Update to 3.30.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c10de7c18..d697bda1f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ of running programs and invoke methods on those interfaces.") name "-" version ".tar.xz")) (sha256 (base32 - "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc")))) + "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 45caa055407b72d413d8b434c15006473fdd04ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 21:10:12 +0100 Subject: gnu: libgnome-games-support: Update to 1.4.2. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.4.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d697bda1f2..d6cf0e13d5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3668,7 +3668,7 @@ queries upon that data.") (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3676,7 +3676,7 @@ queries upon that data.") name "-" version ".tar.xz")) (sha256 (base32 - "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1")))) + "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From b468eedcb8da62587e33e5e3671dc4bd34cfaf34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:11:43 +0100 Subject: gnu: evolution-data-server: Update to 3.30.2. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.2. [arguments]: Enable tests; add phase to disable failing tests; update phase "patch-paths". [inputs]: Add libcanberra. --- gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6cf0e13d5..8a30795bdd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5128,7 +5128,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5136,17 +5136,14 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") name "-" version ".tar.xz")) (sha256 (base32 - "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3")))) + "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments - '(;; XXX FIXME: 11/85 tests are failing. - #:tests? #f - #:configure-flags - (let* ((lib (string-append (assoc-ref %outputs "out") - "/lib")) - (runpaths (map (lambda (s) (string-append - lib "/evolution-data-server/" s)) + '(#:configure-flags + (let* ((lib (string-append (assoc-ref %outputs "out") "/lib")) + (runpaths (map (lambda (s) + (string-append lib "/evolution-data-server/" s)) '("addressbook-backends" "calendar-backends" "camel-providers" "credential-modules" "registry-modules")))) @@ -5167,9 +5164,25 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; tests/book-migration/test-migration.c:160:test_fetch_contacts: + ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20) + (delete-file-recursively "tests/book-migration") + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(book-migration\\)") "")) + ;; tests/libedata-cal/test-cal-meta-backend.c:1328:test_get_attachment_uris: + ;; assertion failed (uris->data == expected_uri): + ;; ("" == "file:///tests/libedata-cal/components/event-1.ics") + (substitute* "tests/libedata-cal/CMakeLists.txt" + (("test-cal-meta-backend") "")) + #t)) (add-after 'unpack 'patch-paths (lambda _ - (substitute* "tests/test-server-utils/e-test-server-utils.c" + (substitute* '("tests/test-server-utils/e-test-server-utils.c" + "tests/libedata-book/data-test-utils.c" + "tests/libedata-book/test-book-cache-utils.c" + "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) (add-before 'configure 'dont-override-rpath @@ -5221,6 +5234,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") ("gcr" ,gcr) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) + ("libcanberra" ,libcanberra) ("libgweather" ,libgweather) ("mit-krb5" ,mit-krb5) ("openldap" ,openldap) -- cgit v1.2.3 From b63c06f1d712b2cbd336a07621e9d28bdf803620 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 May 2019 14:13:35 +0200 Subject: gnu: evolution-data-server: Do not split outputs. A binary in $out/libexec depends on libedataserverui libraries, so the split would require mutually recursive output dependencies. * gnu/packages/gnome.scm (evolution-data-server)[outputs]: Remove field. [arguments]: Remove "split" phase. (gnome-calendar, gnome-todo, evolution)[inputs]: Adjust. --- gnu/packages/gnome.scm | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8a30795bdd..8dc60daa92 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5137,7 +5137,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (sha256 (base32 "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) - (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5191,28 +5190,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") ;; CMakeLists.txt hard-codes runpath to just the libdir. ;; Remove it so the configure flag is respected. (("SET\\(CMAKE_INSTALL_RPATH .*") "")) - #t)) - (add-after 'install 'split - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libedsui (assoc-ref outputs "libedataserverui"))) - (for-each (lambda (file) - (mkdir-p (dirname (string-append libedsui file))) - (rename-file (string-append out file) - (string-append libedsui file))) - '("/lib/pkgconfig/libedataserverui-1.2.pc" - "/lib/libedataserverui-1.2.so" - "/lib/libedataserverui-1.2.so.2" - "/lib/libedataserverui-1.2.so.2.0.0" - "/lib/girepository-1.0/EDataServerUI-1.2.typelib" - "/include/evolution-data-server/libedataserverui" - "/share/gir-1.0/EDataServerUI-1.2.gir" - "/share/vala/vapi/libedataserverui-1.2.vapi" - "/share/vala/vapi/libedataserverui-1.2.deps")) - (substitute* (string-append libedsui "/lib/pkgconfig/" - "libedataserverui-1.2.pc") - ((out) libedsui)) - #t)))))) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) @@ -6708,7 +6686,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libdazzle" ,libdazzle) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("geoclue" ,geoclue))) (home-page "https://wiki.gnome.org/Apps/Calendar") @@ -6756,7 +6734,7 @@ desktop. It supports multiple calendars, month, week and year view.") (inputs `(("rest" ,rest) ; For Todoist plugin ("json-glib" ,json-glib) ; For Todoist plugin - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libical" ,libical) ("libpeas" ,libpeas) ("python-pygobject" ,python-pygobject) @@ -8005,7 +7983,7 @@ generic enough to work for everyone.") ("gtkspell3" ,gtkspell3) ("highlight" ,highlight) ("libcanberra" ,libcanberra) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("libnotify" ,libnotify) ("libsoup" ,libsoup) -- cgit v1.2.3 From 9b848f0364d296339fbd13e4de104f4eb9fa6970 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:13:26 +0100 Subject: gnu: gnome-online-accounts: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8dc60daa92..a68ddc0757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5075,7 +5075,7 @@ window manager.") (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5083,7 +5083,7 @@ window manager.") name "-" version ".tar.xz")) (sha256 (base32 - "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47")))) + "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From 5339d2bbeb8c560237376dacd450f295de00decd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:26:25 +0100 Subject: gnu: gnome-maps: Update to 3.30.2.1. * gnu/packages/geo.scm (gnome-maps): Update to 3.30.2.1. [build-system]: Use meson-build-system. [arguments]: Remove configure flags; set glib-or-gtk? flag; update "wrap" phase. [native-inputs]: Add gtk+:bin. --- gnu/packages/geo.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ec5ace3519..2c511c7193 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -29,6 +29,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (guix build-system r) @@ -103,7 +104,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.28.2") + (version "3.30.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -111,20 +112,19 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7")))) - (build-system glib-or-gtk-build-system) + "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57")))) + (build-system meson-build-system) (arguments - `(#:configure-flags ;; Ensure that geoclue is referred to by output. - (list (string-append "LDFLAGS=-L" - (assoc-ref %build-inputs "geoclue") "/lib") - (string-append "CFLAGS=-I" - (assoc-ref %build-inputs "geoclue") "/include")) + `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (geocode-glib-path (string-append + (assoc-ref inputs "geocode-glib") + "/lib")) (goa-path (string-append (assoc-ref inputs "gnome-online-accounts") "/lib")) @@ -135,12 +135,15 @@ topology functions.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) ;; There seems to be no way to embed the path of - ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and - ;; libjavascriptcoregtk-4.0.so.18. - `("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path))) + ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37, + ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0 + `("LD_LIBRARY_PATH" ":" prefix (,goa-path + ,webkitgtk-path + ,geocode-glib-path))) #t)))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 25e9846d113c06b7695a501803066af90a37fbff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Dec 2018 09:02:16 +0100 Subject: gnu: gtksourceview: Update to 4.0.3. * gnu/packages/gtk.scm (gtksourceview): Update to 4.0.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1353dbb261..7f6218ee92 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -398,7 +398,7 @@ printing and other features typical of a source code editor.") (define-public gtksourceview (package (name "gtksourceview") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gtksourceview/" @@ -406,7 +406,7 @@ printing and other features typical of a source code editor.") "gtksourceview-" version ".tar.xz")) (sha256 (base32 - "1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm")))) + "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From e402eae6d4593a72ff90e77422c9e9f333144c1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:21 +0100 Subject: gnu: mutter: Update to 3.30.2. * gnu/packages/gnome.scm (mutter): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a68ddc0757..a243cf1f60 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4971,7 +4971,7 @@ to display dialog boxes from the commandline and shell scripts.") (define-public mutter (package (name "mutter") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4979,7 +4979,7 @@ to display dialog boxes from the commandline and shell scripts.") name "-" version ".tar.xz")) (sha256 (base32 - "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg")))) + "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are -- cgit v1.2.3 From bd0dc2df04a1550f41d3d5c7cc2c26ad12468b36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:33 +0100 Subject: gnu: gnome-shell: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-shell): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a243cf1f60..a126596a09 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5917,7 +5917,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5925,7 +5925,7 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7")) + "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2")) (patches (search-patches "gnome-shell-theme.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From b3640e79f648992fe3c58bacd931bdfbad444c1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:09 +0200 Subject: gnu: yelp-xsl: Update to 3.32.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.32.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a126596a09..e7d7e913b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.30.1") + (version "3.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ of running programs and invoke methods on those interfaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) + "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 6898f5b45b0441a275254a2cd1c0c9195bc08cf8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:54:21 +0200 Subject: gnu: glib: Update to 2.60.4. * gnu/packages/glib.scm (glib): Update to 2.60.4. [source](snippet): New field. [arguments]: Remove obsolete DETERMINISTIC_BUILD variable. Disable two tests, and override the 'check' phase. Remove <#:parallel-build?>. --- gnu/packages/glib.scm | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9acbfd8386..0383aec0da 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -161,7 +161,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.58.1") + (version "2.60.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -169,8 +169,14 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp")) - (patches (search-patches "glib-tests-timer.patch")))) + "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b")) + (patches (search-patches "glib-tests-timer.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) (build-system meson-build-system) (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python @@ -198,9 +204,6 @@ shared NFS home directories.") (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For building deterministic pyc files - (setenv "DETERMINISTIC_BUILD" "1") - ;; For tests/gdatetime.c. (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") @@ -281,9 +284,22 @@ shared NFS home directories.") ("gio/tests/gdbus-unix-addresses.c" (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch"))))) + "/gdbus/x11-autolaunch")) + + ("gio/tests/gsocketclient-slow.c" + (;; These tests tries to resolve "localhost", and fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/delayed")) + + ))) (for-each (lambda (x) (apply disable x)) failing-tests) #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) ;; TODO: meson does not permit the bindir to be outside of prefix. ;; See https://github.com/mesonbuild/meson/issues/2561 ;; We can remove this once meson is patched. @@ -302,16 +318,12 @@ shared NFS home directories.") (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=\\$\\{prefix\\}/bin") "") (("=\\$\\{bindir\\}/") "=")) - #t)))) + #t)))))) ;; TODO: see above for explanation. ;; #:configure-flags (list (string-append "--bindir=" ;; (assoc-ref %outputs "bin") ;; "/bin")) - ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a - ;; file that gets compiled possibly before it has been fully generated. - #:parallel-tests? #f)) - (native-search-paths ;; This variable is not really "owned" by GLib, but several related ;; packages refer to it: gobject-introspection's tools use it as a search -- cgit v1.2.3 From 273c30bec644172e7b9300fa7fc28e6dad67941e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:28 +0200 Subject: gnu: gobject-introspection: Update to 1.60.2. * gnu/packages/glib.scm (gobject-introspection): Update to 1.60.2. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0383aec0da..a4ae7b55bc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -349,14 +349,14 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.58.1") + (version "1.60.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29")) + (base32 "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- cgit v1.2.3 From 9644ac6f4d39492129f90188a32d5931eb30ab8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:53 +0200 Subject: gnu: harfbuzz: Update to 2.5.2. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7f6218ee92..43888ab23f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,7 +178,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -186,7 +186,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.xz")) (sha256 (base32 - "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d")))) + "12vya82hb2yfg92735kjql7d9kxpz64hs1jhjvnzagdy5fdcz3vw")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From f2a0f03b57b102c7369a787621f5839758d814ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:08:54 +0200 Subject: gnu: gobject-introspection: Build with Meson. The 1.60.x releases are the last ones to support Autotools. * gnu/packages/glib.scm (gobject-introspection)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove <#:parallel-build?> and <#:tests?>. [native-inputs]: Remove AUTOCONF and AUTOMAKE. --- gnu/packages/glib.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a4ae7b55bc..d8d339eebe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -28,7 +28,6 @@ (define-module (gnu packages glib) #:use-module (gnu packages) - #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -361,15 +360,9 @@ dynamic loading, and an object system.") "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" "gobject-introspection-absolute-shlib-path.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(;; The build system has at least one race condition involving Gio-2.0.gir - ;; which causes intermittent failures, as of 1.56.0. - #:parallel-build? #f - ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes - ;; some tests to fail. - #:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ @@ -384,9 +377,7 @@ dynamic loading, and an object system.") ("python" ,python-wrapper) ("zlib" ,zlib))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("glib" ,glib "bin") + `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using -- cgit v1.2.3 From d93dab5d7f3c5596fca0bf9476f051c23931eb83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:33:07 +0200 Subject: gnu: glibmm: Update to 2.60.0. * gnu/packages/glib.scm (glibmm): Update to 2.60.0. [arguments]: Remove <#:configure-flags>. --- gnu/packages/glib.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d8d339eebe..62543fe114 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -555,7 +555,7 @@ has an ease of use unmatched by other C++ callback libraries.") (define glibmm (package (name "glibmm") - (version "2.58.0") + (version "2.60.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -563,13 +563,10 @@ has an ease of use unmatched by other C++ callback libraries.") "/glibmm-" version ".tar.xz")) (sha256 (base32 - "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk")))) + "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3")))) (build-system gnu-build-system) (arguments - `(;; XXX: Some tests uses C++14 features. Remove this when the default - ;; compiler is >= GCC6. - #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda _ -- cgit v1.2.3 From 2d6872f6afc6dd023b676327867e2dba237b5062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:42:33 +0200 Subject: gnu: vala: Update to 0.44.5. * gnu/packages/gnome.scm (vala): Update to 0.44.5. [native-inputs]: Remove superfluous GREP and SED. --- gnu/packages/gnome.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e7d7e913b4..5537ca6951 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.42.3") + (version "0.44.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) + "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2277,8 +2277,6 @@ passwords in the GNOME keyring.") ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("grep" ,grep) - ("sed" ,sed) ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests (inputs -- cgit v1.2.3 From 8bdacad26b1209dd4d95f5ca093a9178feb12f5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:45:14 +0200 Subject: gnu: libcroco: Update to 0.6.13. * gnu/packages/patches/libcroco-CVE-2017-7960.patch, gnu/packages/patches/libcroco-CVE-2017-7961.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (libcroco): Update to 0.6.13. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 7 +-- gnu/packages/patches/libcroco-CVE-2017-7960.patch | 66 ----------------------- gnu/packages/patches/libcroco-CVE-2017-7961.patch | 50 ----------------- 4 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7960.patch delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7961.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2051df8d85..d375b8cd1d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,8 +989,6 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ - %D%/packages/patches/libcroco-CVE-2017-7960.patch \ - %D%/packages/patches/libcroco-CVE-2017-7961.patch \ %D%/packages/patches/libdrm-symbol-check.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5537ca6951..f8a6a774da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1256,18 +1256,15 @@ the GNOME desktop environment.") (define-public libcroco (package (name "libcroco") - (version "0.6.12") + (version "0.6.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches - (search-patches "libcroco-CVE-2017-7960.patch" - "libcroco-CVE-2017-7961.patch")) (sha256 (base32 - "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) + "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libcroco-CVE-2017-7960.patch b/gnu/packages/patches/libcroco-CVE-2017-7960.patch deleted file mode 100644 index 0319c7389f..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7960.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2017-7960: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7960 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 - -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -cgit v0.12 - diff --git a/gnu/packages/patches/libcroco-CVE-2017-7961.patch b/gnu/packages/patches/libcroco-CVE-2017-7961.patch deleted file mode 100644 index 675dbe4f08..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7961.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix CVE-2017-7961: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7961 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 - -From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: tknzr: support only max long rgb values - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index 1a7cfeb..1548c35 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -cgit v0.12 - -- cgit v1.2.3 From 1dcca83afbc2a5b66f61f389971d257d2d65100d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Jun 2019 18:00:17 +0200 Subject: gnu: guile: Update to 2.2.5. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.5. [arguments]: Remove. (guile-2.2.5): Remove. --- gnu/packages/guile.scm | 47 +++-------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 25077e4f75..efb19b456f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -216,7 +216,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.4") + (version "2.2.5") (source (origin (method url-fetch) @@ -226,7 +226,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) + "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")) (modules '((guix build utils))) (patches (search-patches "guile-2.2-skip-oom-test.patch")) @@ -247,36 +247,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.2"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.2/site-ccache"))))) - - (arguments - (if (%current-target-system) - (substitute-keyword-arguments (package-arguments guile-2.0) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'sacrifice-elisp-support - (lambda _ - ;; Cross-compiling language/elisp/boot.el fails, so - ;; sacrifice it. See - ;; - ;; for the upstream fix. - (substitute* "module/Makefile.in" - (("language/elisp/boot\\.el") - "\n")) - #t)) - ,@(if (hurd-target?) - `((add-after 'unpack 'allow-madvise-ENOSYS - (lambda _ - ;; Do not warn about ENOSYS on 'madvise'. This is - ;; what Guile commit - ;; 45e4ace6603e00b297e6542362273041aebe7305 does. - ;; TODO: Remove for Guile >= 2.2.5. - (substitute* "libguile/vm.c" - (("perror \\(\"madvise failed\"\\)") - "if (errno != ENOSYS) perror (\"madvised failed\");")) - #t))) - '())))) - (package-arguments guile-2.0))))) + (files '("lib/guile/2.2/site-ccache"))))))) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used @@ -288,18 +259,6 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) -(define-public guile-2.2.5 - (package - (inherit guile-2.2) - (version "2.2.5") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")))))) - (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779") -- cgit v1.2.3 From 9c2563a80b6f1d8fb8677f5314e6180ea9916aa5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Jun 2019 18:11:25 +0200 Subject: build-system/python: Export 'python-version'. * guix/build/python-build-system.scm (get-python-version): Rename to... (python-version): ... this. Update callers. Make public. * gnu/packages/gstreamer.scm (python-gst)[arguments]: Adjust accordingly. * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. * gnu/packages/openldap.scm (389-ds-base)[arguments]: Import (guix build python-build-system). Use 'python-version'. * gnu/packages/package-management.scm (conda)[arguments]: Use 'python-version'. --- gnu/packages/gstreamer.scm | 4 +--- gnu/packages/machine-learning.scm | 3 +-- gnu/packages/openldap.scm | 13 +++++-------- gnu/packages/package-management.scm | 3 +-- guix/build/python-build-system.scm | 11 ++++++----- 5 files changed, 14 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 2a818e078c..39a4eb5fc0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -447,9 +447,7 @@ compression formats through the use of the libav library.") (guix build python-build-system)) #:configure-flags (let* ((python (assoc-ref %build-inputs "python")) - (python-version ((@@ (guix build python-build-system) - get-python-version) - python)) + (python-version (python-version python)) (python-sitedir (string-append "lib/python" python-version "/site-packages"))) (list (string-append diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ba7772f66b..e216b9474a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -210,8 +210,7 @@ classification.") (assoc-ref %standard-phases 'check)) (add-before 'check 'fix-PYTHONPATH (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((python-version ((@@ (guix build python-build-system) - get-python-version) + (let ((python-version (python-version (assoc-ref inputs "python")))) (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 43f111cf40..2f80920ed4 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -211,7 +211,11 @@ servers from Python programs.") (arguments `(#:modules ((srfi srfi-1) (guix build gnu-build-system) + ((guix build python-build-system) + #:select (python-version)) (guix build utils)) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:configure-flags (list (string-append "--with-db=" (assoc-ref %build-inputs "bdb")) @@ -263,16 +267,9 @@ servers from Python programs.") (add-after 'unpack 'fix-install-location-of-python-tools (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (get-python-version - ;; FIXME: copied from python-build-system - (lambda (python) - (let* ((version (last (string-split python #\-))) - (components (string-split version #\.)) - (major+minor (take components 2))) - (string-join major+minor ".")))) (pythondir (string-append out "/lib/python" - (get-python-version (assoc-ref inputs "python")) + (python-version (assoc-ref inputs "python")) "/site-packages/"))) ;; Install directory must be on PYTHONPATH. (setenv "PYTHONPATH" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e1e7d6a5a0..81b3c321e4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -831,8 +831,7 @@ This package provides Conda as a library.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (target (string-append out "/lib/python" - ((@@ (guix build python-build-system) - get-python-version) + (python-version (assoc-ref inputs "python")) "/site-packages/"))) ;; The installer aborts if the target directory is not on diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 7c00306b3e..09bd8465c8 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015, 2016, 2018 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver @@ -32,6 +32,7 @@ #:export (%standard-phases add-installed-pythonpath site-packages + python-version python-build)) ;; Commentary: @@ -147,7 +148,7 @@ (format #t "test suite not run~%")) #t) -(define (get-python-version python) +(define (python-version python) (let* ((version (last (string-split python #\-))) (components (string-split version #\.)) (major+minor (take components 2))) @@ -158,7 +159,7 @@ (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs "python"))) (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages/"))) (define (add-installed-pythonpath inputs outputs) @@ -202,7 +203,7 @@ when running checks after installing the package." (python (assoc-ref inputs "python")) (var `("PYTHONPATH" prefix ,(cons (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages") (search-path-as-string->list (or (getenv "PYTHONPATH") "")))))) @@ -222,7 +223,7 @@ installed with setuptools." (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs "python")) (site-packages (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages")) (easy-install-pth (string-append site-packages "/easy-install.pth")) (new-pth (string-append site-packages "/" name ".pth"))) -- cgit v1.2.3 From 06172df545f1253463bc51a9e2c39bf2133f3f23 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 29 Jun 2019 22:34:20 +0200 Subject: gnu: flex: Build bison-for-tests sequentially. This is a followup to b1593c1c4fd8f4fc6df4c43cab51334426e3aa76. * gnu/packages/flex.scm (flex)[inputs](bison-for-tests): Use 'substitute-keyword-arguments' instead of overriding them altogether. This ensures that #:parallel-build? and #:parallel-tests? are preserved. --- gnu/packages/flex.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index e08b0c13db..6038e92744 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages m4) #:use-module (gnu packages man) @@ -47,8 +48,10 @@ (let ((bison-for-tests (package (inherit bison) - ;; Disable tests, since they require flex. - (arguments '(#:tests? #f)) + (arguments + ;; Disable tests, since they require flex. + (substitute-keyword-arguments (package-arguments bison) + ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests) ("indent" ,indent)))) -- cgit v1.2.3 From c248e9b0222eb11e14389c30e0bfa29774b366a5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 29 Jun 2019 23:04:08 +0200 Subject: gnu: gawk: Update to 5.0.1. * gnu/packages/gawk.scm (gawk): Update to 5.0.1. --- gnu/packages/gawk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 9b7b93651f..d8494e9c1c 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -30,13 +30,13 @@ (define-public gawk (package (name "gawk") - (version "5.0.0") + (version "5.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "01j409gharghgf7h0pjzywkimhz2ldrxf85nvf3sv1dl1vnr3w2h")))) + (base32 "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9011f748a5762d8932542e0c12e030f6ae6b8f6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:10:56 +0200 Subject: gnu: harfbuzz: Update to 2.5.3. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e4d6af51c5..10e58808a5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -179,7 +179,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -187,7 +187,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.xz")) (sha256 (base32 - "12vya82hb2yfg92735kjql7d9kxpz64hs1jhjvnzagdy5fdcz3vw")))) + "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 6c6e56fe5339b8c6fd401260e8e0b507fb778f80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:11:19 +0200 Subject: gnu: nettle: Update to 3.5.1. * gnu/packages/nettle.scm (nettle): Update to 3.5.1. --- gnu/packages/nettle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 1f91b74d8b..f5e7188ff0 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -75,14 +75,14 @@ themselves.") ;; This version is not API-compatible with version 2. In particular, lsh ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) - (version "3.4.1") + (version "3.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" version ".tar.gz")) (sha256 (base32 - "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr")))) + "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m")))) (arguments (substitute-keyword-arguments (package-arguments nettle-2) ((#:configure-flags flags) -- cgit v1.2.3 From 984ab5daf96ad9a6ea676ab70109309acce712fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:11:39 +0200 Subject: gnu: poppler: Update to 0.78.0. * gnu/packages/pdf.scm (poppler): Update to 0.78.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6318a4b309..1bf171ceaf 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -85,14 +85,14 @@ (define-public poppler (package (name "poppler") - (version "0.77.0") + (version "0.78.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0szk09hk8r98ck9cx97nqwrbzdn1q41ic8dq8j1aar6dpi6fnrvj")))) + "1hiqg4wc6lpf52x3k630w2y1x90fhb6vfqdqg0xrqcx7hwqxsbv2")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From 1b0668272cb44d78a94b65ae0e004903b78e4138 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:12:01 +0200 Subject: gnu: python-more-itertools: Update to 7.1.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3e2b5f0d7..3ae5b1248f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14446,14 +14446,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "7.0.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) + "16phg2f2dvm6ci5wr49ncha5lmc0m2in3bsl33c61vzca4gkvd4b")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From 25280065814aecd7ce56baf4866b0c05acf8028b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:13:49 +0200 Subject: build-system/meson: Do not inherit the 'bootstrap' phase. * guix/build/meson-build-system.scm (%standard-phases): Remove 'bootstrap'. * gnu/packages/glib.scm (glib)[arguments]: Adjust accordingly. --- gnu/packages/glib.scm | 1 - guix/build/meson-build-system.scm | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 62543fe114..eae8297531 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -200,7 +200,6 @@ shared NFS home directories.") (arguments `(#:phases (modify-phases %standard-phases - (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index d0975fcab0..8043a84abb 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -108,6 +108,7 @@ for example libraries only needed for the tests." ;; from the gnu-build-system. If the glib-or-gtk? key is #f (the default) ;; then the extra phases will be removed again in (guix build-system meson). (modify-phases glib-or-gtk:%standard-phases + (delete 'bootstrap) (replace 'configure configure) (replace 'build build) (replace 'check check) -- cgit v1.2.3 From 61f34ae5bbbb492254a3e618548d7019c3b3898f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 14:18:35 +0200 Subject: gnu: libssh2: Update to 1.9.0. * gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/ssh.scm (libssh2): Update to 1.9.0. [source](patches): Remove. --- gnu/local.mk | 1 - .../libssh2-fix-build-failure-with-gcrypt.patch | 33 ---------------------- gnu/packages/ssh.scm | 14 ++------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f90d0cf402..2e4faeb4c4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1020,7 +1020,6 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-12562.patch \ - %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ diff --git a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch b/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch deleted file mode 100644 index 4133be7fc9..0000000000 --- a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -This fixes a regression introduced in 1.8.0 where libssh2 fails to build -with the gcrypt backend. - -Upstream bug URL: - -https://github.com/libssh2/libssh2/issues/150 - -Patch copied from upstream source repository: - -https://github.com/libssh2/libssh2/commit/ced924b78a40126606797ef57a74066eb3b4b83f - -From ced924b78a40126606797ef57a74066eb3b4b83f Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 31 Oct 2016 09:04:33 +0000 -Subject: [PATCH] acinclude.m4: fix ./configure --with-libgcrypt - -diff --git a/acinclude.m4 b/acinclude.m4 -index 734ef07..c78260c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then -+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib" -+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include" - fi - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ - #include diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c04fa6fbfd..596bc55a12 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -111,7 +111,7 @@ applications.") (define-public libssh2 (package (name "libssh2") - (version "1.8.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append @@ -119,21 +119,13 @@ applications.") version ".tar.gz")) (sha256 (base32 - "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))) + "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs `(("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (arguments `(#:configure-flags `("--with-libgcrypt") - #:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "autoreconf" "-v")))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake))) + (arguments `(#:configure-flags `("--with-libgcrypt"))) (synopsis "Client-side C library implementing the SSH2 protocol") (description "libssh2 is a library intended to allow software developers access to -- cgit v1.2.3 From ca9a598e8a4bc3f3b7b5316720fc56dc7a6eb4bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 14:21:40 +0200 Subject: gnu: libuv: Update to 1.30.0. * gnu/packages/libevent.scm (libuv): Update to 1.30.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 01da7bad60..1f7a839ba5 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -99,14 +99,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.29.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "032pr9366qsxl78bd4id2c5pfrjv1j997zm5a7a8dbycllyh91hl")))) + "1rybx7fy2751551bn2fjfys0aam9i6xz3yccn3gi0iw5qgalxnsm")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From fd3594bf3881fb8d4c04f76db0f1a9cbd5fae871 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 17:08:13 +0200 Subject: Revert "gnu: meson: Update to 0.51.0." Meson 0.51.0 has problems with PKG_CONFIG_PATH. See . This reverts commit 70530036b8313d5273fca286cd62c73bd2225110. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 68d5b77d49..c435e72824 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -162,7 +162,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.51.0") + (version "0.50.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -170,7 +170,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "0gynkr02mlillh35ksizsf6zc4dfxb8gqym00df5klw6spvgsx9g")))) + "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 1c94df8a1bb92c66adaf85a7329790b1281f1f5e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jul 2019 13:51:16 +0200 Subject: gnu: guile: Update to 2.2.6. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.6. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index efb19b456f..568661c75c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -216,7 +216,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) @@ -226,7 +226,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")) + "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) (modules '((guix build utils))) (patches (search-patches "guile-2.2-skip-oom-test.patch")) -- cgit v1.2.3 From 8aaf42c037584aa823339180b6e9cdada361bbcf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jul 2019 14:25:56 +0200 Subject: gnu: guile-static-stripped: Adjust patches for 2.2.6. * gnu/packages/patches/guile-2.2-default-utf8.patch, gnu/packages/patches/guile-relocatable.patch: Adjust for Guile 2.2.6. --- gnu/packages/patches/guile-2.2-default-utf8.patch | 36 +++++++++++++---------- gnu/packages/patches/guile-relocatable.patch | 18 ++++++------ 2 files changed, 29 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/guile-2.2-default-utf8.patch b/gnu/packages/patches/guile-2.2-default-utf8.patch index 3233388874..f55a6430c1 100644 --- a/gnu/packages/patches/guile-2.2-default-utf8.patch +++ b/gnu/packages/patches/guile-2.2-default-utf8.patch @@ -4,10 +4,10 @@ available during bootstrap, so using UTF-8 avoids that (and UTF-8 has built-in conversions in glibc, too.) diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c -index 7cd753009..de92653a4 100644 +index 0ac5ea6a6..f73301e2f 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c -@@ -1918,7 +1918,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) +@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) if (scm_i_is_narrow_string (str)) \ { \ err = mem_iconveh (scm_i_string_chars (str), c_strlen, \ @@ -17,10 +17,10 @@ index 7cd753009..de92653a4 100644 &c_utf, &c_utf_len); \ if (SCM_UNLIKELY (err)) \ diff --git a/libguile/ports.c b/libguile/ports.c -index 2a25cd58e..bdaf921ca 100644 +index 45e62f4e4..42012f3aa 100644 --- a/libguile/ports.c +++ b/libguile/ports.c -@@ -959,7 +959,9 @@ canonicalize_encoding (const char *enc) +@@ -974,7 +974,9 @@ canonicalize_encoding (const char *enc) char *ret; int i; @@ -31,7 +31,7 @@ index 2a25cd58e..bdaf921ca 100644 return sym_ISO_8859_1; if (encoding_matches (enc, sym_UTF_8)) return sym_UTF_8; -@@ -4182,7 +4184,7 @@ scm_init_ports (void) +@@ -4198,7 +4200,7 @@ scm_init_ports (void) scm_c_define ("%default-port-conversion-strategy", scm_make_fluid_with_default (sym_substitute)); /* Use the locale as the default port encoding. */ @@ -41,10 +41,10 @@ index 2a25cd58e..bdaf921ca 100644 scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, "scm_init_ice_9_ports", diff --git a/libguile/strings.c b/libguile/strings.c -index 5c49e33d8..0131e6dc8 100644 +index 056b4c99f..63a6c050d 100644 --- a/libguile/strings.c +++ b/libguile/strings.c -@@ -1561,7 +1561,7 @@ scm_i_default_string_failed_conversion_handler (void) +@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void) SCM scm_from_locale_stringn (const char *str, size_t len) { @@ -53,7 +53,7 @@ index 5c49e33d8..0131e6dc8 100644 scm_i_default_string_failed_conversion_handler ()); } -@@ -1885,7 +1885,7 @@ char * +@@ -1907,7 +1907,7 @@ char * scm_to_locale_stringn (SCM str, size_t *lenp) { return scm_to_stringn (str, lenp, @@ -62,17 +62,21 @@ index 5c49e33d8..0131e6dc8 100644 scm_i_default_string_failed_conversion_handler ()); } -@@ -2216,11 +2216,11 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, - len = 0; - enc = encoding; - if (enc == NULL) -- enc = "ISO-8859-1"; -+ enc = "UTF-8"; +@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + scm_wrong_type_arg_msg (NULL, 0, str, "string"); + + if (encoding == NULL) +- encoding = "ISO-8859-1"; ++ encoding = "UTF-8"; + + if (c_strcasecmp (encoding, "UTF-8") == 0) + /* This is the most common case--e.g., when calling libc bindings +@@ -2247,7 +2247,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, if (scm_i_is_narrow_string (str)) { ret = mem_iconveh (scm_i_string_chars (str), ilen, -- "ISO-8859-1", enc, -+ "UTF-8", enc, +- "ISO-8859-1", encoding, ++ "UTF-8", encoding, (enum iconv_ilseq_handler) handler, NULL, &buf, &len); diff --git a/gnu/packages/patches/guile-relocatable.patch b/gnu/packages/patches/guile-relocatable.patch index 95bddcce88..464333880c 100644 --- a/gnu/packages/patches/guile-relocatable.patch +++ b/gnu/packages/patches/guile-relocatable.patch @@ -11,7 +11,7 @@ location of the `guile' binary, allowing it to be relocated. #include "libguile/_scm.h" #include "libguile/alist.h" -@@ -325,6 +326,32 @@ +@@ -326,6 +327,32 @@ scm_init_load_path () SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR @@ -44,24 +44,24 @@ location of the `guile' binary, allowing it to be relocated. env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); if (env && strcmp (env, "") == 0) /* special-case interpret system-path=="" as meaning no system path instead -@@ -333,10 +360,7 @@ +@@ -334,10 +361,7 @@ scm_init_load_path () else if (env) path = scm_parse_path (scm_from_locale_string (env), path); else -- path = scm_list_4 (scm_from_locale_string (SCM_LIBRARY_DIR), -- scm_from_locale_string (SCM_SITE_DIR), -- scm_from_locale_string (SCM_GLOBAL_SITE_DIR), -- scm_from_locale_string (SCM_PKGDATA_DIR)); +- path = scm_list_4 (scm_from_utf8_string (SCM_LIBRARY_DIR), +- scm_from_utf8_string (SCM_SITE_DIR), +- scm_from_utf8_string (SCM_GLOBAL_SITE_DIR), +- scm_from_utf8_string (SCM_PKGDATA_DIR)); + path = scm_list_1 (scm_from_locale_string (module_dir)); env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); if (env && strcmp (env, "") == 0) -@@ -346,8 +370,7 @@ +@@ -347,8 +371,7 @@ scm_init_load_path () cpath = scm_parse_path (scm_from_locale_string (env), cpath); else { -- cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), -- scm_from_locale_string (SCM_SITE_CCACHE_DIR)); +- cpath = scm_list_2 (scm_from_utf8_string (SCM_CCACHE_DIR), +- scm_from_utf8_string (SCM_SITE_CCACHE_DIR)); + cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); } -- cgit v1.2.3 From 7c836efacce165f79621fea8c2e3628cf8304f82 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:33:31 +0200 Subject: gnu: make-bootstrap: Restore cross-compilation workarounds. These workarounds were removed in cf8264364761857ca3550398369a0f20d7b0d512 and 218eb6e611c0a238802bf9cb5742d37cea0bb012, but were needed for %BOOTSTRAP-TARBALLS. * gnu/packages/make-bootstrap.scm (%static-inputs)[coreutils, tar]: Add <#:configure-flags>. --- gnu/packages/make-bootstrap.scm | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ec477da7c8..561a286d26 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -150,7 +150,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-silent-rules" "--enable-no-install-program=stdbuf,libstdbuf.so" "CFLAGS=-Os -g0" ; smaller, please - "LDFLAGS=-static -pthread") + "LDFLAGS=-static -pthread" + + ;; Work around a cross-compilation bug whereby libcoreutils.a + ;; would provide '__mktime_internal', which conflicts with the + ;; one in libc.a. + ,@(if (%current-target-system) + `("gl_cv_func_working_mktime=yes") + '())) + #:tests? #f ; signal-related Gnulib tests fail ,@(package-arguments coreutils))) @@ -213,17 +221,22 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '())))) (tar (package (inherit tar) (arguments - (substitute-keyword-arguments (package-arguments tar) - ((#:phases phases) - `(modify-phases ,phases - (replace 'set-shell-file-name - (lambda _ - ;; Do not use "/bin/sh" to run programs; see - ;; . - (substitute* "src/system.c" - (("/bin/sh") "sh") - (("execv ") "execvp ")) - #t)))))))) + `(;; Work around a cross-compilation bug whereby libgnu.a would provide + ;; '__mktime_internal', which conflicts with the one in libc.a. + ,@(if (%current-target-system) + `(#:configure-flags '("gl_cv_func_working_mktime=yes")) + '()) + ,@(substitute-keyword-arguments (package-arguments tar) + ((#:phases phases) + `(modify-phases ,phases + (replace 'set-shell-file-name + (lambda _ + ;; Do not use "/bin/sh" to run programs; see + ;; . + (substitute* "src/system.c" + (("/bin/sh") "sh") + (("execv ") "execvp ")) + #t))))))))) ;; We don't want to retain a reference to /gnu/store in the bootstrap ;; versions of egrep/fgrep, so we remove the custom phase added since ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in -- cgit v1.2.3 From 25a54eb04d89df3bd7177c3cd91f3a61bf8768ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:37:21 +0200 Subject: gnu: make-bootstrap: Adjust for GCC 7. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)[native-inputs]: Add SEARCH-PATHS to CROSS-GCC, and NATIVE-SEARCH-PATHS to the native GCC. --- gnu/packages/make-bootstrap.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 561a286d26..df6b828a2d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -106,16 +106,33 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define (native-inputs) (if (%current-target-system) - (let ((target (%current-target-system))) - `(("cross-gcc" ,(cross-gcc target - #:xbinutils (cross-binutils target) - #:libc (cross-bootstrap-libc))) + (let* ((target (%current-target-system)) + (xgcc (cross-gcc + target + #:xbinutils (cross-binutils target) + #:libc (cross-bootstrap-libc)))) + `(("cross-gcc" ,(package + (inherit xgcc) + (search-paths + ;; Ensure the cross libc headers appears on the + ;; C++ system header search path. + (cons (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-search-paths gcc))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) (outputs '("out")) ;all in one so libgcc_s is easily found + (native-search-paths + ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc + ;; C++ headers. + (cons (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-native-search-paths gcc))) (inputs `(;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap)) -- cgit v1.2.3 From f16a866f74f39e2ae6ad708669fa2c4bc209c09b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:39:07 +0200 Subject: gnu: bootstrap-tarballs: Don't include the native Mes when cross-compiling. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[inputs]: Check %CURRENT-TARGET-SYSTEM when deciding whether to use the reduced binary seeds. --- gnu/packages/make-bootstrap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index df6b828a2d..2163b646f6 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -825,7 +825,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ,@(match (%current-system) + ,@(match (or (%current-target-system) (%current-system)) ((or "i686-linux" "x86_64-linux") `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) ("bootstrap-mes" ,%mes-bootstrap-tarball) -- cgit v1.2.3 From 3730e3c64e2bc9b444281a17282aa7406e20d093 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 16:46:37 +0200 Subject: gnu: gettext: Update to 0.20.1. * gnu/packages/gettext.scm (gettext-minimal): Update to 0.20.1. [source](snippet): Remove. [inputs]: Remove EXPAT. Add LIBUNISTRING, LIBXML2, and NCURSES. [arguments]: Add #:configure-flags and a "patch-fixed-paths" phase. Delete "link-expat" phase. * gnu/packages/commencement.scm (gettext-boot0): Stay on version 0.19.8.1. [arguments]: Adjust accordingly. Co-authored-by: Miguel --- gnu/packages/commencement.scm | 47 ++++++++++++++++-------------- gnu/packages/gettext.scm | 67 ++++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 54 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 10b0bd67f5..1db28498ff 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2015,30 +2015,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (let ((gettext-minimal (package (inherit gettext-minimal) (name "gettext-boot0") + ;; Newer versions of GNU gettext depends on libxml2 and ncurses. To + ;; simplify the dependency chain, we stick to this version here. + (version "0.19.8.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gettext/gettext-" + version ".tar.gz")) + (sha256 + (base32 + "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")))) (inputs '()) ;zero dependencies (arguments - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments gettext-minimal)) - ((#:phases phases) - `(modify-phases ,phases - ;; Build only the tools. - (add-after 'unpack 'chdir - (lambda _ - (chdir "gettext-tools") - #t)) - - ;; Some test programs require pthreads, which we don't have. - (add-before 'configure 'no-test-programs - (lambda _ - (substitute* "tests/Makefile.in" - (("^PROGRAMS =.*$") - "PROGRAMS =\n")) - #t)) - - ;; Don't try to link against libexpat. - (delete 'link-expat) - (delete 'patch-tests)))))))) + `(#:tests? #f + #:phases (modify-phases %standard-phases + ;; Build only the tools. + (add-after 'unpack 'chdir + (lambda _ + (chdir "gettext-tools") + #t)) + + ;; Some test programs require pthreads, which we don't have. + (add-before 'configure 'no-test-programs + (lambda _ + (substitute* "tests/Makefile.in" + (("^PROGRAMS =.*$") + "PROGRAMS =\n")) + #t)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal %boot1-inputs diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index ef80af42ea..245fdc9ec0 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -4,10 +4,11 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Miguel ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,8 @@ #:use-module (guix build-system perl) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) + #:use-module (gnu packages libunistring) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages tex) #:use-module (gnu packages xml) @@ -41,34 +44,42 @@ (define-public gettext-minimal (package (name "gettext-minimal") - (version "0.19.8.1") + (version "0.20.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gettext/gettext-" - version ".tar.gz")) - (sha256 - (base32 - "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "gettext-runtime/tests/Makefile.in" - (("TESTS = test-lock\\$\\(EXEEXT\\)") "TESTS =")) - (substitute* "gettext-tools/gnulib-tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + (method url-fetch) + (uri (string-append "mirror://gnu/gettext/gettext-" + version ".tar.gz")) + (sha256 + (base32 + "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6")))) (build-system gnu-build-system) (outputs '("out" - "doc")) ;8 MiB of HTML + "doc")) ;9 MiB of HTML (inputs - `(("expat" ,expat))) + `(("libunistring" ,libunistring) + ("libxml2" ,libxml2) + + ;; TODO: ncurses is only needed for the 'libtextstyle' library. + ;; The next version of gettext can use a separate libtextstyle, + ;; but for now we include it here in 'gettext-minimal'. + ("ncurses" ,ncurses))) (arguments - `(#:phases + `(#:configure-flags '("--with-included-libunistring=no" + "--with-included-libxml=no") + #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'patch-fixed-paths + (lambda _ + (substitute* '("gettext-tools/config.h.in" + "gettext-tools/gnulib-tests/init.sh" + "gettext-tools/tests/init.sh" + "gettext-tools/system-tests/run-test") + (("/bin/sh") "sh")) + (substitute* '("gettext-tools/src/project-id" + "gettext-tools/projects/KDE/trigger" + "gettext-tools/projects/GNOME/trigger") + (("/bin/pwd") "pwd")) + #t)) (add-before 'check 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let* ((bash (which "sh"))) @@ -92,15 +103,7 @@ (("/bin/pwd") "pwd")) - #t)))) - (add-before 'configure 'link-expat - (lambda _ - ;; Gettext defaults to opening expat via dlopen on - ;; "Linux". Change to link directly. - (substitute* "gettext-tools/configure" - (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") - (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")) - #t))) + #t))))) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) -- cgit v1.2.3 From e27916274cd85df4a097fc16af1a6159e9d647b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 13:31:55 +0200 Subject: gnu: libuninameslist: Update to 20190701. * gnu/packages/fontutils.scm (libuninameslist): Update to 20190701. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cddd067517..818d77f127 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -529,7 +529,7 @@ smooth contours with constant curvature at the spline joins.") (define-public libuninameslist (package (name "libuninameslist") - (version "20190305") + (version "20190701") (home-page "https://github.com/fontforge/libuninameslist") (source (origin @@ -538,7 +538,7 @@ smooth contours with constant curvature at the spline joins.") "/libuninameslist-dist-" version ".tar.gz")) (sha256 (base32 - "1rwd2bgcyvign9agyjsr3v2fr9j1cg2wi6g0z2wwg1az32scknwq")))) + "18c9pcz81wm26q2m7npmvh9j3ibjs2hycxfh5xic2xgjfw40v2qn")))) (build-system gnu-build-system) (synopsis "Unicode names and annotation list") (description -- cgit v1.2.3 From 742f2deaa385e45e08264c6e41f2929e87319f66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 17:21:05 +0200 Subject: gnu: commencement: Remove outdated comment. * gnu/packages/commencement.scm (bison-boot0): Remove bash comment, which is no longer accurate. --- gnu/packages/commencement.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1db28498ff..8a0e1c3cb1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1710,8 +1710,6 @@ exec " gcc "/bin/" program (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. - ;; It is also needed to rebuild Bash's parser, which is modified by - ;; its CVE patches. Remove it when it's no longer needed. (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... -- cgit v1.2.3 From 1290855490baf03944dc85d8353c2b8cedac5256 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 17:24:33 +0200 Subject: gnu: linux-libre-headers: Update to 4.19.56. * gnu/packages/linux.scm (linux-libre-headers-4.14.67): Rename to ... (linux-libre-headers-4.19.56): ... this. Adjust hash accordingly. (linux-libre-headers): Set to LINUX-LIBRE-HEADERS-4.19.56. * gnu/packages/commencement.scm (linux-libre-headers-boot0)[native-inputs]: Add FLEX-BOOT0 and BISON-BOOT0. --- gnu/packages/commencement.scm | 7 ++++++- gnu/packages/linux.scm | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8a0e1c3cb1..230b63364a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1710,6 +1710,7 @@ exec " gcc "/bin/" program (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. + ;; Recent versions of Linux-Libre headers also depend on this. (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... @@ -1735,7 +1736,7 @@ exec " gcc "/bin/" program (native-inputs `(("perl" ,perl-boot0)))))) (define flex-boot0 - ;; This Flex is needed to build MiG. + ;; This Flex is needed to build MiG as well as Linux-Libre headers. (let* ((flex (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) (propagated-inputs `(("m4" ,m4))) @@ -1760,6 +1761,10 @@ exec " gcc "/bin/" program ,@(package-arguments linux-libre-headers))) (native-inputs `(("perl" ,perl-boot0) + + ;; Flex and Bison are required since version 4.16. + ("flex" ,flex-boot0) + ("bison" ,bison-boot0) ,@(%boot0-inputs))))))) (define gnumach-headers-boot0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1fdcba311..7df83ca020 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -496,11 +496,11 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config-veyron #:extra-version "arm-veyron")) -(define-public linux-libre-headers-4.14.67 - (make-linux-libre-headers "4.14.67" - "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) +(define-public linux-libre-headers-4.19.56 + (make-linux-libre-headers "4.19.56" + "1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx")) -(define-public linux-libre-headers linux-libre-headers-4.14.67) +(define-public linux-libre-headers linux-libre-headers-4.19.56) (define-public linux-libre linux-libre-5.1) (define-public linux-libre-arm-generic -- cgit v1.2.3 From 5f3f70391809f8791c55c05bd1646bc58508fa2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 16:45:17 +0200 Subject: gnu: glibc: Update to 2.29. * gnu/packages/patches/glibc-bootstrap-system.patch, gnu/packages/patches/glibc-supported-locales.patch: Adjust for glibc 2.29. * gnu/packages/patches/glibc-2.28-supported-locales.patch, gnu/packages/patches/glibc-CVE-2019-7309.patch, gnu/packages/patches/glibc-CVE-2019-9169.patch, gnu/packages/patches/glibc-2.29-git-updates.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (glibc): Update to 2.29. [source](patches): Add 'glibc-CVE-2019-7309.patch', 'glibc-CVE-2019-9169.patch', and 'glibc-2.29-git-updates.patch'. Remove 'glibc-hurd-magic-pid.patch'. [native-inputs]: Add PYTHON-MINIMAL. (glibc-2.28): New public variable. * gnu/packages/commencement.scm (expat-sans-tests, python-boot0): New variables. (glibc-final-with-bootstrap-bash)[native-inputs]: Add PYTHON-BOOT0. * gnu/packages/python.scm (python-3.7)[arguments]: Disable test that fails with glibc 2.29. --- gnu/local.mk | 4 + gnu/packages/base.scm | 32 +- gnu/packages/commencement.scm | 40 +- .../patches/glibc-2.28-supported-locales.patch | 33 + gnu/packages/patches/glibc-2.29-git-updates.patch | 742 +++++++++++++++++++++ gnu/packages/patches/glibc-CVE-2019-7309.patch | 76 +++ gnu/packages/patches/glibc-CVE-2019-9169.patch | 22 + gnu/packages/patches/glibc-bootstrap-system.patch | 34 +- gnu/packages/patches/glibc-supported-locales.patch | 16 +- gnu/packages/python.scm | 4 +- 10 files changed, 969 insertions(+), 34 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.28-supported-locales.patch create mode 100644 gnu/packages/patches/glibc-2.29-git-updates.patch create mode 100644 gnu/packages/patches/glibc-CVE-2019-7309.patch create mode 100644 gnu/packages/patches/glibc-CVE-2019-9169.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2e4faeb4c4..d3ace6891d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -858,6 +858,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ + %D%/packages/patches/glibc-CVE-2019-7309.patch \ + %D%/packages/patches/glibc-CVE-2019-9169.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-boot-2.2.5.patch \ @@ -873,6 +875,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ %D%/packages/patches/glibc-2.28-git-fixes.patch \ + %D%/packages/patches/glibc-2.28-supported-locales.patch \ + %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 6585d2eebd..63c22017e7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages hurd) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages gettext) #:use-module (guix utils) #:use-module (guix packages) @@ -566,15 +567,13 @@ the store.") ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - ;; Note: Always use a dot after the minor version since various places rely - ;; on "version-major+minor" to determine where locales are found. - (version "2.28") + (version "2.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) + "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -586,12 +585,13 @@ the store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-2.28-git-fixes.patch" + "glibc-CVE-2019-7309.patch" + "glibc-CVE-2019-9169.patch" + "glibc-2.29-git-updates.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-hurd-magic-pid.patch" "glibc-supported-locales.patch")))) (build-system gnu-build-system) @@ -789,6 +789,7 @@ the store.") ("perl" ,perl) ("bison" ,bison) ("gettext" ,gettext-minimal) + ("python" ,python-minimal) ,@(if (hurd-target?) `(("mig" ,mig) @@ -818,6 +819,25 @@ with the Linux kernel.") ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.28 + (package + (inherit glibc) + (version "2.28") + (source (origin + (inherit (package-source glibc)) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-2.28-git-fixes.patch" + "glibc-hidden-visibility-ldconfig.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-hurd-magic-pid.patch" + "glibc-2.28-supported-locales.patch")))))) + (define-public glibc-2.27 (package (inherit glibc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 230b63364a..d28296449d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -44,10 +44,12 @@ #:use-module (gnu packages compression) #:use-module (gnu packages mes) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages texinfo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -1843,6 +1845,41 @@ the bootstrap environment." (current-source-location) #:guile %bootstrap-guile)))) +(define expat-sans-tests + (package + (inherit expat) + (arguments + ;; XXX: Linking 'runtestscpp' fails with things like: + ;; + ;; ld: Dwarf Error: found dwarf version '3789', this reader only handles version 2 and 3 information. + ;; + ;; Skip tests altogether. + (substitute-keyword-arguments (package-arguments expat) + ((#:configure-flags flags ''()) + ;; Since we're not passing the right -Wl,-rpath flags, build the + ;; static library to avoid RUNPATH validation failure. + `(cons "--disable-shared" ,flags)) + ((#:tests? _ #f) #f))))) + +(define python-boot0 + (let ((python (package + (inherit python-minimal) + (inputs + `(("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. + (arguments + (substitute-keyword-arguments (package-arguments + python-minimal) + ;; Disable features that cannot be built at this stage. + ((#:configure-flags _ ''()) + `(list "--without-ensurepip")) + ((#:make-flags _ ''()) + `(list "MODDISABLED_NAMES=_ctypes ossaudiodev")) + ((#:tests? _ #f) #f)))))) + (package-with-bootstrap-guile + (package-with-explicit-inputs python %boot0-inputs + (current-source-location) + #:guile %bootstrap-guile)))) + (define (ld-wrapper-boot0) ;; We need this so binaries on Hurd will have libmachuser and libhurduser ;; in their RUNPATH, otherwise validate-runpath will fail. @@ -1906,7 +1943,8 @@ the bootstrap environment." (native-inputs `(("bison" ,bison-boot0) ("texinfo" ,texinfo-boot0) - ("perl" ,perl-boot0))) + ("perl" ,perl-boot0) + ("python" ,python-boot0))) (inputs `(;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. diff --git a/gnu/packages/patches/glibc-2.28-supported-locales.patch b/gnu/packages/patches/glibc-2.28-supported-locales.patch new file mode 100644 index 0000000000..2888052bb8 --- /dev/null +++ b/gnu/packages/patches/glibc-2.28-supported-locales.patch @@ -0,0 +1,33 @@ +This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. diff --git a/gnu/packages/patches/glibc-2.29-git-updates.patch b/gnu/packages/patches/glibc-2.29-git-updates.patch new file mode 100644 index 0000000000..5750e9cac1 --- /dev/null +++ b/gnu/packages/patches/glibc-2.29-git-updates.patch @@ -0,0 +1,742 @@ +This file tracks updates from the "release/2.29/master" branch: +https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.29/master + +Abridged commits are appended to this file. + +From ec894251ef11723d10df04fcfd7bd2030c6e43ff Mon Sep 17 00:00:00 2001 +From: Carlos O'Donell +Date: Mon, 21 Jan 2019 22:50:12 -0500 +Subject: [PATCH] nptl: Fix pthread_rwlock_try*lock stalls (Bug 23844) +diff --git a/nptl/pthread_rwlock_tryrdlock.c b/nptl/pthread_rwlock_tryrdlock.c +index 368862ff07..2f94f17f36 100644 +--- a/nptl/pthread_rwlock_tryrdlock.c ++++ b/nptl/pthread_rwlock_tryrdlock.c +@@ -94,15 +94,22 @@ __pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) + /* Same as in __pthread_rwlock_rdlock_full: + We started the read phase, so we are also responsible for + updating the write-phase futex. Relaxed MO is sufficient. +- Note that there can be no other reader that we have to wake +- because all other readers will see the read phase started by us +- (or they will try to start it themselves); if a writer started +- the read phase, we cannot have started it. Furthermore, we +- cannot discard a PTHREAD_RWLOCK_FUTEX_USED flag because we will +- overwrite the value set by the most recent writer (or the readers +- before it in case of explicit hand-over) and we know that there +- are no waiting readers. */ +- atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 0); ++ We have to do the same steps as a writer would when handing over the ++ read phase to use because other readers cannot distinguish between ++ us and the writer. ++ Note that __pthread_rwlock_tryrdlock callers will not have to be ++ woken up because they will either see the read phase started by us ++ or they will try to start it themselves; however, callers of ++ __pthread_rwlock_rdlock_full just increase the reader count and then ++ check what state the lock is in, so they cannot distinguish between ++ us and a writer that acquired and released the lock in the ++ meantime. */ ++ if ((atomic_exchange_relaxed (&rwlock->__data.__wrphase_futex, 0) ++ & PTHREAD_RWLOCK_FUTEX_USED) != 0) ++ { ++ int private = __pthread_rwlock_get_private (rwlock); ++ futex_wake (&rwlock->__data.__wrphase_futex, INT_MAX, private); ++ } + } + + return 0; +diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c +index fd37a71ce4..fae475cc70 100644 +--- a/nptl/pthread_rwlock_trywrlock.c ++++ b/nptl/pthread_rwlock_trywrlock.c +@@ -46,8 +46,15 @@ __pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) + &rwlock->__data.__readers, &r, + r | PTHREAD_RWLOCK_WRPHASE | PTHREAD_RWLOCK_WRLOCKED)) + { ++ /* We have become the primary writer and we cannot have shared ++ the PTHREAD_RWLOCK_FUTEX_USED flag with someone else, so we ++ can simply enable blocking (see full wrlock code). */ + atomic_store_relaxed (&rwlock->__data.__writers_futex, 1); +- atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 1); ++ /* If we started a write phase, we need to enable readers to ++ wait. If we did not, we must not change it because other threads ++ may have set the PTHREAD_RWLOCK_FUTEX_USED in the meantime. */ ++ if ((r & PTHREAD_RWLOCK_WRPHASE) == 0) ++ atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 1); + atomic_store_relaxed (&rwlock->__data.__cur_writer, + THREAD_GETMEM (THREAD_SELF, tid)); + return 0; +diff --git a/support/Makefile b/support/Makefile +index 432cf2fe6c..c15b93647c 100644 +--- a/support/Makefile ++++ b/support/Makefile +@@ -129,6 +129,7 @@ libsupport-routines = \ + xpthread_mutexattr_settype \ + xpthread_once \ + xpthread_rwlock_init \ ++ xpthread_rwlock_destroy \ + xpthread_rwlock_rdlock \ + xpthread_rwlock_unlock \ + xpthread_rwlock_wrlock \ +diff --git a/support/xpthread_rwlock_destroy.c b/support/xpthread_rwlock_destroy.c +new file mode 100644 +index 0000000000..6d6e953569 +--- /dev/null ++++ b/support/xpthread_rwlock_destroy.c +@@ -0,0 +1,26 @@ ++/* pthread_rwlock_destroy with error checking. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++void ++xpthread_rwlock_destroy (pthread_rwlock_t *rwlock) ++{ ++ xpthread_check_return ("pthread_rwlock_destroy", ++ pthread_rwlock_destroy (rwlock)); ++} +diff --git a/support/xthread.h b/support/xthread.h +index 47c23235f3..9fe1f68b3b 100644 +--- a/support/xthread.h ++++ b/support/xthread.h +@@ -84,6 +84,7 @@ void xpthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref); + void xpthread_rwlock_wrlock (pthread_rwlock_t *rwlock); + void xpthread_rwlock_rdlock (pthread_rwlock_t *rwlock); + void xpthread_rwlock_unlock (pthread_rwlock_t *rwlock); ++void xpthread_rwlock_destroy (pthread_rwlock_t *rwlock); + + __END_DECLS + +From 44113a8ba24af23d7bbb174f9087a6b83a76289a Mon Sep 17 00:00:00 2001 +From: Stefan Liebler +Date: Thu, 7 Feb 2019 15:18:36 +0100 +Subject: [PATCH] Add compiler barriers around modifications of the robust + mutex list for pthread_mutex_trylock. [BZ #24180] +diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c +index 8fe43b8f0f..bf2869eca2 100644 +--- a/nptl/pthread_mutex_trylock.c ++++ b/nptl/pthread_mutex_trylock.c +@@ -94,6 +94,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + case PTHREAD_MUTEX_ROBUST_ADAPTIVE_NP: + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + &mutex->__data.__list.__next); ++ /* We need to set op_pending before starting the operation. Also ++ see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + + oldval = mutex->__data.__lock; + do +@@ -119,7 +122,12 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + /* But it is inconsistent unless marked otherwise. */ + mutex->__data.__owner = PTHREAD_MUTEX_INCONSISTENT; + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Note that we deliberately exist here. If we fall +@@ -135,6 +143,8 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + int kind = PTHREAD_MUTEX_TYPE (mutex); + if (kind == PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. Also see comments at ENQUEUE_MUTEX. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + NULL); + return EDEADLK; +@@ -142,6 +152,8 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + + if (kind == PTHREAD_MUTEX_ROBUST_RECURSIVE_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + NULL); + +@@ -160,6 +172,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + id, 0); + if (oldval != 0 && (oldval & FUTEX_OWNER_DIED) == 0) + { ++ /* We haven't acquired the lock as it is already acquired by ++ another owner. We do not need to ensure ordering wrt another ++ memory access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -173,13 +188,20 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + if (oldval == id) + lll_unlock (mutex->__data.__lock, + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); ++ /* FIXME This violates the mutex destruction requirements. See ++ __pthread_mutex_unlock_full. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return ENOTRECOVERABLE; + } + } + while ((oldval & FUTEX_OWNER_DIED) != 0); + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + mutex->__data.__owner = id; +@@ -211,10 +233,15 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + } + + if (robust) +- /* Note: robust PI futexes are signaled by setting bit 0. */ +- THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, +- (void *) (((uintptr_t) &mutex->__data.__list.__next) +- | 1)); ++ { ++ /* Note: robust PI futexes are signaled by setting bit 0. */ ++ THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, ++ (void *) (((uintptr_t) &mutex->__data.__list.__next) ++ | 1)); ++ /* We need to set op_pending before starting the operation. Also ++ see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); ++ } + + oldval = mutex->__data.__lock; + +@@ -223,12 +250,16 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + { + if (kind == PTHREAD_MUTEX_ERRORCHECK_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return EDEADLK; + } + + if (kind == PTHREAD_MUTEX_RECURSIVE_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Just bump the counter. */ +@@ -250,6 +281,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + { + if ((oldval & FUTEX_OWNER_DIED) == 0) + { ++ /* We haven't acquired the lock as it is already acquired by ++ another owner. We do not need to ensure ordering wrt another ++ memory access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -270,6 +304,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + if (INTERNAL_SYSCALL_ERROR_P (e, __err) + && INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK) + { ++ /* The kernel has not yet finished the mutex owner death. ++ We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -287,7 +324,12 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + /* But it is inconsistent unless marked otherwise. */ + mutex->__data.__owner = PTHREAD_MUTEX_INCONSISTENT; + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Note that we deliberately exit here. If we fall +@@ -310,13 +352,20 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)), + 0, 0); + ++ /* To the kernel, this will be visible after the kernel has ++ acquired the mutex in the syscall. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return ENOTRECOVERABLE; + } + + if (robust) + { ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX_PI (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + } + +From c096b008d2671028c21ac8cf01f18a2083e73c44 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 8 Feb 2019 12:54:41 +0100 +Subject: [PATCH] nptl: Avoid fork handler lock for async-signal-safe fork [BZ + #24161] +--- a/nptl/register-atfork.c ++++ b/nptl/register-atfork.c +@@ -107,13 +107,14 @@ __unregister_atfork (void *dso_handle) + } + + void +-__run_fork_handlers (enum __run_fork_handler_type who) ++__run_fork_handlers (enum __run_fork_handler_type who, _Bool do_locking) + { + struct fork_handler *runp; + + if (who == atfork_run_prepare) + { +- lll_lock (atfork_lock, LLL_PRIVATE); ++ if (do_locking) ++ lll_lock (atfork_lock, LLL_PRIVATE); + size_t sl = fork_handler_list_size (&fork_handlers); + for (size_t i = sl; i > 0; i--) + { +@@ -133,7 +134,8 @@ __run_fork_handlers (enum __run_fork_handler_type who) + else if (who == atfork_run_parent && runp->parent_handler) + runp->parent_handler (); + } +- lll_unlock (atfork_lock, LLL_PRIVATE); ++ if (do_locking) ++ lll_unlock (atfork_lock, LLL_PRIVATE); + } + } + +diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c +index bd68f18b45..14b69a6f89 100644 +--- a/sysdeps/nptl/fork.c ++++ b/sysdeps/nptl/fork.c +@@ -55,7 +55,7 @@ __libc_fork (void) + but our current fork implementation is not. */ + bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); + +- __run_fork_handlers (atfork_run_prepare); ++ __run_fork_handlers (atfork_run_prepare, multiple_threads); + + /* If we are not running multiple threads, we do not have to + preserve lock state. If fork runs from a signal handler, only +@@ -134,7 +134,7 @@ __libc_fork (void) + __rtld_lock_initialize (GL(dl_load_lock)); + + /* Run the handlers registered for the child. */ +- __run_fork_handlers (atfork_run_child); ++ __run_fork_handlers (atfork_run_child, multiple_threads); + } + else + { +@@ -149,7 +149,7 @@ __libc_fork (void) + } + + /* Run the handlers registered for the parent. */ +- __run_fork_handlers (atfork_run_parent); ++ __run_fork_handlers (atfork_run_parent, multiple_threads); + } + + return pid; +diff --git a/sysdeps/nptl/fork.h b/sysdeps/nptl/fork.h +index a1c3b26b68..99ed76034b 100644 +--- a/sysdeps/nptl/fork.h ++++ b/sysdeps/nptl/fork.h +@@ -52,10 +52,12 @@ enum __run_fork_handler_type + - atfork_run_child: run all the CHILD_HANDLER and unlocks the internal + lock. + - atfork_run_parent: run all the PARENT_HANDLER and unlocks the internal +- lock. */ +-extern void __run_fork_handlers (enum __run_fork_handler_type who) +- attribute_hidden; ++ lock. ++ ++ Perform locking only if DO_LOCKING. */ ++extern void __run_fork_handlers (enum __run_fork_handler_type who, ++ _Bool do_locking) attribute_hidden; + + /* C library side function to register new fork handlers. */ + extern int __register_atfork (void (*__prepare) (void), + +From 067fc32968b601493f4b247a3ac00caeea3f3d61 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 15 Feb 2019 21:27:01 +0100 +Subject: [PATCH] nptl: Fix invalid Systemtap probe in pthread_join [BZ #24211] +diff --git a/nptl/pthread_join_common.c b/nptl/pthread_join_common.c +index ecb78ffba5..366feb376b 100644 +--- a/nptl/pthread_join_common.c ++++ b/nptl/pthread_join_common.c +@@ -86,6 +86,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + pthread_cleanup_pop (0); + } + ++ void *pd_result = pd->result; + if (__glibc_likely (result == 0)) + { + /* We mark the thread as terminated and as joined. */ +@@ -93,7 +94,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + + /* Store the return value if the caller is interested. */ + if (thread_return != NULL) +- *thread_return = pd->result; ++ *thread_return = pd_result; + + /* Free the TCB. */ + __free_tcb (pd); +@@ -101,7 +102,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + else + pd->joinid = NULL; + +- LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd->result); ++ LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd_result); + + return result; + } + +From bc6f839fb4066be83272c735e662850af2595777 Mon Sep 17 00:00:00 2001 +From: Stefan Liebler +Date: Wed, 13 Mar 2019 10:45:35 +0100 +Subject: [PATCH] Fix output of LD_SHOW_AUXV=1. +diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c +index 5f6c679a3f..5d19b100b2 100644 +--- a/elf/dl-sysdep.c ++++ b/elf/dl-sysdep.c +@@ -328,14 +328,9 @@ _dl_show_auxv (void) + assert (AT_NULL == 0); + assert (AT_IGNORE == 1); + +- if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2 +- || AT_L1I_CACHEGEOMETRY || AT_L1D_CACHEGEOMETRY +- || AT_L2_CACHEGEOMETRY || AT_L3_CACHEGEOMETRY) +- { +- /* These are handled in a special way per platform. */ +- if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) +- continue; +- } ++ /* Some entries are handled in a special way per platform. */ ++ if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) ++ continue; + + if (idx < sizeof (auxvars) / sizeof (auxvars[0]) + && auxvars[idx].form != unknown) +diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h +index f542f7318f..dfc3b33a72 100644 +--- a/sysdeps/powerpc/dl-procinfo.h ++++ b/sysdeps/powerpc/dl-procinfo.h +@@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) + break; + } + default: +- /* This should not happen. */ ++ /* Fallback to generic output mechanism. */ + return -1; + } + _dl_printf ("\n"); +diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h +index 282b8c5117..64ee267fc7 100644 +--- a/sysdeps/sparc/dl-procinfo.h ++++ b/sysdeps/sparc/dl-procinfo.h +@@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + { + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); +diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +index 66c00297b7..05c62c8687 100644 +--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +@@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) + break; + } + default: +- /* This should not happen. */ ++ /* Fallback to generic output mechanism. */ + return -1; + } + _dl_printf ("\n"); +diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +index 22b43431bc..0585cdaa9c 100644 +--- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +@@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + in the kernel sources. */ + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); +diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +index 19329a335b..d67fde368f 100644 +--- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +@@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + in the kernel sources. */ + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); + +From e28ad442e73b00ae2047d89c8cc7f9b2a0de5436 Mon Sep 17 00:00:00 2001 +From: TAMUKI Shoichi +Date: Sat, 2 Mar 2019 21:00:28 +0900 +Subject: [PATCH] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ + #24162] +diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP +index 1fd2fee44b..9bfbb2bb9b 100644 +--- a/localedata/locales/ja_JP ++++ b/localedata/locales/ja_JP +@@ -14951,7 +14951,7 @@ era "+:2:1990//01//01:+*::%EC%Ey";/ + "+:2:1927//01//01:1989//01//07::%EC%Ey";/ + "+:1:1926//12//25:1926//12//31::%EC";/ + "+:2:1913//01//01:1926//12//24::%EC%Ey";/ +- "+:2:1912//07//30:1912//12//31::%EC";/ ++ "+:1:1912//07//30:1912//12//31::%EC";/ + "+:6:1873//01//01:1912//07//29::%EC%Ey";/ + "+:1:0001//01//01:1872//12//31::%EC%Ey";/ + "+:1:-0001//12//31:-*::%EC%Ey" + +From 0941350c20a52447e53c5169354408e3db591f73 Mon Sep 17 00:00:00 2001 +From: TAMUKI Shoichi +Date: Tue, 2 Apr 2019 16:46:55 +0900 +Subject: [PATCH] ja_JP locale: Add entry for the new Japanese era [BZ #22964] +diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP +index 9bfbb2bb9b..c64aaaff55 100644 +--- a/localedata/locales/ja_JP ++++ b/localedata/locales/ja_JP +@@ -14946,7 +14946,9 @@ am_pm "";"" + + t_fmt_ampm "%p%I%M%S" + +-era "+:2:1990//01//01:+*::%EC%Ey";/ ++era "+:2:2020//01//01:+*::%EC%Ey";/ ++ "+:1:2019//05//01:2019//12//31::%EC";/ ++ "+:2:1990//01//01:2019//04//30::%EC%Ey";/ + "+:1:1989//01//08:1989//12//31::%EC";/ + "+:2:1927//01//01:1989//01//07::%EC%Ey";/ + "+:1:1926//12//25:1926//12//31::%EC";/ + +From 52b7cd6e9a701bb203023d56e84551943dc6a4c0 Mon Sep 17 00:00:00 2001 +From: Adam Maris +Date: Thu, 14 Mar 2019 16:51:16 -0400 +Subject: [PATCH] malloc: Check for large bin list corruption when inserting + unsorted chunk +diff --git a/malloc/malloc.c b/malloc/malloc.c +index feaf7ee0bf..ce771375b6 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3876,10 +3876,14 @@ _int_malloc (mstate av, size_t bytes) + { + victim->fd_nextsize = fwd; + victim->bk_nextsize = fwd->bk_nextsize; ++ if (__glibc_unlikely (fwd->bk_nextsize->fd_nextsize != fwd)) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (nextsize)"); + fwd->bk_nextsize = victim; + victim->bk_nextsize->fd_nextsize = victim; + } + bck = fwd->bk; ++ if (bck->fd != fwd) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (bk)"); + } + } + else + +From c6177be4b92d5d7df50a785652d1912db511423e Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Wed, 15 May 2019 17:09:05 +0200 +Subject: [PATCH] Fix crash in _IO_wfile_sync (bug 20568) +diff --git a/libio/wfileops.c b/libio/wfileops.c +index 78f20486e5..bab2ba4892 100644 +--- a/libio/wfileops.c ++++ b/libio/wfileops.c +@@ -508,11 +508,12 @@ _IO_wfile_sync (FILE *fp) + generate the wide characters up to the current reading + position. */ + int nread; +- ++ size_t wnread = (fp->_wide_data->_IO_read_ptr ++ - fp->_wide_data->_IO_read_base); + fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state; + nread = (*cv->__codecvt_do_length) (cv, &fp->_wide_data->_IO_state, + fp->_IO_read_base, +- fp->_IO_read_end, delta); ++ fp->_IO_read_end, wnread); + fp->_IO_read_ptr = fp->_IO_read_base + nread; + delta = -(fp->_IO_read_end - fp->_IO_read_base - nread); + } + +From e3f828b8bd6e21922da8be8dee35edef09382d8d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 15 May 2019 17:14:01 +0200 +Subject: [PATCH] dlfcn: Guard __dlerror_main_freeres with __libc_once_get + (once) [BZ#24476] +diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c +index 27376582d0..ca42c126c1 100644 +--- a/dlfcn/dlerror.c ++++ b/dlfcn/dlerror.c +@@ -72,9 +72,16 @@ __dlerror (void) + __libc_once (once, init); + + /* Get error string. */ +- result = (struct dl_action_result *) __libc_getspecific (key); +- if (result == NULL) +- result = &last_result; ++ if (static_buf != NULL) ++ result = static_buf; ++ else ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ result = (struct dl_action_result *) __libc_getspecific (key); ++ if (result == NULL) ++ result = &last_result; ++ } + + /* Test whether we already returned the string. */ + if (result->returned != 0) +@@ -230,13 +237,19 @@ free_key_mem (void *mem) + void + __dlerror_main_freeres (void) + { +- void *mem; + /* Free the global memory if used. */ + check_free (&last_result); +- /* Free the TSD memory if used. */ +- mem = __libc_getspecific (key); +- if (mem != NULL) +- free_key_mem (mem); ++ ++ if (__libc_once_get (once) && static_buf == NULL) ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ void *mem; ++ /* Free the TSD memory if used. */ ++ mem = __libc_getspecific (key); ++ if (mem != NULL) ++ free_key_mem (mem); ++ } + } + + struct dlfcn_hook *_dlfcn_hook __attribute__((nocommon)); + +From 95d66fecaabbc92ab53027e808f0fc1929c9f21a Mon Sep 17 00:00:00 2001 +From: Wilco Dijkstra +Date: Fri, 10 May 2019 16:38:21 +0100 +Subject: [PATCH] Fix tcache count maximum (BZ #24531) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index ce771375b6..0abd653be2 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -2919,6 +2919,8 @@ typedef struct tcache_perthread_struct + tcache_entry *entries[TCACHE_MAX_BINS]; + } tcache_perthread_struct; + ++#define MAX_TCACHE_COUNT 127 /* Maximum value of counts[] entries. */ ++ + static __thread bool tcache_shutting_down = false; + static __thread tcache_perthread_struct *tcache = NULL; + +@@ -5124,8 +5126,11 @@ static inline int + __always_inline + do_set_tcache_count (size_t value) + { +- LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); +- mp_.tcache_count = value; ++ if (value <= MAX_TCACHE_COUNT) ++ { ++ LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); ++ mp_.tcache_count = value; ++ } + return 1; + } + +From 34fb5f61d3c3f4b8fc616ea259fa19168b58ecd4 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Wed, 13 Feb 2019 01:20:51 +0000 +Subject: [PATCH] libio: do not attempt to free wide buffers of legacy streams + [BZ #24228] +diff --git a/libio/genops.c b/libio/genops.c +index 2a0d9b81df..11a15549e8 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -789,9 +789,16 @@ _IO_unbuffer_all (void) + + for (fp = (FILE *) _IO_list_all; fp; fp = fp->_chain) + { ++ int legacy = 0; ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) ++ if (__glibc_unlikely (_IO_vtable_offset (fp) != 0)) ++ legacy = 1; ++#endif ++ + if (! (fp->_flags & _IO_UNBUFFERED) + /* Iff stream is un-orientated, it wasn't used. */ +- && fp->_mode != 0) ++ && (legacy || fp->_mode != 0)) + { + #ifdef _IO_MTSAFE_IO + int cnt; +@@ -805,7 +812,7 @@ _IO_unbuffer_all (void) + __sched_yield (); + #endif + +- if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF)) ++ if (! legacy && ! dealloc_buffers && !(fp->_flags & _IO_USER_BUF)) + { + fp->_flags |= _IO_USER_BUF; + +@@ -816,7 +823,7 @@ _IO_unbuffer_all (void) + + _IO_SETBUF (fp, NULL, 0); + +- if (fp->_mode > 0) ++ if (! legacy && fp->_mode > 0) + _IO_wsetb (fp, NULL, NULL, 0); + + #ifdef _IO_MTSAFE_IO +@@ -827,7 +834,8 @@ _IO_unbuffer_all (void) + + /* Make sure that never again the wide char functions can be + used. */ +- fp->_mode = -1; ++ if (! legacy) ++ fp->_mode = -1; + } + + #ifdef _IO_MTSAFE_IO + diff --git a/gnu/packages/patches/glibc-CVE-2019-7309.patch b/gnu/packages/patches/glibc-CVE-2019-7309.patch new file mode 100644 index 0000000000..f9f623830a --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2019-7309.patch @@ -0,0 +1,76 @@ +Fix . + +Taken from this upstream commit, sans ChangeLog updates and tests: +. + +diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S +index 1fc487caa5..1322bb3b92 100644 +--- a/sysdeps/x86_64/memcmp.S ++++ b/sysdeps/x86_64/memcmp.S +@@ -21,14 +21,18 @@ + + .text + ENTRY (memcmp) +- test %rdx, %rdx ++#ifdef __ILP32__ ++ /* Clear the upper 32 bits. */ ++ movl %edx, %edx ++#endif ++ test %RDX_LP, %RDX_LP + jz L(finz) + cmpq $1, %rdx +- jle L(finr1b) ++ jbe L(finr1b) + subq %rdi, %rsi + movq %rdx, %r10 + cmpq $32, %r10 +- jge L(gt32) ++ jae L(gt32) + /* Handle small chunks and last block of less than 32 bytes. */ + L(small): + testq $1, %r10 +@@ -156,7 +160,7 @@ L(A32): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + /* Pre-unroll to be ready for unrolled 64B loop. */ + testq $32, %rdi + jz L(A64) +@@ -178,7 +182,7 @@ L(A64): + movq %r11, %r10 + andq $-64, %r10 + cmpq %r10, %rdi +- jge L(mt32) ++ jae L(mt32) + + L(A64main): + movdqu (%rdi,%rsi), %xmm0 +@@ -216,7 +220,7 @@ L(mt32): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + + L(A32main): + movdqu (%rdi,%rsi), %xmm0 +@@ -254,7 +258,7 @@ L(ATR): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + testq $16, %rdi + jz L(ATR32) + +@@ -325,7 +329,7 @@ L(ATR64main): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + + L(ATR32res): + movdqa (%rdi,%rsi), %xmm0 diff --git a/gnu/packages/patches/glibc-CVE-2019-9169.patch b/gnu/packages/patches/glibc-CVE-2019-9169.patch new file mode 100644 index 0000000000..029b4ddbd7 --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2019-9169.patch @@ -0,0 +1,22 @@ +Fix . + +Taken from this upstream commit, sans ChangeLog updates: +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=583dd860d5b833037175247230a328f0050dbfe9 + +diff --git a/posix/regexec.c b/posix/regexec.c +index 91d5a797b8..084b1222d9 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, + else if (naccepted) + { + char *buf = (char *) re_string_get_buffer (&mctx->input); +- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, +- naccepted) != 0) ++ if (mctx->input.valid_len - *pidx < naccepted ++ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, ++ naccepted) ++ != 0)) + return -1; + } + } diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch index addeed6dbd..39eb47ef26 100644 --- a/gnu/packages/patches/glibc-bootstrap-system.patch +++ b/gnu/packages/patches/glibc-bootstrap-system.patch @@ -5,26 +5,24 @@ instead uses the hard-coded absolute file name of `bash'. --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c -@@ -134,7 +134,7 @@ do_system (const char *line) - INIT_LOCK (); +@@ -140,7 +140,7 @@ do_system (const char *line) + __posix_spawnattr_setflags (&spawn_attr, + POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - /* Exec the shell. */ -- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); -+ (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ); - _exit (127); - } - else if (pid < (pid_t) 0) - +- status = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, ++ status = posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr, + (char *const[]){ (char*) SHELL_NAME, + (char*) "-c", + (char *) line, NULL }, --- a/libio/iopopen.c +++ b/libio/iopopen.c -@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode) - __close_nocancel (fd); - } - -- execl ("/bin/sh", "sh", "-c", command, (char *) 0); -+ execlp ("sh", "sh", "-c", command, (char *) 0); - _exit (127); +@@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command, + return false; } - __close_nocancel (child_end); - + +- if (__posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0, ++ if (posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0, + (char *const[]){ (char*) "sh", (char*) "-c", + (char *) command, NULL }, __environ) != 0) + return false; diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index 2888052bb8..05865dc7be 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -2,11 +2,11 @@ This patch is taken from debian's glibc package (generate-supported.mk). It install the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. -diff --git a/localedata/Makefile.old b/localedata/Makefile -index 34877c0..a61d9b9 100644 ---- a/localedata/Makefile.old +diff --git a/localedata/Makefile b/localedata/Makefile +index 65079f9eb8..14818f84e0 100644 +--- a/localedata/Makefile +++ b/localedata/Makefile -@@ -91,7 +91,8 @@ endif +@@ -169,7 +169,8 @@ endif # Files to install. install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ @@ -16,7 +16,7 @@ index 34877c0..a61d9b9 100644 tests: $(objdir)/iconvdata/gconv-modules -@@ -195,6 +196,14 @@ endif +@@ -380,6 +381,14 @@ endif include SUPPORTED @@ -28,6 +28,6 @@ index 34877c0..a61d9b9 100644 + $(make-target-directory) + $(INSTALL_DATA) LOCALES $@ + - INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) - - # Sometimes the whole collection of locale files should be installed. + INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) + INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) + \ No newline at end of file diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f3bea4a51d..d834cda915 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -360,7 +360,9 @@ data types.") (format #f "TESTOPTS=-j~d" (parallel-job-count)) ;; Exclude the following test, which fails as of 3.7.3 (see: ;; https://bugs.python.org/issue35998). - " --exclude test_asyncio"))) + ;; Exclude test_email, which fails with glibc 2.29 and later + ;; (see ). + " --exclude test_asyncio test_email"))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 6661b025a6c58be6572fc66c5db1073f56af30b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:13:03 +0200 Subject: gnu: openssl@1.0: Update to 1.0.2s. * gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2s. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 912069c26d..df04cbd9ab 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -374,7 +374,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.0.2r") + (version "1.0.2s") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -386,7 +386,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) + "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (outputs '("out" -- cgit v1.2.3 From 004b4056d490cf91cea5505b1a1c7d14c4215d86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:19:20 +0200 Subject: gnu: tzdata-for-tests: Update to 2019b. * gnu/packages/base.scm (tzdata-for-tests)[version, source, inputs]: Remove. --- gnu/packages/base.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0a82592a3a..f26145cb0b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1253,25 +1253,7 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata) - (version "2018g") - (source (origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzdata" - version ".tar.gz")) - (sha256 - (base32 - "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2")))) - (inputs - `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "http://data.iana.org/time-zones/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"))))))))) + (inherit tzdata)))) (define-public libiconv (package -- cgit v1.2.3 From fb82d3472d8bf5c5690d943a82b1bfa93eea58dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:21:13 +0200 Subject: gnu: Remove redundant icu4c@64 package. * gnu/packages/icu4c.scm (icu4c-64): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C-64 to ICU4C. --- gnu/packages/chromium.scm | 6 +----- gnu/packages/icu4c.scm | 16 ---------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 79828ef589..e357556956 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -714,11 +714,7 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - - ;; Build against ICU 64 to prevent a localization problem in version 75 - ;; and later: . - ("icu4c" ,icu4c-64) - + ("icu4c" ,icu4c) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index bc53e7ee3c..ec65aff6cb 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -85,22 +85,6 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) -(define-public icu4c-64 - (package - (inherit icu4c) - (version "64.2") - (source (origin - (inherit (package-source icu4c)) - (uri (string-append - "http://download.icu-project.org/files/icu4c/" version "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (sha256 - (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) - (native-inputs - `(;; For tests. - ("python" ,python))))) - (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From fefd1a7bd45f949ca062ba984a58532093dab841 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:00:03 +0200 Subject: gnu: libuv: Update to 1.30.1. * gnu/packages/libevent.scm (libuv): Update to 1.30.1. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 1f7a839ba5..e9e165a2ad 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -99,14 +99,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1rybx7fy2751551bn2fjfys0aam9i6xz3yccn3gi0iw5qgalxnsm")))) + "12s7ifwgbfxblhv46inqa8c2lsnl8cgmvd37y4a4248xhkx1d0s6")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From e7a42c4abb2f6b81c4e42b7715dd4724370b713c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:17:53 +0200 Subject: gnu: boost: Remove GCC5 workaround. * gnu/packages/patches/boost-fix-icu-build.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/boost.scm (boost)[source](patches): Remove. [arguments]: Do not pass "cxxflags". --- gnu/local.mk | 1 - gnu/packages/boost.scm | 4 +- gnu/packages/patches/boost-fix-icu-build.patch | 53 -------------------------- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/boost-fix-icu-build.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index da5262dcf6..b0d51406d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -698,7 +698,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 73b4cff4c8..6b8eebcecb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -56,8 +56,7 @@ version-with-underscores ".tar.bz2")))) (sha256 (base32 - "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")) - (patches (search-patches "boost-fix-icu-build.patch")))) + "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) @@ -69,7 +68,6 @@ `(#:tests? #f #:make-flags (list "threading=multi" "link=shared" - "cxxflags=-std=c++14" ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" diff --git a/gnu/packages/patches/boost-fix-icu-build.patch b/gnu/packages/patches/boost-fix-icu-build.patch deleted file mode 100644 index 556f91b8f7..0000000000 --- a/gnu/packages/patches/boost-fix-icu-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -Pass -std=c++11 when compiling files that include the ICU headers. Without -this flag, compilation fails and causes Boost's build system to remove ICU -support. Note that $(pkg-config --variable=CXXFLAGS icu-uc) includes -"-std=c++11", but Boost's build system does not use 'pkg-config'. - ---- boost_1_66_0/libs/locale/build/Jamfile.v2.orig 2017-12-13 18:56:44.000000000 -0500 -+++ boost_1_66_0/libs/locale/build/Jamfile.v2 2018-04-08 15:18:58.673025760 -0400 -@@ -65,8 +65,8 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; -- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin shared ; -+ ICU64_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin64 shared ; - } - else - { -@@ -121,6 +121,7 @@ - explicit icuuc icudt icuin ; - - ICU_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared -@@ -180,6 +181,7 @@ - explicit icuuc_64 icudt_64 icuin_64 ; - - ICU64_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc_64/shared/shared - icudt_64/shared/shared - icuin_64/shared/shared ---- boost_1_66_0/libs/regex/build/Jamfile.v2.orig 2017-12-13 18:56:48.000000000 -0500 -+++ boost_1_66_0/libs/regex/build/Jamfile.v2 2018-04-08 15:20:40.865532505 -0400 -@@ -44,7 +44,7 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; - } - else - { -@@ -78,6 +78,7 @@ - - ICU_OPTS = - $(ICU_PATH)/include -+ -std=c++11 - shared:icuuc/shared - shared:icudt/shared - shared:icuin/shared -- cgit v1.2.3 From 7ce9139f96b207a352c7e55f7ffe7dbd992b246a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:30:43 +0200 Subject: gnu: libarchive: Remove GCC5 workaround. * gnu/packages/backup.scm (libarchive)[arguments]: Remove <#:configure-flags>. --- gnu/packages/backup.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index beb3b09077..b7ca8e171e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -257,11 +257,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (string-append "-L" zlib "/lib -lz")) (("-lbz2") (string-append "-L" bzip2 "/lib -lbz2"))) - #t)))) - - ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be - ;; compiled with C99 or C11 or a gnu variant. - #:configure-flags '("CFLAGS=-O2 -g -std=c99"))) + #t)))))) (home-page "https://libarchive.org/") (synopsis "Multi-format archive and compression library") (description -- cgit v1.2.3 From c8f2050ab6d192abee199fd0a37b1fdf2ab9c281 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:55:55 +0200 Subject: gnu: gtkmm: Remove GCC5 workaround. * gnu/packages/gtk.scm (gtkmm)[arguments]: Remove <#:configure-flags>. * gnu/packages/gtk.scm (gtkmm-2)[arguments]: Likewise. --- gnu/packages/gtk.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e2e3b4365a..5098019506 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1115,10 +1115,7 @@ toolkit.") ("gtk+" ,gtk+) ("glibmm" ,glibmm))) (arguments - `(;; XXX: Tests require C++14 or later. Remove this when the default - ;; compiler is >= GCC6. - #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:disallowed-references (,xorg-server-for-tests) + `(#:disallowed-references (,xorg-server-for-tests) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) @@ -1154,8 +1151,7 @@ extensive documentation, including API reference and a tutorial.") (sha256 (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) - (arguments - '(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++ + (arguments '()) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("pangomm" ,pangomm) -- cgit v1.2.3 From 9f74ec98d34465770faec5a32685aaaee913f0bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:08:12 +0200 Subject: gnu: spirv-tools: Remove GCC7 input. * gnu/packages/vulkan.scm (spirv-tools)[native-inputs]: Remove GCC-7. [arguments]: Remove <#:phases>. --- gnu/packages/vulkan.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c16535f704..160d2615ff 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -32,7 +32,6 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages pkg-config) @@ -96,18 +95,10 @@ and for the GLSL.std.450 extended instruction set. (build-system cmake-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))) #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) - (native-inputs `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") (synopsis "API and commands for processing SPIR-V modules") -- cgit v1.2.3 From 29a4fe8b59003ee28df0e902525ef5de1b505fea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:09:16 +0200 Subject: gnu: vte-ng: Remove GCC7 input. * gnu/packages/gnome.scm (vte-ng)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b7152a3aff..ad6a70848e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -85,7 +85,6 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -2339,7 +2338,6 @@ editors, IDEs, etc.") (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) - ("gcc" ,gcc-7) ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -2348,9 +2346,6 @@ editors, IDEs, etc.") `(#:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ - ;; Work around GCC7 problem: . - (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - (setenv "NOCONFIGURE" "true") (invoke "sh" "autogen.sh")))))) (synopsis "Enhanced VTE terminal widget") -- cgit v1.2.3 From 9880bba2c8ebb30c35e34b5ff4314ece8f759528 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:13:06 +0200 Subject: gnu: ncmpc: Remove GCC8 input. * gnu/packages/mpd.scm (ncmpc)[native-inputs]: Remove GCC-8. [arguments]: Remve <#:phases>. --- gnu/packages/mpd.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 654d1e4edc..f72256fe50 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -33,7 +33,6 @@ #:use-module (guix build-system python) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -198,19 +197,8 @@ player daemon.") ;; Otherwise, they are installed incorrectly, in ;; '$out/share/man/man/man1'. (list (string-append "-Dmandir=" (assoc-ref %outputs "out") - "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'expand-C++-include-path - ;; Make /include/c++/ext/string_conversions.h find . - (lambda* (#:key inputs #:allow-other-keys) - (let* ((path "CPLUS_INCLUDE_PATH") - (gcc (assoc-ref inputs "gcc")) - (c++ (string-append gcc "/include/c++"))) - (setenv path (string-append c++ ":" (getenv path))) - #t)))))) - (inputs `(("gcc" ,gcc-8) ; for its C++14 support - ("boost" ,boost) + "/share")))) + (inputs `(("boost" ,boost) ("pcre" ,pcre) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) -- cgit v1.2.3 From b80dd5e3e08b7814db3451363c75f33749f8b797 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:18:07 +0200 Subject: gnu: waybar: Remove GCC input. * gnu/packages/wm.scm (waybar)[native-inputs]: Remove GCC-TOOLCHAIN-7. [arguments]: Remove <#:phases>. --- gnu/packages/wm.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 90bc7fc883..1747619a87 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -89,7 +89,6 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages logging) #:use-module (gnu packages serialization) - #:use-module (gnu packages commencement) ; TODO remove when default gcc version >=7 #:use-module (guix download) #:use-module (guix git-download)) @@ -1337,15 +1336,7 @@ modules for building a Wayland compositor.") (build-system meson-build-system) (arguments `(#:configure-flags - (list (string-append "-Dout=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; TODO remove when issue #30756 is resolved - (add-before 'configure 'fix-gcc - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))))) + (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) (inputs `(("fmt" ,fmt) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) @@ -1356,8 +1347,7 @@ modules for building a Wayland compositor.") ("pulseaudio" ,pulseaudio) ("spdlog" ,spdlog) ("wayland" ,wayland))) - (native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7 - ("glib:bin" ,glib "bin") + (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") -- cgit v1.2.3 From 554e234ebb5e2adc1b21e518a07a66ce2c723782 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:23:06 +0200 Subject: gnu: libgnomecanvasmm: Remove GCC5 workaround. * gnu/packages/gnome.scm (libgnomecanvasmm)[arguments]: Remove. --- gnu/packages/gnome.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad6a70848e..d3a348ba89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1820,8 +1820,6 @@ creating interactive structured graphics.") (base32 "0679hcnpam2gkag2i63sm0wdm35gwvzafnz1354mg6j5gzwpfrcr")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("CXXFLAGS=-std=c++11"))) ; required by gtkmm (propagated-inputs `(("libgnomecanvas" ,libgnomecanvas))) (native-inputs `(("gtkmm-2" ,gtkmm-2) -- cgit v1.2.3 From 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:19:46 +0200 Subject: gnu: glib-networking: Update to 2.60.3. * gnu/packages/gnome.scm (glib-networking): Update to 2.60.3. [source](patches): Remove. [arguments]<#:phases>: Remove. * gnu/packages/patches/glib-networking-connection.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 14 ++---- .../patches/glib-networking-connection.patch | 51 ---------------------- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-connection.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index b0d51406d9..bac1a92741 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -846,7 +846,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glib-networking-connection.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ %D%/packages/patches/glibc-CVE-2016-3075.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d3a348ba89..ecf39334e5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2595,7 +2595,7 @@ library.") (define-public glib-networking (package (name "glib-networking") - (version "2.58.0") + (version "2.60.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -2603,18 +2603,10 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) - (patches (search-patches "glib-networking-connection.patch")))) + "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dlibproxy_support=false") - #:phases (modify-phases %standard-phases - (add-before 'check 'disable-TLSv1.3 - (lambda _ - ;; XXX: One test fails when TLS 1.3 is enabled, fixed in 2.60.0: - ;; . - (setenv "G_TLS_GNUTLS_PRIORITY" "NORMAL:-VERS-TLS1.3") - #t))))) + `(#:configure-flags '("-Dlibproxy_support=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) diff --git a/gnu/packages/patches/glib-networking-connection.patch b/gnu/packages/patches/glib-networking-connection.patch deleted file mode 100644 index f64b090ae5..0000000000 --- a/gnu/packages/patches/glib-networking-connection.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gitlab.gnome.org/GNOME/glib-networking/issues/4 -https://gitlab.gnome.org/GNOME/glib-networking/commit/55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e.patch -This ultimately rejected work-around should be removed with the next -release, as the bug has supposedly been fixed for real. - - -From 55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 19 Jul 2018 11:16:35 -0500 -Subject: [PATCH] Fix intermittent failures in missing client private key test - -Because our APIs do nice things like encapsulating the TLS connection -establishment, we have our test server writing to the client after -establishing the TCP connection, because the TLS connection is -established. It's fine in theory, but results in some weirdness like the -server seeing its write having completed successfully before TLS -connection establishment. Normally that's what happens and this test -passes (server sees no error), but sometimes the server sees that the -client has already failed and the test fails. - -This is unfortunate, and tricky to fix properly, so let's just remove -the bad check. The point of the test is to ensure that the TLS -connection is not established, and the client-side check is going to -have to be sufficient, because rewriting the test to wait for the TLS -connection to be established on the server side is quite tricky: my -naive attempt resulted in both sides waiting forever on the other. - -P.S. At no point in this test does the server ever examine the client -certificate. That's not quite what I expected when I added the test, but -it's fine. - -Fixes #4 ---- - tls/tests/connection.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 94645c3..390275d 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -1125,7 +1125,6 @@ test_client_auth_fail_missing_client_private_key (TestConnection *test, - g_main_loop_run (test->loop); - - g_assert_error (test->read_error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED); -- g_assert_no_error (test->server_error); - } - - static void --- -2.18.1 - -- cgit v1.2.3 From cdeb3e39a82853cf44b63ab0216f18e871f89eb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:42:53 +0200 Subject: gnu: ganv: Remove GCC5 workaround. * gnu/packages/gtk.scm (ganv)[arguments]: Dont set CXXFLAGS. --- gnu/packages/gtk.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5098019506..2c751667dc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -297,8 +297,6 @@ functions which were removed.") (modify-phases %standard-phases (add-before 'configure 'set-flags (lambda* (#:key outputs #:allow-other-keys) - ;; Compile with C++11, required by gtkmm. - (setenv "CXXFLAGS" "-std=c++11") ;; Allow 'bin/ganv_bench' to find libganv-1.so. (setenv "LDFLAGS" (string-append "-Wl,-rpath=" -- cgit v1.2.3 From 7af60255ba318cea7bdc38bf1b3ac4fbee3bef92 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:45:39 +0200 Subject: gnu: non-sequencer: Remove GCC5 workaround. * gnu/packages/music.scm (non-sequencer)[arguments]: Remove <#:phases>. --- gnu/packages/music.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0a0677161a..08130d3c8e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1022,14 +1022,6 @@ Guile.") (%current-system)))) '("--disable-sse") '())) - #:phases - (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda _ - ;; Compile with C++11, required by libsigc++. - (setenv "CXXFLAGS" "-std=c++11") - #t))) #:python ,python-2)) (inputs `(("jack" ,jack-1) -- cgit v1.2.3 From ed59057b6e1d8533b85470054bcde91947346c50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:47:29 +0200 Subject: gnu: lvtk: Remove obsolete workarounds. * gnu/packages/audio.scm (lvtk)[arguments]: Remove <#:phases>. --- gnu/packages/audio.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eff4edeb59..44318bc450 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1948,22 +1948,7 @@ software.") #:configure-flags (list (string-append "--boost-includes=" (assoc-ref %build-inputs "boost") - "/include")) - #:phases (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda* (#:key inputs #:allow-other-keys) - ;; See e.g. https://github.com/lvtk/lvtk/issues/21 - (setenv "LDFLAGS" - (string-append - "-L" (assoc-ref inputs "boost") "/lib " - "-lboost_system")) - ;; Needed for gtkmm - (substitute* '("src/wscript_build" - "examples/wscript_build") - (("cxxflags.*= \\[" line) - (string-append line "\"-std=c++11\", "))) - #t))))) + "/include")))) (inputs `(("boost" ,boost) ("gtkmm" ,gtkmm-2) -- cgit v1.2.3 From 3cd9350e08161df61bef10ff76944d4f6a9160ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:54:28 +0200 Subject: gnu: pavucontrol: Remove GCC5 workaround. * gnu/packages/pulseaudio.scm (pavucontrol)[arguments]: Remove. --- gnu/packages/pulseaudio.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 96d15bdf9c..5f8512716d 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -221,8 +221,6 @@ sound server.") (base32 "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("CXXFLAGS=-std=c++11"))) ; required by gtkmm (inputs `(("libcanberra" ,libcanberra) ("gtkmm" ,gtkmm) -- cgit v1.2.3 From 529c9ac5e0d2483a5eee14cf09e3db8fe2405103 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:00:33 +0200 Subject: gnu: nitrogen: Remove redundant configure flags. * gnu/packages/wm.scm (nitrogen)[arguments]: Remove. --- gnu/packages/wm.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1747619a87..871a6b0706 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1075,10 +1075,6 @@ project derived from the original Calm Window Manager.") ("glibmm" ,glibmm))) (native-inputs `(("pkg-config" ,pkg-config))) - (arguments - `(#:configure-flags (list - (string-append "--prefix=" %output) - "CXXFLAGS=-std=c++11"))) (home-page "http://projects.l3ib.org/nitrogen/") (synopsis "Background browser and setter for X windows") (description -- cgit v1.2.3 From d0521758c6065c2520071c2652b18e18fc05acf5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:04:06 +0200 Subject: gnu: polkit: Remove GCC5 workaround. * gnu/packages/polkit.scm (polkit)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/polkit.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index ac24adef43..7cc35f1ed9 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -100,9 +100,6 @@ ("gobject-introspection" ,gobject-introspection))) (arguments `(#:configure-flags '("--sysconfdir=/etc" - ;; XXX: MozJS 60 requires the C++11 ABI or higher. - ;; Remove when the default compiler is >= GCC 6. - "CXXFLAGS=-std=gnu++11" "--enable-man-pages") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7960bb27c5759ae5f927eaa66a1d5637ebfbe060 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:08:14 +0200 Subject: gnu: libtorrent-rasterbar: Remove GCC5 workaround. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/bittorrent.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 1e171dcb6a..e622170815 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -395,8 +395,7 @@ and will take advantage of multiple processor cores where possible.") (assoc-ref %build-inputs "boost") "/lib") "--enable-python-binding" - "--enable-tests" - "CXXFLAGS=-std=c++11") ; Use std::chrono instead of boost + "--enable-tests") #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 6002a0b635f821019fd7b10d4eefe7f4eb0eee58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:39:30 +0200 Subject: gnu: libtirpc: Do not build 'libtirpc.a'. * gnu/packages/onc-rpc.scm (libtirpc)[arguments]: Add <#:configure-flags>. --- gnu/packages/onc-rpc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 8f66b07527..9646fbf4bd 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -45,7 +45,8 @@ "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-after 'unpack 'remote-dangling-symlink (lambda _ -- cgit v1.2.3 From f03cda4d1e4415a5c1e83b4c8280724cd0ffa05c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:40:28 +0200 Subject: gnu: lash: Add dependency on libtirpc. * gnu/packages/audio.scm (lash)[arguments]: Add <#:make-flags>. [inputs]: Add LIBTIRPC. --- gnu/packages/audio.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 44318bc450..b9217dfa53 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages qt) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) @@ -1683,7 +1684,12 @@ to be plugged into a wide range of audio synthesis and recording packages.") "12z1vx3krrzsfccpah9xjs68900xvr7bw92wx8np5871i2yv47iw")))) (build-system gnu-build-system) (arguments - '(#:phases + '(;; Glibc no longer includes Sun RPC support, so tell the build system + ;; to use libtirpc instead. + #:make-flags (list (string-append "CFLAGS=-I" + (assoc-ref %build-inputs "libtirpc") + "/include/tirpc -ltirpc")) + #:phases (modify-phases %standard-phases ;; lashd embeds an ancient version of sigsegv so we just skip it (add-after 'unpack 'skip-lashd @@ -1696,6 +1702,7 @@ to be plugged into a wide range of audio synthesis and recording packages.") `(("bdb" ,bdb) ("gtk" ,gtk+-2) ("jack" ,jack-1) + ("libtirpc" ,libtirpc) ("readline" ,readline) ("python" ,python-2))) ;; According to pkg-config, packages depending on lash also need to have -- cgit v1.2.3 From 1ea1ce18ade18468e4c00a23ccfa75197c3b62ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:41:21 +0200 Subject: gnu: sdl2: Fix FTBFS with GCC7. * gnu/packages/sdl.scm (sdl2)[arguments]: Add <#:make-flags>. --- gnu/packages/sdl.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index b6b28b7d06..c012dbced1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,6 +122,15 @@ joystick, and graphics hardware.") ((#:configure-flags flags) `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared") + ,flags)) + ((#:make-flags flags ''()) + ;; Add the Fcitx header files to GCCs "system header" search path + ;; in order to suppress compiler warnings induced by those: + ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids + ;; mixed declarations and code [-Werror=declaration-after-statement] + `(append (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "fcitx") + "/include")) ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems -- cgit v1.2.3 From 5ab605b9520e28657a1cdb8444c1ddc2b0731ada Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 16:16:11 +0200 Subject: gnu: libxt: Update to 1.2.0. * gnu/packages/xorg.scm (libxt): Update to 1.2.0. * gnu/packages/patches/libxt-guix-search-paths.patch: Adjust for 1.2.0. While at it, trim spurious whitespaces. --- gnu/packages/patches/libxt-guix-search-paths.patch | 42 +++++++++++----------- gnu/packages/xorg.scm | 4 +-- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch b/gnu/packages/patches/libxt-guix-search-paths.patch index c618f48da5..5419edd1bd 100644 --- a/gnu/packages/patches/libxt-guix-search-paths.patch +++ b/gnu/packages/patches/libxt-guix-search-paths.patch @@ -1,26 +1,27 @@ ---- libXt-1.1.5/src/Intrinsic.c 2015-05-01 07:36:20.000000000 +0200 -+++ Intrinsic.c 2016-12-12 00:42:16.567388450 +0100 -@@ -1303,21 +1303,101 @@ +diff --git a/src/Intrinsic.c b/src/Intrinsic.c +index c9624ec..addcdba 100644 +--- a/src/Intrinsic.c ++++ b/src/Intrinsic.c +@@ -1312,21 +1312,101 @@ static void FillInLangSubs( } else (void) strcpy(*rest, string); } --/* ++ ++ + /* - * default path used if environment variable XFILESEARCHPATH - * is not defined. Also substitued for %D. - * The exact value should be documented in the implementation - * notes for any Xt implementation. -+ -+ -+/* + Return the default search path for the function -+ XtResolvePathname to use if XFILESEARCHPATH is ++ XtResolvePathname to use if XFILESEARCHPATH is + not defined. + + It returns the combination the set of values which are the 6 "stems" below, -+ prepended with "/run/current-system/profile", and $GUIX_PROFILE and ++ prepended with "/run/current-system/profile", and $GUIX_PROFILE and + "$HOME/.guix-profile" + -+ These values provide the default paths where Guix/GuixSD can expect ++ These values provide the default paths where Guix/GuixSD can expect + to find resources for installed packages. */ -static const char *implementation_default_path(void) @@ -28,11 +29,6 @@ { -#if defined(WIN32) - static char xfilesearchpath[] = ""; -- -- return xfilesearchpath; --#else -- return XFILESEARCHPATHDEFAULT; --#endif + static const char *search_path_default_stem[] = { + "/lib/X11/%L/%T/%N%C%S", + "/lib/X11/%l/%T/%N%C%S", @@ -55,7 +51,7 @@ + char *home = getenv ("HOME"); + char *guix_profile = getenv ("GUIX_PROFILE"); + -+ size_t bytesAllocd = SIZEOF_STEMS + 1; ++ size_t bytesAllocd = SIZEOF_STEMS + 1; + + /* This function is evaluated multiple times and the calling + code assumes that it is idempotent. So we must not allow @@ -72,7 +68,11 @@ + bytesAllocd += SIZEOF_STEMS; + bytesAllocd += 6 * (1 + strlen (guix_profile)); + } -+ + +- return xfilesearchpath; +-#else +- return XFILESEARCHPATHDEFAULT; +-#endif + if (home != NULL) + { + bytesAllocd += SIZEOF_STEMS; @@ -83,7 +83,7 @@ + if (path == NULL) _XtAllocError(NULL); + + memset (path, 0, bytesAllocd); -+ ++ + for (i = 0 ; i < 6 ; ++i) + { + strcat (path, current_profile); @@ -110,17 +110,17 @@ + + /* Remove final : */ + path[strlen(path) - 1] = '\0'; -+ ++ + return path; } -@@ -1345,7 +1425,7 @@ +@@ -1354,7 +1434,7 @@ _XtString XtResolvePathname( { XtPerDisplay pd; static const char *defaultPath = NULL; - const char *impl_default = implementation_default_path(); + const char *impl_default = guix_default_path(); - int idef_len = strlen(impl_default); + int idef_len = (int) strlen(impl_default); char *massagedPath; int bytesAllocd, bytesLeft; diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bd84c1bf3e..1653810c0d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5304,7 +5304,7 @@ draggable titlebars and borders.") (define-public libxt (package (name "libxt") - (version "1.1.5") + (version "1.2.0") (source (origin (method url-fetch) @@ -5314,7 +5314,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6")) + "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk")) (patches (search-patches "libxt-guix-search-paths.patch")))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From 6657b0711efea3ba3633529f94f5821a8ec9b217 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 4 Jul 2019 09:57:31 +0200 Subject: gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. These are ghc-8.4-bundled packages, removing to avoid build conflicts. * gnu/packages/haskell.scm (ghc-parsec, ghc-stm, ghc-text): Remove. * gnu/packages/haskell-web.scm (ghc-xhtml): Remove. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-stm and ghc-text. * gnu/packages/bioinformatics.scm (ngless)[inputs]: Remove ghc-parsec and ghc-text. * gnu/packages/haskell-apps.scm (darcs)[inputs]: Remove ghc-parsec. (git-annex)[inputs]: Remove ghc-stm and ghc-text. (ghc-sdl2)[inputs]: Remove ghc-text. (ghc-sdl2-image)[inputs]: Remove ghc-text. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml)[inputs]: Remove ghc-stm. (ghc-tasty)[inputs]: Remove ghc-stm. (ghc-tasty-rerun)[inputs]: Same. (ghc-quickcheck-instances)[inputs]: Remove ghc-text. (ghc-hedgehog)[inputs]: Remove ghc-stm. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding)[inputs]: Remove ghc-text. * gnu/packages/haskell-web.scm (ghc-tagsoup)[inputs]: Remove ghc-text. (ghc-cookie)[inputs]: Same. (ghc-http-types)[inputs]: Same. (ghc-http)[inputs]: Remove ghc-parsec. (ghc-http-client)[inputs]: Remove ghc-text. (ghc-http2)[inputs]: Remove ghc-stm. (ghc-http-conduit)[native-inputs]: Remove ghc-text. (ghc-wai)[inputs]: Same. (ghc-wai-extra)[inputs]: Same. (ghc-warp)[inputs]: Remove ghc-stm and ghc-text. (ghc-xss-sanitize)[native-inputs]: Remove ghc-text. (ghc-css-text)[inputs]: Same. (ghc-mime-types)[inputs]: Same. (ghc-blaze-html)[inputs]: Same. (ghc-aeson)[inputs]: Same. (ghc-aeson-pretty)[inputs]: Same. (ghc-aeson-qq)[inputs]: Remove ghc-text and ghc-parsec. (ghc-multipart)[inputs]: Remove ghc-parsec. (ghc-uri-encode)[inputs]: Remove ghc-text. (ghc-path-pieces)[inputs]: Same. (ghc-yesod-core)[inputs]: Remove ghc-text and ghc-parsec. (ghc-yesod-persistent)[inputs]: Remove ghc-text. (ghc-yesod-form)[inputs]: Same. (ghc-yesod)[inputs]: Same. (ghc-hxt-regex-xmlschema)[inputs]: Remove ghc-parsec and ghc-text. (ghc-hxt)[inputs]: Remove ghc-parsec. * gnu/packages/haskell.scm (ghc-convertible)[inputs]: Remove ghc-text. (ghc-double-conversion)[inputs]: Same. (ghc-tree-diff)[inputs]: Remove ghc-parsec and ghc-text. [native-inputs]: Remove ghc-parsec. (ghc-cgi)[inputs]: Remove ghc-parsec. (hlint)[inputs]: Remove ghc-text. (ghc-openglraw)[inputs]: Remove ghc-text. (ghc-opengl)[inputs]: Same. (ghc-streaming-commons)[inputs]: Remove ghc-stm and ghc-text. (ghc-hackage-security)[inputs]: Remove ghc-parsec. (cabal-install)[inputs]: Remove ghc-stm. (ghc-parsec-numbers)[inputs]: Remove ghc-parsec. (ghc-safesemaphore)[inputs]: Remove ghc-stm. (ghc-text-binary)[inputs]: Remove ghc-text. (ghc-hashable)[inputs]: Remove ghc-text. (ghc-transformers-base)[inputs]: Remove ghc-stm. (ghc-indents)[inputs]: Remove ghc-parsec. (ghc-regex-tdfa-rc)[inputs]: Same. (ghc-regex-tdfa-text)[inputs]: Same. (ghc-regex)[inputs]: Remove ghc-text. (ghc-parsers)[inputs]: Remove ghc-parsec and ghc-text. (ghc-attoparsec)[inputs]: Remove ghc-text. (ghc-attoparsec-bootstrap)[inputs]: Same. (ghc-zip-archive)[inputs]: Same. (ghc-polyparse)[inputs]: Same. (ghc-reducers)[inputs]: Same. (ghc-xml)[inputs]: Same. (ghc-feed)[inputs]: Same. (ghc-exceptions)[inputs]: Remove ghc-stm. (ghc-case-insensitive)[inputs]: Remove ghc-text. (ghc-megaparsec)[inputs]: Same. (ghc-network-uri)[inputs]: Remove ghc-parsec. (ghc-monad-control)[inputs]: Remove ghc-stm. (ghc-blaze-builder)[inputs]: Remove ghc-text. (ghc-blaze-markup)[inputs]: Same. (ghc-async)[inputs]: Remove ghc-stm. (ghc-invariant)[inputs]: Same. (ghc-statevar)[inputs]: Same. (ghc-lens)[inputs]: Remove ghc-text. (ghc-cheapskate)[inputs]: Same. (ghc-semigroups)[inputs]: Same. (ghc-semigroups-bootstrap)[inputs]: Same. (ghc-fast-logger)[inputs]: Same. (ghc-scientific)[inputs]: Same. (ghc-scientific-bootstrap)[inputs]: Same. (ghc-texmath)[inputs]: Remove ghc-parsec. (ghc-highlighting-kate)[inputs]: Same. (ghc-cmark)[inputs]: Remove ghc-text. (ghc-cmark-gfm)[inputs]: Same. (ghc-th-lift-instances)[inputs]: Same. (ghc-yaml)[inputs]: Same. (ghc-hslua)[inputs]: Same. (ghc-hslua-module-text)[inputs]: Same. (ghc-skylighting-core)[inputs]: Same. (ghc-doctemplates)[inputs]: Remove ghc-text and ghc-parsec. (ghc-pandoc)[inputs]: Same. (ghc-typed-process)[inputs]: Remove ghc-stm. (ghc-conduit-extra)[inputs]: Remove ghc-stm and ghc-text. (ghc-xml-types)[inputs]: Remove ghc-text. (ghc-xml-conduit)[inputs]: Same. (ghc-pandoc-citeproc)[inputs]: Remove ghc-text and ghc-parsec. (ghc-regex-tdfa)[inputs]: Remove ghc-parsec. (ghc-wl-pprint-text)[inputs]: Remove ghc-text. (ghc-graphviz)[inputs]: Same. (ghc-system-filepath-bootstrap)[inputs]: Same. (ghc-system-fileio-bootstrap)[inputs]: Same. (ghc-shelly)[inputs]: Same. (ghc-chell)[inputs]: Same. (ghc-system-filepath)[inputs]: Same. (ghc-system-fileio)[inputs]: Same. (ghc-fsnotify)[inputs]: Same. (ghc-json)[inputs]: Remove ghc-text and ghc-parsec. (ghc-esqueleto)[inputs]: Remove ghc-text. (shellcheck)[inputs]: Remove ghc-parsec. (ghc-errors)[inputs]: Remove ghc-text. (ghc-chunked-data)[inputs]: Same. (ghc-uuid-types)[inputs]: Same. (ghc-uuid)[inputs]: Same. (ghc-rebase)[inputs]: Remove ghc-stm and ghc-text. (ghc-foldl)[inputs]: Remove ghc-text. (ghc-mono-traversable)[inputs]: Same. (ghc-conduit-combinators)[inputs]: Same. (ghc-aws)[inputs]: Same. (ghc-stm-chans)[inputs]: Remove ghc-stm. (ghc-monad-logger)[inputs]: Remove ghc-text and ghc-stm. (ghc-shakespeare)[inputs]: Remove ghc-parsec and ghc-text. (ghc-resource-pool)[inputs]: Remove ghc-stm. (ghc-attoparsec-iso8601)[inputs]: Remove ghc-text. (ghc-http-api-data)[inputs]: Same. (ghc-persistent)[inputs]: Same. (ghc-aeson-compat)[inputs]: Same. (ghc-persistent-template)[inputs]: Same. (ghc-unliftio)[inputs]: Remove ghc-stm. (ghc-persistent-sqlite)[native-inputs]: Remove ghc-text. (ghc-bytes)[inputs]: Same. (ghc-missingh)[inputs]: Remove ghc-parsec. (ghc-rio)[inputs]: Remove ghc-text. (ghc-cairo)[inputs]: Same. (ghc-atomic-write)[inputs]: Remove ghc-text. [native-inputs]: Same. (ghc-stm-conduit)[inputs]: Remove ghc-stm. (ghc-conduit-algorithms)[inputs]: Same. (ghc-interpolate)[native-inputs]: Remove ghc-text. (ghc-hpack)[inputs]: Same. (ghc-inline-c)[inputs]: Remove ghc-parsec. (ghc-configurator)[inputs]: Remove ghc-text. (ghc-c2hs)[native-inputs]: Same. (ghc-libmpd)[inputs]: Same. (ghc-concurrent-output)[inputs]: Remove ghc-stm. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-text. * gnu/packages/wm.scm (xmobar)[inputs]: Remove ghc-parsec and ghc-stm. Signed-off-by: Ricardo Wurmus --- gnu/packages/agda.scm | 2 - gnu/packages/bioinformatics.scm | 2 - gnu/packages/haskell-apps.scm | 5 - gnu/packages/haskell-check.scm | 7 +- gnu/packages/haskell-crypto.scm | 3 +- gnu/packages/haskell-web.scm | 79 ++--------- gnu/packages/haskell.scm | 295 ++++++---------------------------------- gnu/packages/idris.scm | 1 - gnu/packages/wm.scm | 2 - 9 files changed, 54 insertions(+), 342 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 646595705b..0f9b4299c3 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -64,9 +64,7 @@ ("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))) (arguments diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9a30a0eaff..719ede495b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13973,13 +13973,11 @@ datasets.") ("ghc-intervalmap" ,ghc-intervalmap) ("ghc-missingh" ,ghc-missingh) ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-parsec" ,ghc-parsec) ("ghc-regex" ,ghc-regex) ("ghc-safe" ,ghc-safe) ("ghc-safeio" ,ghc-safeio) ("ghc-strict" ,ghc-strict) ("ghc-tar" ,ghc-tar) - ("ghc-text" ,ghc-text) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unliftio-core" ,ghc-unliftio-core) ("ghc-vector" ,ghc-vector) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d675863090..e01f796178 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -99,7 +99,6 @@ ("ghc-html" ,ghc-html) ("ghc-mmap" ,ghc-mmap) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-regex-applicative" ,ghc-regex-applicative) ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) @@ -242,10 +241,8 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ("ghc-securemem" ,ghc-securemem) ("ghc-socks" ,ghc-socks) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-stm-chans" ,ghc-stm-chans) ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) @@ -285,7 +282,6 @@ used to keep a folder in sync between computers.") `(("ghc-exceptions" ,ghc-exceptions) ("ghc-linear" ,ghc-linear) ("ghc-statevar" ,ghc-statevar) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("sdl2" ,sdl2))) (native-inputs @@ -347,7 +343,6 @@ programming.") (build-system haskell-build-system) (inputs `(("ghc-sdl2" ,ghc-sdl2) - ("ghc-text" ,ghc-text) ("sdl2-image" ,sdl2-image))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 9b010fd5eb..98d5c064ff 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -54,7 +54,6 @@ (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) ("ghc-xml" ,ghc-xml) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page @@ -194,8 +193,7 @@ timer functions of different operating systems via a unified API.") "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-tagged" ,ghc-tagged) + `(("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) @@ -301,7 +299,6 @@ test-framework.") `(("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-reducers" ,ghc-reducers) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page "https://github.com/ocharles/tasty-rerun") @@ -364,7 +361,6 @@ development.") ("ghc-old-time" ,ghc-old-time) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) @@ -851,7 +847,6 @@ implementations of cryptographic ciphers.") ("ghc-random" ,ghc-random) ("ghc-resourcet" ,ghc-resourcet) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-stm" ,ghc-stm) ("ghc-th-lift" ,ghc-th-lift) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-wl-pprint-annotated" diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 8d28a77fc1..28a1647fd1 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -69,8 +69,7 @@ format.") (build-system haskell-build-system) (inputs `(("ghc-hourglass" ,ghc-hourglass) - ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-text" ,ghc-text))) + ("ghc-asn1-types" ,ghc-asn1-types))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6b7103562f..4bb790d93c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -47,7 +47,6 @@ (base32 "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://community.haskell.org/~ndm/tagsoup/") @@ -80,7 +79,6 @@ for screen-scraping.") (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -136,8 +134,7 @@ requests, and the library is intended for implementing Ajax APIs.") ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) ("hspec-discover" ,hspec-discover))) (inputs - `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-text" ,ghc-text))) + `(("ghc-case-insensitive" ,ghc-case-insensitive))) (home-page "https://github.com/aristidb/http-types") (synopsis "Generic HTTP types for Haskell") (description "This package provides generic HTTP types for Haskell (for @@ -169,7 +166,6 @@ both client and server code).") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-http-types" ,ghc-http-types) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) @@ -215,7 +211,6 @@ responses coming back.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-random" ,ghc-random) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) @@ -308,13 +303,12 @@ Date in Haskell.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-word8" ,ghc-word8) - ("ghc-psqueues" ,ghc-psqueues) - ("ghc-stm" ,ghc-stm))) - (native-inputs - `(("ghc-glob" ,ghc-glob) - ("ghc-hspec" ,ghc-hspec) - ("ghc-doctest" ,ghc-doctest) - ("hspec-discover" ,hspec-discover))) + ("ghc-psqueues" ,ghc-psqueues))) + (native-inputs + `(("ghc-glob" ,ghc-glob) + ("ghc-hspec" ,ghc-hspec) + ("ghc-doctest" ,ghc-doctest) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/kazu-yamamoto/http2") (synopsis "HTTP/2 library including frames, priority queues and HPACK") (description "This package provides a HTTP/2.0 library including frames @@ -358,7 +352,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-connection" ,ghc-connection) ("ghc-warp-tls" ,ghc-warp-tls) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-conduit" ,ghc-conduit) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-case-insensitive" ,ghc-case-insensitive) @@ -402,7 +395,6 @@ which allow you to avoid direct usage of conduits.") ("ghc-vault" ,ghc-vault) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) - ("ghc-text" ,ghc-text) ("ghc-http-types" ,ghc-http-types))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -482,7 +474,6 @@ communication between web applications and web servers.") ("ghc-void" ,ghc-void) ("ghc-wai" ,ghc-wai) ("ghc-http-types" ,ghc-http-types) - ("ghc-text" ,ghc-text) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unix-compat" ,ghc-unix-compat) @@ -569,9 +560,7 @@ transfers.") ("ghc-http-types" ,ghc-http-types) ("ghc-iproute" ,ghc-iproute) ("ghc-network" ,ghc-network) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) @@ -670,8 +659,7 @@ a WAI handler, via the native Haskell TLS implementation.") ("ghc-css-text" ,ghc-css-text) ("ghc-network-uri" ,ghc-network-uri))) (native-inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/yesodweb/haskell-xss-sanitize") @@ -697,8 +685,7 @@ attacks.") "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://www.yesodweb.com/") @@ -720,8 +707,6 @@ Haskell.") (base32 "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "https://github.com/yesodweb/wai") (synopsis "Basic MIME type handling types and functions") (description @@ -751,28 +736,6 @@ Haskell.") documents.") (license license:bsd-3))) -(define-public ghc-xhtml - (package - (name "ghc-xhtml") - (version "3000.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xhtml/xhtml-" - version - ".tar.gz")) - (sha256 - (base32 - "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) - (build-system haskell-build-system) - (home-page "https://github.com/haskell/xhtml") - (synopsis "XHTML combinator library") - (description - "This package provides combinators for producing XHTML 1.0, including the -Strict, Transitional and Frameset variants.") - (license license:bsd-3))) - (define-public ghc-blaze-html (package (name "ghc-blaze-html") @@ -789,7 +752,6 @@ Strict, Transitional and Frameset variants.") (build-system haskell-build-system) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-blaze-markup" ,ghc-blaze-markup))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -825,7 +787,6 @@ Strict, Transitional and Frameset variants.") ("ghc-hashable" ,ghc-hashable) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -867,7 +828,6 @@ naming: in Greek mythology, Aeson was the father of Jason.)") ("ghc-base-compat" ,ghc-base-compat) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-cmdargs" ,ghc-cmdargs))) @@ -897,12 +857,10 @@ essentially the opposite of pretty-printing.") (build-system haskell-build-system) (inputs `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) - ("ghc-parsec" ,ghc-parsec) ("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -931,8 +889,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-stringsearch" ,ghc-stringsearch))) + `(("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis @@ -956,8 +913,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string) + `(("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") @@ -978,7 +934,6 @@ of a JSON value into a @code{Data.Aeson.Value}.") (base32 "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -1067,7 +1022,6 @@ avoid any issues with characters.") (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) - ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-clientsession" ,ghc-clientsession) @@ -1081,7 +1035,6 @@ avoid any issues with characters.") ("ghc-cookie" ,ghc-cookie) ("ghc-http-types" ,ghc-http-types) ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-parsec" ,ghc-parsec) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) ("ghc-fast-logger" ,ghc-fast-logger) @@ -1147,8 +1100,7 @@ functions, widgets, etc.") (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-wai-extra" ,ghc-wai-extra) ("ghc-yesod-core" ,ghc-yesod-core) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-text" ,ghc-text))) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite))) (home-page "http://www.yesodweb.com/") (synopsis "Helpers for using Persistent from Yesod") (description "This Haskell package provides helpers for using Persistent @@ -1179,7 +1131,6 @@ from Yesod.") ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-email-validate" ,ghc-email-validate) - ("ghc-text" ,ghc-text) ("ghc-wai" ,ghc-wai) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) @@ -1226,7 +1177,6 @@ providing richtext field using Nic editor. ") ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) - ("ghc-text" ,ghc-text) ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-conduit" ,ghc-conduit) @@ -1309,8 +1259,6 @@ ignored.") (build-system haskell-build-system) (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) - ("ghc-parsec" ,ghc-parsec) - ("ghc-text" ,ghc-text) ("ghc-hunit" ,ghc-hunit))) (home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema") (synopsis "Regular expression library for W3C XML Schema regular expressions") @@ -1336,8 +1284,7 @@ derivations of regular expressions.") "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) + `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) ("ghc-network-uri" ,ghc-network-uri))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 17fddc1965..091e52323e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -607,8 +607,7 @@ determine the hostname.") (build-system haskell-build-system) (inputs `(("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text))) + ("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description @@ -633,7 +632,6 @@ function performs the conversion you desire.") (base32 "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) @@ -939,12 +937,10 @@ efficient memo functions using tries.") ("ghc-generics-sop" ,ghc-generics-sop) ("ghc-hashable" ,ghc-hashable) ("ghc-memotrie" ,ghc-memotrie) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsers" ,ghc-parsers) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) ("ghc-vector" ,ghc-vector))) @@ -953,7 +949,6 @@ efficient memo functions using tries.") ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-parsec" ,ghc-parsec) ("ghc-trifecta" ,ghc-trifecta) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) @@ -1254,8 +1249,7 @@ tool lex or flex for C/C++.") (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") "QuickCheck >= 2.8.1 && < 2.12"))))))) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-exceptions" ,ghc-exceptions) + `(("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network))) @@ -1491,7 +1485,6 @@ specify refactorings without depending on GHC.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-data-default" ,ghc-data-default) ("ghc-cmdargs" ,ghc-cmdargs) ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) @@ -1709,8 +1702,7 @@ arithmetic.") (inputs `(("ghc-half" ,ghc-half) ("ghc-fixed" ,ghc-fixed) - ("glu" ,glu) - ("ghc-text" ,ghc-text))) + ("glu" ,glu))) (home-page "https://www.haskell.org/haskellwiki/Opengl") (synopsis "Raw Haskell bindings for the OpenGL graphics system") (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 @@ -1791,8 +1783,7 @@ basis for a nicer interface.") "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-objectname" ,ghc-objectname) + `(("ghc-objectname" ,ghc-objectname) ("ghc-gluraw" ,ghc-gluraw) ("ghc-statevar" ,ghc-statevar) ("ghc-openglraw" ,ghc-openglraw))) @@ -1822,8 +1813,6 @@ version 1.3).") ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) - ("ghc-stm" ,ghc-stm) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) @@ -2057,7 +2046,6 @@ MinTTY and other consoles.") ("ghc-ed25519" ,ghc-ed25519) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-parsec" ,ghc-parsec) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (native-inputs @@ -2137,7 +2125,6 @@ Unix systems.") ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) ("ghc-resolv" ,ghc-resolv) - ("ghc-stm" ,ghc-stm) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") @@ -2185,8 +2172,6 @@ configuration. This library provides the common bits for writing custom (sha256 (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) (build-system haskell-build-system) - (inputs - `(("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/parsec-numbers") (synopsis "Utilities for parsing numbers from strings") (description @@ -2400,34 +2385,6 @@ suitable for most tasks and for the few cases where more control is needed it provides access to the full zlib feature set.") (license license:bsd-3))) -(define-public ghc-stm - (package - (name "ghc-stm") - (version "2.4.5.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stm/stm-" - version - ".tar.gz")) - (sha256 - (base32 - "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/stm") - (synopsis "Software Transactional Memory") - (description - "Software Transactional Memory, or STM, is an abstraction for concurrent -communication. The main benefits of STM are composability and modularity. -That is, using STM you can write concurrent abstractions that can be easily -composed with any other abstraction built using STM, without exposing the -details of how your abstraction ensures safety. This is typically not the -case with other forms of concurrent communication, such as locks or -@code{MVar}s.") - (license license:bsd-3))) - (define-public ghc-parallel (package (name "ghc-parallel") @@ -2463,8 +2420,6 @@ case with other forms of concurrent communication, such as locks or (base32 "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") @@ -2474,38 +2429,6 @@ used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which are not exception safe and can be broken by @code{killThread}.") (license license:bsd-3))) -(define-public ghc-text - (package - (name "ghc-text") - (version "1.2.3.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text/text-" - version - ".tar.gz")) - (sha256 - (base32 - "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) - (build-system haskell-build-system) - ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text - (arguments `(#:tests? #f)) - (inputs - `(("ghc-random" ,ghc-random))) - (home-page "https://github.com/bos/text") - (synopsis "Efficient packed Unicode text type library") - (description - "An efficient packed, immutable Unicode text type (both strict and -lazy), with a powerful loop fusion optimization framework. - -The @code{Text} type represents Unicode character strings, in a time and -space-efficient manner. This package provides text processing -capabilities that are optimized for performance critical use, both -in terms of large data quantities and high speed.") - (license license:bsd-3))) - (define-public ghc-text-binary (package (name "ghc-text-binary") @@ -2520,7 +2443,6 @@ in terms of large data quantities and high speed.") (base32 "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://github.com/kawu/text-binary") (synopsis "Binary instances for text types") (description @@ -2566,8 +2488,7 @@ IO operations.") "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) @@ -2749,8 +2670,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/transformers-compat") (synopsis @@ -2850,8 +2770,7 @@ isn't available, portable implementations are used.") ;; This package needs an older version of tasty. (arguments '(#:tests? #f)) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-concatenative" ,ghc-concatenative))) + `(("ghc-concatenative" ,ghc-concatenative))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -2999,8 +2918,7 @@ Haskell library @code{regex-base}.") "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3")))) (build-system haskell-build-system) (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-parsec" ,ghc-parsec))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") @@ -3023,8 +2941,7 @@ Haskell library @code{regex-base}.") "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-regex-base" ,ghc-regex-base) + `(("ghc-regex-base" ,ghc-regex-base) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "http://hackage.haskell.org/package/regex-tdfa-text") @@ -3064,7 +2981,6 @@ Haskell library @code{regex-base}.") ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -3099,10 +3015,8 @@ copious examples.") (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-parsec" ,ghc-parsec) ("ghc-scientific" ,ghc-scientific) ("ghc-charset" ,ghc-charset) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers))) (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") @@ -3203,8 +3117,7 @@ with slicing and Clang-style colored diagnostics.") ((", testProperty \"satisfyWith\" satisfyWith") ""))))))) (inputs - `(("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) @@ -3224,8 +3137,7 @@ complicated text/binary file formats.") (name "ghc-attoparsec-bootstrap") (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific-bootstrap))) (native-inputs '()) (properties '(hidden? #t)))) @@ -3247,7 +3159,6 @@ complicated text/binary file formats.") (inputs `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -3388,8 +3299,6 @@ and mIRC chat codes.") (base32 "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.haskell.org/~malcolm/polyparse/") (synopsis @@ -3478,7 +3387,6 @@ this package makes them available back to GHC 7.2.") (inputs `(("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) @@ -3626,8 +3534,6 @@ online}.") (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.galois.com") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") @@ -3654,7 +3560,6 @@ online}.") ("ghc-old-locale" ,ghc-old-locale) ("ghc-old-time" ,ghc-old-time) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml-conduit" ,ghc-xml-conduit) @@ -3690,8 +3595,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") (description "This library provides extensible optionally-pure exceptions @@ -3825,8 +3729,7 @@ writing to stdout and other handles.") (build-system haskell-build-system) ;; these inputs are necessary to use this library (inputs - `(("ghc-text" ,ghc-text) - ("ghc-hashable" ,ghc-hashable))) + `(("ghc-hashable" ,ghc-hashable))) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page @@ -4119,36 +4022,6 @@ splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) -(define-public ghc-parsec - (package - (name "ghc-parsec") - (version "3.1.13.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parsec/parsec-" - version - ".tar.gz")) - (sha256 - (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-text" ,ghc-text))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. - (home-page - "https://github.com/aslatter/parsec") - (synopsis "Monadic parser combinators") - (description "Parsec is a parser library. It is simple, safe, well -documented, has extensive libraries, good error messages, and is fast. It is -defined as a monad transformer that can be stacked on arbitrary monads, and it -is also parametric in the input stream type.") - (license license:bsd-3))) - (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") @@ -4190,8 +4063,7 @@ combinators.") (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + ("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hspec" ,ghc-hspec) @@ -4347,11 +4219,10 @@ interface.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + (inputs + `(("ghc-network" ,ghc-network))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-network" ,ghc-network))) (home-page "https://github.com/haskell/network-uri") (synopsis "Library for URI manipulation") @@ -4535,8 +4406,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-base" ,ghc-transformers-base) + `(("ghc-transformers-base" ,ghc-transformers-base) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/basvandijk/monad-control") (synopsis "Monad transformers to lift control operations like exception @@ -4658,8 +4528,7 @@ pragmas in your code.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))) + `(("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/lpsmith/blaze-builder") (synopsis "Efficient buffered output") (description "This library provides an implementation of the older @@ -4692,8 +4561,7 @@ interoperate with code that uses the new implementation.") (("tasty >= 1\\.0 && < 1\\.1") "tasty >= 1.0 && < 1.2"))))))) (inputs - `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text))) + `(("ghc-blaze-builder" ,ghc-blaze-builder))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -4743,8 +4611,7 @@ library for Haskell.") "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-hashable" ,ghc-hashable) + `(("ghc-hashable" ,ghc-hashable) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) @@ -5052,7 +4919,6 @@ given term should not exist.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-statevar" ,ghc-statevar) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -5144,8 +5010,6 @@ call stacks with different versions of the compiler.") (base32 "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") (description "This package provides state variables, which are references @@ -5186,7 +5050,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-void" ,ghc-void) @@ -5227,8 +5090,7 @@ indexed variants.") "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) ("ghc-syb" ,ghc-syb) @@ -5362,7 +5224,6 @@ just a @code{Semigroup} are added.") `(("ghc-nats" ,ghc-nats) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable))) (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") @@ -5383,7 +5244,6 @@ semigroup.") `(("ghc-nats" ,ghc-nats-bootstrap) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '(hidden? #t)))) @@ -5506,7 +5366,6 @@ monad transformer (instead of the IO monad).") (inputs `(("ghc-auto-update" ,ghc-auto-update) ("ghc-easy-file" ,ghc-easy-file) - ("ghc-text" ,ghc-text) ("ghc-unix-time" ,ghc-unix-time))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -5692,7 +5551,6 @@ in migrated modules.") (build-system haskell-build-system) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs @@ -5719,7 +5577,6 @@ notation}.") (arguments `(#:tests? #f)) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs '()) @@ -5848,7 +5705,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-temporary" ,ghc-temporary) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml" ,ghc-xml) - ("ghc-parsec" ,ghc-parsec) ("ghc-pandoc-types" ,ghc-pandoc-types))) (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") @@ -5924,8 +5780,7 @@ and utilities for pretty printing.") `(("ghc-diff" ,ghc-diff) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) (native-inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") @@ -5952,8 +5807,6 @@ descriptions.") (base32 "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/jgm/commonmark-hs") @@ -5979,8 +5832,6 @@ sources, and does not require prior installation of the C library.") (base32 "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/kivikakk/cmark-gfm-hs") @@ -6137,7 +5988,6 @@ datatypes.") (inputs `(("ghc-th-lift" ,ghc-th-lift) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types.") @@ -6397,7 +6247,6 @@ back-ends.") ("ghc-aeson" ,ghc-aeson) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-semigroups" ,ghc-semigroups) @@ -6500,8 +6349,7 @@ TIFF and GIF formats.") (inputs `(("lua" ,lua) ("ghc-exceptions" ,ghc-exceptions) - ("ghc-fail" ,ghc-fail) - ("ghc-text" ,ghc-text))) + ("ghc-fail" ,ghc-fail))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) @@ -6534,8 +6382,7 @@ described in @url{https://www.lua.org/}.") `(#:cabal-revision ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs - `(("ghc-hslua" ,ghc-hslua) - ("ghc-text" ,ghc-text))) + `(("ghc-hslua" ,ghc-hslua))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -6733,7 +6580,6 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-hxt" ,ghc-hxt) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs `(("ghc-diff" ,ghc-diff) @@ -6787,9 +6633,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-aeson" ,ghc-aeson) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) - ("ghc-parsec" ,ghc-parsec) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-scientific" ,ghc-scientific))) (native-inputs @@ -6852,7 +6696,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-locale" ,ghc-old-locale) ("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-scientific" ,ghc-scientific) ("ghc-sha" ,ghc-sha) @@ -6862,7 +6705,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-temporary" ,ghc-temporary) ("ghc-texmath" ,ghc-texmath) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-xml" ,ghc-xml) @@ -6950,8 +6792,7 @@ better for some purposes.") "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) (build-system haskell-build-system) (inputs - `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm))) + `(("ghc-async" ,ghc-async))) (native-inputs `(("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-hspec" ,ghc-hspec) @@ -6983,7 +6824,6 @@ upon it.") `(("ghc-conduit" ,ghc-conduit) ("ghc-exceptions" ,ghc-exceptions) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-text" ,ghc-text) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-typed-process" ,ghc-typed-process) ("ghc-async" ,ghc-async) @@ -6992,7 +6832,6 @@ upon it.") ("ghc-network" ,ghc-network) ("ghc-primitive" ,ghc-primitive) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-hspec" ,ghc-hspec) ("ghc-bytestring-builder" ,ghc-bytestring-builder) @@ -7022,7 +6861,6 @@ dependencies. The basic idea is that this package should only depend on (base32 "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://john-millikin.com/software/haskell-xml/") (synopsis "Basic types for representing XML") (description "This package provides basic types for representing XML @@ -7047,7 +6885,6 @@ documents.") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-doctest" ,ghc-doctest) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-data-default-class" ,ghc-data-default-class) @@ -7096,7 +6933,6 @@ the @code{conduit} package.") ("ghc-pandoc" ,ghc-pandoc) ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-aeson" ,ghc-aeson) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("ghc-xml-conduit" ,ghc-xml-conduit) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -7107,7 +6943,6 @@ the @code{conduit} package.") ("ghc-hs-bibutils" ,ghc-hs-bibutils) ("ghc-rfc5051" ,ghc-rfc5051) ("ghc-syb" ,ghc-syb) - ("ghc-parsec" ,ghc-parsec) ("ghc-old-locale" ,ghc-old-locale) ("ghc-aeson-pretty" ,ghc-aeson-pretty) ("ghc-attoparsec" ,ghc-attoparsec) @@ -7231,8 +7066,7 @@ regular expressions. Parsers can be built using Applicative interface.") "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-regex-base" ,ghc-regex-base))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") (description @@ -7493,8 +7327,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) (build-system haskell-build-system) (inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text))) + `(("ghc-base-compat" ,ghc-base-compat))) (home-page "https://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") (description @@ -7558,7 +7391,6 @@ for generating graph-like data structures.") ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) ("ghc-polyparse" ,ghc-polyparse) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -7666,8 +7498,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (arguments `(#:tests? #f)) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-quickcheck" ,ghc-quickcheck))) + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "High-level, byte-based file and directory path manipulations") (description @@ -7696,7 +7527,6 @@ increasing type safety.") `(#:tests? #f)) (inputs `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "Consistent file system interaction across GHC versions") @@ -7731,7 +7561,6 @@ which can't be decoded in the current locale encoding.") ("ghc-lifted-async" ,ghc-lifted-async) ("ghc-exceptions" ,ghc-exceptions) ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-text" ,ghc-text) ("ghc-async" ,ghc-async) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-hunit" ,ghc-hunit) @@ -7788,7 +7617,6 @@ easily work with command-line options.") `(("ghc-options-bootstrap" ,ghc-options-bootstrap) ("ghc-patience" ,ghc-patience) ("ghc-random" ,ghc-random) - ("ghc-text" ,ghc-text) ("ghc-ansi-terminal" ,ghc-ansi-terminal))) (home-page "https://john-millikin.com/software/chell/") (synopsis "Simple and intuitive library for automated testing") @@ -7909,8 +7737,7 @@ easily work with command-line options.") ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n @@ -11485,7 +11270,6 @@ imported with the correct Haskell types.") (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-network" ,ghc-network) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -11679,7 +11463,6 @@ example of, \"An applicative functor that is not a monad.\"") (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm) ("ghc-exceptions" ,ghc-exceptions) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-terminal-size" ,ghc-terminal-size))) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index ec3eb15d63..4290d8c21f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -78,7 +78,6 @@ ("ghc-safe" ,ghc-safe) ("ghc-split" ,ghc-split) ("ghc-terminal-size" ,ghc-terminal-size) - ("ghc-text" ,ghc-text) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 871a6b0706..d2bddef54d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -595,10 +595,8 @@ tiled on several screens.") `(("ghc-hinotify" ,ghc-hinotify) ("ghc-http" ,ghc-http) ("ghc-iwlib" ,ghc-iwlib) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsec-numbers" ,ghc-parsec-numbers) ("ghc-regex-compat" ,ghc-regex-compat) - ("ghc-stm" ,ghc-stm) ("ghc-x11-xft" ,ghc-x11-xft) ("libxpm" ,libxpm))) (arguments -- cgit v1.2.3 From 8b3dc667710db01b362e1cc449a707151465d6eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Jul 2019 20:13:13 +0200 Subject: gnu: icecat: Fix FTBFS with GCC7. * gnu/packages/gnuzilla.scm (icecat)[arguments]: In the 'augment-CPATH' phase, do not attempt to read CPLUS_INCLUDE_PATH, which is no longer set. --- gnu/packages/gnuzilla.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a874878fea..3e556d0b04 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -864,8 +864,7 @@ from forcing GEXP-PROMISE." (let ((gcc (assoc-ref inputs "gcc"))) (setenv "CPLUS_INCLUDE_PATH" (string-append gcc "/include/c++" ":" - gcc "/include/c++/" build ":" - (getenv "CPLUS_INCLUDE_PATH")))) + gcc "/include/c++/" build))) #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and -- cgit v1.2.3 From 0c6de725d814205d94ca3abb3f793c438137998a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jul 2019 20:32:17 +0200 Subject: gnu: python-pillow: Update to 6.1.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 6.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8de98814..cd74ee181e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4364,14 +4364,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 4f5fe46388eb70055b6935df053f74b7ccdaf55f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:32:53 +0200 Subject: gnu: commencement: Fix Python build on non-x86 platforms. * gnu/packages/commencement.scm (python-boot0)[version, source]: Downgrade to 3.5.7. [arguments]: Remove <#:make-flags>. Add <#:phases>. [native-inputs]: Remove artifical dependency on PKG-CONFIG. --- gnu/packages/commencement.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d28296449d..d06aa0a369 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1864,16 +1864,40 @@ the bootstrap environment." (define python-boot0 (let ((python (package (inherit python-minimal) + ;; We cannot use Python 3.7 and later here, because they require + ;; pthreads, which is missing on non-x86 platforms at this stage. + ;; Python 3.6 technically supports being built without threading + ;; support, but requires additional patches. + (version "3.5.7") + (source (origin + (inherit (package-source python)) + (uri (string-append "https://www.python.org/ftp/python/" + version "/Python-" version ".tar.xz")) + (patches '()) + (sha256 + (base32 + "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18")))) (inputs `(("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. + (native-inputs '()) ;and pkg-config (arguments (substitute-keyword-arguments (package-arguments python-minimal) ;; Disable features that cannot be built at this stage. ((#:configure-flags _ ''()) - `(list "--without-ensurepip")) - ((#:make-flags _ ''()) - `(list "MODDISABLED_NAMES=_ctypes ossaudiodev")) + `(list "--without-ensurepip" + "--without-threads")) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'disable-modules + (lambda _ + (substitute* "setup.py" + ;; Disable ctypes, since it requires libffi. + (("extensions\\.append\\(ctypes\\)") "") + ;; Prevent the 'ossaudiodev' extension from being + ;; built, since it requires Linux headers. + (("'linux', ") "")) + #t)))) ((#:tests? _ #f) #f)))))) (package-with-bootstrap-guile (package-with-explicit-inputs python %boot0-inputs -- cgit v1.2.3 From fcb5493793ca43c159fcb87e1b9d0b1e93430e5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:51:26 +0200 Subject: gnu: Python: Avoid needless reference on coreutils. * gnu/packages/python.scm (python-2.7)[arguments]: Pass "INSTALL" and "MKDIR_P" in <#:configure-flags>. --- gnu/packages/python.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d834cda915..68ea23ff57 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -143,6 +143,12 @@ "--with-system-ffi" ;build ctypes "--with-ensurepip=install" ;install pip and setuptools "--enable-unicode=ucs4" + + ;; Prevent the installed _sysconfigdata.py from retaining a reference + ;; to coreutils. + "INSTALL=install -c" + "MKDIR_P=mkdir -p" + (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. -- cgit v1.2.3 From a4c38f812c3eae757e4980f8f6131ff3a608e6aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:54:15 +0200 Subject: gnu: icu4c: Use 'python-minimal' for tests. * gnu/packages/icu4c.scm (icu4c)[native-inputs]: Change PYTHON to PYTHON-MINIMAL. --- gnu/packages/icu4c.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index ec65aff6cb..d5f8b5dd04 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -47,7 +47,7 @@ (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) (native-inputs - `(("python" ,python))) + `(("python" ,python-minimal))) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From ac135287d21e098b8940fcacd5bf82537e71d100 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:55:10 +0200 Subject: gnu: icu4c: Enable tests on i686. * gnu/packages/icu4c.scm (icu4c)[arguments]: Don't override <#:tests?>. --- gnu/packages/icu4c.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index d5f8b5dd04..fc3409ed3f 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -59,12 +59,6 @@ (string-prefix? "mips" s))) '("--with-data-packaging=archive") '())) - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - ;; FIXME: Some tests are failing on i686: - ;; . - '(#:tests? #f) - '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source -- cgit v1.2.3 From 53ffc043af88920063c161d0a4c3c9617df4a502 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:55:52 +0200 Subject: gnu: cURL: Build against Python 3. * gnu/packages/curl.scm (curl)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/curl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8605c12124..24932c9f99 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -72,7 +72,7 @@ ;; to enable the --manual option and make test 1026 pass ("groff" ,groff) ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python-wrapper))) (native-search-paths ;; Note: This search path is respected by the `curl` command-line tool only. ;; Ideally we would bake this into libcurl itself so other users can benefit, -- cgit v1.2.3 From d7b63ba92d55549006f6aa7f78adc4c37d98fc41 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:00:45 +0200 Subject: gnu: itstool: Update to 2.0.6. * gnu/packages/glib.scm (itstool): Update to 2.0.6. [inputs]: Change PYTHON2-LIBXML and PYTHON-2 to PYTHON-LIBXML and PYTHON. * gnu/packages/gnome.scm (totem)[inputs]: Change PYTHON-2 to PYTHON. --- gnu/packages/glib.scm | 8 ++++---- gnu/packages/gnome.scm | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eae8297531..2f8b2bda5e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -451,19 +451,19 @@ The intltool collection can be used to do these things: (define itstool (package (name "itstool") - (version "2.0.2") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "http://files.itstool.org/itstool/itstool-" version ".tar.bz2")) (sha256 (base32 - "0fh34wi52i0qikgvlmrcpf1vx6gc1xqdad4539l4d9hikfsrz45z")))) + "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) - ("python2-libxml2" ,python2-libxml2) - ("python-2" ,python-2))) + ("python-libxml2" ,python-libxml2) + ("python" ,python))) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ecf39334e5..8d4143e1da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3871,9 +3871,7 @@ for application developers.") ("gst-plugins-good" ,gst-plugins-good) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("adwaita-icon-theme" ,adwaita-icon-theme) - ;; XXX We use python-2 because libxml2 because itstool (which needs - ;; libxml) currently uses python-2. - ("python" ,python-2) + ("python" ,python) ("python-pygobject" ,python2-pygobject) ;; XXX TODO pylint needed for python support ("totem-pl-parser" ,totem-pl-parser) -- cgit v1.2.3 From cf3f7aa1970d71c69ec2c75c4ae874afc1d1fdab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:02:20 +0200 Subject: gnu: libevent: Use Python 3 for event_rpcgen.py. * gnu/packages/libevent.scm (libevent)[inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/libevent.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index e9e165a2ad..58c451a4e9 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -43,19 +43,19 @@ (name "libevent") (version "2.1.10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libevent/libevent/releases/download/release-" - version "-stable/libevent-" version "-stable.tar.gz")) - (sha256 - (base32 - "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78")))) + (method url-fetch) + (uri (string-append + "https://github.com/libevent/libevent/releases/download/release-" + version "-stable/libevent-" version "-stable.tar.gz")) + (sha256 + (base32 + "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78")))) (build-system gnu-build-system) (arguments - ;; This skips some of the tests which fail on armhf and aarch64. + ;; This skips some of the tests which fail on armhf and aarch64. '(#:configure-flags '("--disable-libevent-regress"))) (inputs - `(("python" ,python-2))) ; for 'event_rpcgen.py' + `(("python" ,python-wrapper))) ;for 'event_rpcgen.py' (native-inputs `(("which" ,which))) (home-page "https://libevent.org/") -- cgit v1.2.3 From b78491f857d974afa8339f778772e0a140a1c344 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:03:51 +0200 Subject: gnu: ninja: Build against Python 3. * gnu/packages/ninja.scm (ninja)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/ninja.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 0791abe764..a115e99828 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -40,7 +40,7 @@ (base32 "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx")))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-2))) + (native-inputs `(("python" ,python-wrapper))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2c886af91154916a656aeecf6ba517e0cdc6fe93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:12:30 +0200 Subject: gnu: ninja: Python is a regular input. Ninja uses Python at run time, so it must not be a native input. * gnu/packages/ninja.scm (ninja)[native-inputs]: Change to ... [inputs]: ... this. --- gnu/packages/ninja.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index a115e99828..a8ad6430ba 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -40,7 +40,7 @@ (base32 "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx")))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-wrapper))) + (inputs `(("python" ,python-wrapper))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ee3a4d367880dd826fc74a9e4080163f92e1512a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:04:41 +0200 Subject: gnu: libpsl: Build against Python 3. * gnu/packages/web.scm (libpsl)[inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7731b1fdca..9fc7260a5b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -871,7 +871,7 @@ for efficient socket-like bidirectional reliable communication channels.") (inputs `(("libidn2" ,libidn2) ("libunistring" ,libunistring) - ("python-2" ,python-2))) + ("python" ,python-wrapper))) (home-page "https://github.com/rockdaboot/libpsl") (synopsis "C library for the Publix Suffix List") (description -- cgit v1.2.3 From d0a52e65b53d05790b307a2b99172fa38dcd7619 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:26:38 +0200 Subject: gnu: zziplib: Don't use unstable tarball. * gnu/packages/compression.scm (zziplib)[source]: Change to GIT-FETCH. [argumnents]: New field. --- gnu/packages/compression.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ddc43176d9..1ca88fe78c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1573,14 +1573,22 @@ recreates the stored directory structure by default.") (name "zziplib") (version "0.13.69") (home-page "https://github.com/gdraheim/zziplib") - (source - (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4")))) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'make-files-writable + (lambda _ + (for-each make-file-writable + (find-files "test" #:directories? #t)) + #t))))) (inputs `(("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ; for the documentation -- cgit v1.2.3 From b0dc2454cc7288148e108156a8bedbb1947115a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:08:21 +0200 Subject: gnu: zziplib: Don't run failing tests. * gnu/packages/compression.scm (zziplib)[arguments]: Set <#:test-target>. --- gnu/packages/compression.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1ca88fe78c..1321791841 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1588,7 +1588,12 @@ recreates the stored directory structure by default.") (lambda _ (for-each make-file-writable (find-files "test" #:directories? #t)) - #t))))) + #t))) + + ;; XXX: The default test target attempts to download external resources and + ;; fails without error: . + ;; To prevent confusing log messages, just run a simple zip test that works. + #:test-target "check-readme")) (inputs `(("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ; for the documentation -- cgit v1.2.3 From c4fa39188a9f198c99de528794cc7b3c4a053911 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:53:32 +0200 Subject: gnu: graphite2: Build against Python 3. Previously, the Python tests were skipped, because they require Python 3. * gnu/packages/fontutils.scm (graphite2)[arguments]: New field. [native-inputs]: Change PYTHON-2 and PYTHON2-FONTTOOLS to PYTHON and PYTHON-FONTTOOLS. --- gnu/packages/fontutils.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 818d77f127..725d3ac878 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -438,9 +439,20 @@ applications should be.") (base32 "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-test-PYTHONPATH + (lambda _ + ;; Tell the build system not to override PYTHONPATH + ;; while running the Python tests. + (substitute* "Graphite.cmake" + (("ENVIRONMENT PYTHONPATH=") + (string-append "ENVIRONMENT PYTHONPATH=" + (getenv "PYTHONPATH") ":"))) + #t))))) (native-inputs - `(("python" ,python-2) ; because of "import imap" in tests - ("python-fonttools" ,python2-fonttools))) + `(("python" ,python) + ("python-fonttools" ,python-fonttools))) (inputs `(("freetype" ,freetype))) (synopsis "Reimplementation of the SIL Graphite text processing engine") -- cgit v1.2.3 From f7e25e2ec7a5755edd542ee36edd7ae5febe6399 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:55:57 +0200 Subject: gnu: libpsl: Python is a native input. * gnu/packages/web.scm (libpsl)[inputs]: Move PYTHON-WRAPPER ... [native-inputs]: ... here. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9fc7260a5b..42c00e77a5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -867,11 +867,13 @@ for efficient socket-like bidirectional reliable communication channels.") "04pfagb7ppq3yibx4lhazd1v9nwkxdfkyy2rgcrmrf3mldsirga1")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + + ;; For tests. + ("python" ,python-wrapper))) (inputs `(("libidn2" ,libidn2) - ("libunistring" ,libunistring) - ("python" ,python-wrapper))) + ("libunistring" ,libunistring))) (home-page "https://github.com/rockdaboot/libpsl") (synopsis "C library for the Publix Suffix List") (description -- cgit v1.2.3 From 794c773d0cbc49c1bd7d112d820bb9a7a19f3667 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 19:19:39 +0200 Subject: gnu: libinput: Use the 'release' Meson build type. * gnu/packages/freedesktop.scm (libinput)[arguments]: Add <#:build-type>. --- gnu/packages/freedesktop.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d77d6c58c4..7cd959d2f1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -162,7 +162,12 @@ freedesktop.org project.") "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=false"))) + `(#:configure-flags '("-Ddocumentation=false") + + ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that + ;; hangs, and the comments around it suggests that we should be using this + ;; Meson target anyway. + #:build-type "release")) (native-inputs `(("check" ,check) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From ff6850490f5ebe2cd0bcb86d7c8a87650e7bb08b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 20:00:21 +0200 Subject: gnu: doxygen: Don't build against special Flex variant. * gnu/packages/documentation.scm (doxygen)[native-inputs]: Change FLEX-2.6.1 to FLEX. --- gnu/packages/documentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 6ce7827391..8e7ecda956 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -139,7 +139,7 @@ markup) can be customized and extended by the user.") (build-system cmake-build-system) (native-inputs `(("bison" ,bison) - ("flex" ,flex-2.6.1) ; sefaults with 2.6.4 + ("flex" ,flex) ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation (inputs -- cgit v1.2.3 From f826ac47040641ededa75a6702d0d263cab088f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 20:07:22 +0200 Subject: gnu: doxygen: Build with Python 3. * gnu/packages/documentation.scm (doxygen)[native-inputs]: Change PYTHON-2 to PYTHON. --- gnu/packages/documentation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 8e7ecda956..19c42b00eb 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -140,8 +140,8 @@ markup) can be customized and extended by the user.") (native-inputs `(("bison" ,bison) ("flex" ,flex) - ("libxml2" ,libxml2) ; provides xmllint for the tests - ("python" ,python-2))) ; for creating the documentation + ("libxml2" ,libxml2) ;provides xmllint for the tests + ("python" ,python))) ;for creating the documentation (inputs `(("bash" ,bash-minimal))) (arguments -- cgit v1.2.3 From 6fe808f4c3272cbf5329054aacfb1bafc302c4bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 22:05:34 +0200 Subject: gnu: mesa: Use the "release" Meson build type. * gnu/packages/gl.scm (mesa)[arguments]: Add <#:build-type>. --- gnu/packages/gl.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9ed043c7ae..f615ebd71c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -331,6 +331,11 @@ also known as DXTn or DXTC) for Mesa.") "-Dllvm=true")) ; default is x86/x86_64 only (_ '("-Ddri-drivers=nouveau,r200,r100")))) + + ;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The + ;; documentation recommends using 'release' for performance anyway. + #:build-type "release" + #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) -- cgit v1.2.3 From 0403b04d768ab6aa52320ce9b90ac2915d0ee498 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 23:27:37 +0200 Subject: gnu: jalv: Remove GCC5 workaround. * gnu/packages/audio.scm (jalv)[arguments]: Remove <#:phases>. --- gnu/packages/audio.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7024c46bb5..83e09a731f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1595,15 +1595,7 @@ synchronous execution of all clients, and low latency operation.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda _ - ;; Compile with C++11, required by gtkmm. - (setenv "CXXFLAGS" "-std=c++11") - #t))))) + #:python ,python-2)) (inputs `(("lv2" ,lv2) ("lilv" ,lilv) -- cgit v1.2.3 From 625801f50008dc411bba84a128fe493c5b2bfc37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:37:03 +0200 Subject: gnu: webkitgtk: Build with Python 3. * gnu/packages/webkit.scm (webkitgtk)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b258ac860c..538c97675d 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -119,7 +119,7 @@ ("gperf" ,gperf) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("python" ,python-wrapper) ("gtk-doc" ,gtk-doc) ; For documentation generation ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) -- cgit v1.2.3 From e5731c03829fa8a71aab5bcf50442c517df2a8c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:58:09 +0200 Subject: gnu: python-pluggy: Update to 0.11.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.11.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd74ee181e..f3fae63f59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8483,14 +8483,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.9.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) + "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From a7ed2d534c66bfedb7e3fb323cc4b7a1e2731dd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:58:31 +0200 Subject: gnu: python-pytest: Update to 4.4.2. This is necessary to fix a test failure on 32-bit platforms in 4.4.1. * gnu/packages/check.scm (python-pytest): Update to 4.4.2. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9dbef4bf76..901ee2cacb 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -683,14 +683,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1xcmic8wzaj00rn1lg4ib4prh2f4lzpiaadk35qlv8hcny1j505p")))) + "18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8747477deb765571c300d3eb9a4012a3c36cf7f7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Jul 2019 11:43:07 +0100 Subject: gnu: gobject-introspection: Update absolute-shlib-path.patch. Incorporate some changes from nixpkgs to the gobject-introspection package patches. This is motivated by looking at issues with libsoup and lollypop. These changes mean that the share/gir-1.0/Soup-2.4.gir file within libsoup (and the corresponding binary typelib) references libsoup-2.4.so.1 with an absolute filename, whereas previously, the filename wasn't absolute. With an absolute filename in the typelib, loading libsoup from lollypop should work. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Incorporate changes from nixpkgs. --- ...gobject-introspection-absolute-shlib-path.patch | 141 ++++++++++++++++++++- 1 file changed, 137 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index d00cc5a420..3c0bb1c6cf 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -2,10 +2,131 @@ # add the full path. # # This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 -@@ -110,17 +110,11 @@ +# 'gobject-introspection' 1.40.0 in Nix. +# +# It has since been updated to work with newer versions of +# gobject-introspection. +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): + return group + + ++def _get_default_fallback_libpath(): ++ # Newer multiple-output-optimized stdenv has an environment variable ++ # $outputLib which in turn specifies another variable which then is used as ++ # the destination for the library contents (${!outputLib}/lib). ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None ++ if store_path is None: ++ outputs = os.environ.get("outputs", "out").split() ++ if "lib" in outputs: ++ # For multiple output derivations let's try whether there is a $lib ++ # environment variable and use that as the base store path. ++ store_path = os.environ.get("lib") ++ elif "out" in outputs: ++ # Otherwise we have a single output derivation, so the libraries ++ # most certainly will end up in "$out/lib". ++ store_path = os.environ.get("out") ++ ++ if store_path is not None: ++ # Even if we have a $lib as output, there still should be a $lib/lib ++ # directory. ++ return os.path.join(store_path, 'lib') ++ else: ++ # If we haven't found a possible scenario, let's return an empty string ++ # so that the shared library won't be prepended with a path. ++ # ++ # Note that this doesn't mean that all hope is lost, because after all ++ # we can still use --fallback-library-path to set one. ++ # ++ # Also, we're not returning None, because that would make it very ++ # difficult to disable adding fallback paths altogether using something ++ # like: --fallback-library-path="" ++ return "" ++ ++ + def _get_option_parser(): + parser = optparse.OptionParser('%prog [options] sources', + version='%prog ' + giscanner.__version__) +@@ -205,6 +238,10 @@ match the namespace prefix.""") + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") ++ parser.add_option("", "--fallback-library-path", ++ action="store", dest="fallback_libpath", ++ default=_get_default_fallback_libpath(), ++ help="Path to prepend to unknown shared libraries") + + group = get_preprocessor_option_group(parser) + parser.add_option_group(group) +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): + $""" % re.escape(library_name), re.VERBOSE) + + ++def _ldd_library_guix_pattern(library_name): ++ store_dir = re.escape('/gnu/store') ++ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' ++ return re.compile(pattern % (store_dir, re.escape(library_name))) ++ ++ + # This is a what we do for non-la files. We assume that we are on an + # ELF-like system where ldd exists and the soname extracted with ldd is + # a filename that can be opened with dlopen(). +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): + output = output.decode("utf-8", "replace") + + shlibs = resolve_from_ldd_output(libraries, output) +- return list(map(sanitize_shlib_path, shlibs)) ++ fallback_libpath = options.fallback_libpath or ""; ++ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) + + + def sanitize_shlib_path(lib): +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 +- if sys.platform == "darwin": +- if not os.path.isabs(lib): +- return os.path.basename(lib) +- return lib +- else: ++ ++ # Always use absolute paths if available ++ if not os.path.isabs(lib): + return os.path.basename(lib) ++ return lib + + + def resolve_from_ldd_output(libraries, output): + patterns = {} + for library in libraries: + if not os.path.isfile(library): +- patterns[library] = _ldd_library_pattern(library) ++ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) + if len(patterns) == 0: + return [] + +@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): + if line.endswith(':'): + continue + for word in line.split(): +- for library, pattern in patterns.items(): +- m = pattern.match(word) ++ for library, (pattern, guix_pattern) in patterns.items(): ++ if line.find('/gnu/store') != -1: ++ m = guix_pattern.match(word) ++ else: ++ m = pattern.match(word) + if m: + del patterns[library] + shlibs.append(m.group()) + +--- a/giscanner/utils.py ++++ b/giscanner/utils.py +@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -28,3 +149,15 @@ def extract_libtool(la_file): +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform == 'darwin' else 'bar') ++ # Always use an absolute filename for Guix ++ '/foo/bar') + + def test_unresolved_library(self): +output = '' -- cgit v1.2.3 From 883fe9bb913ac284c6ec203b41fc22cb6212c337 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 15:25:40 -0400 Subject: gnu: bdb: Add 4.8.30. * gnu/packages/dbm.scm (bdb-4.8): New variable. [arguments]: Configure and build from 'build_unix' directory as mentioned in documentation. (bdb-5.3): Inherit from bdb-4.8. (bdb-6): Inherit from bdb-4.8. (bdb): Point to bdb-6. --- gnu/packages/dbm.scm | 83 ++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 48 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 2f1c88f112..5191c475c2 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -33,22 +33,24 @@ ;;; This module has been separated from (gnu packages databases) to reduce the ;;; number of module references for core packages. -(define-public bdb +(define-public bdb-4.8 (package (name "bdb") - (version "6.2.32") + (version "4.8.30") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")) (source (origin - (method url-fetch) - (uri (string-append "http://download.oracle.com/berkeley-db/db-" - version ".tar.gz")) - (sha256 - (base32 - "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0")))) (build-system gnu-build-system) (outputs '("out" ; programs, libraries, headers "doc")) ; 94 MiB of HTML docs (arguments - '(#:tests? #f ; no check target available + `(#:tests? #f ; no check target available #:disallowed-references ("doc") #:phases (modify-phases %standard-phases @@ -61,11 +63,17 @@ (("docdir[[:blank:]]*=.*") (string-append "docdir = " doc "/share/doc/bdb"))) - (invoke "./dist/configure" + (chdir "build_unix") + (invoke "../dist/configure" (string-append "--prefix=" out) (string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash")) + ;; Bdb doesn't recognize aarch64 as an architecture. + ,@(if (string=? "aarch64-linux" (%current-system)) + '("--build=aarch64-unknown-linux-gnu") + '()) + ;; Remove 7 MiB of .a files. "--disable-static" @@ -83,58 +91,37 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") ;; Starting with version 6, BDB is distributed under AGPL3. Many individual ;; files are covered by the 3-clause BSD license. - (license (list license:agpl3+ license:bsd-3)) (home-page "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html"))) (define-public bdb-5.3 - (package (inherit bdb) + (package (inherit bdb-4.8) (name "bdb") (version "5.3.28") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")) (source (origin (method url-fetch) (uri (string-append "http://download.oracle.com/berkeley-db/db-" version ".tar.gz")) (sha256 (base32 - "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))) - (arguments - `(#:tests? #f ; no check target available - #:disallowed-references ("doc") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))))) - (invoke "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) - - ;; Bdb doesn't recognize aarch64 as an architecture. - ,@(if (string=? "aarch64-linux" (%current-system)) - '("--build=aarch64-unknown-linux-gnu") - '()) - - ;; Remove 7 MiB of .a files. - "--disable-static" - - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" +(define-public bdb-6 + (package (inherit bdb-4.8) + (name "bdb") + (version "6.2.32") + (source (origin + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) + ;; Starting with version 6, BDB is distributed under AGPL3. Many individual + ;; files are covered by the 3-clause BSD license. + (license (list license:agpl3+ license:bsd-3)))) - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx"))))))))) +(define-public bdb bdb-6) (define-public gdbm (package -- cgit v1.2.3 From bcfc54fff80ef6a11fc53c61db333a8065bbfeef Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 15:51:33 -0400 Subject: gnu: Update to 0.18.0. * gnu/packages/finance.scm (bitcoin-core): Update to 0.18.0. [inputs]: Use bdb-4.8 for compatibility. [arguments]: Remove --with-incompatible-bdb from configure flags and add check-functional phase for functional tests. --- gnu/packages/finance.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 550354b650..972b4973d0 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -78,7 +78,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.17.1") + (version "0.18.0") (source (origin (method url-fetch) (uri @@ -86,7 +86,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy")))) + "0ps0vw9iknz1b1sx74rabd1yhlxvwbd0aimjzn9hlqkvw286hkjy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -94,7 +94,7 @@ ("util-linux" ,util-linux) ; provides the hexdump command for tests ("qttools" ,qttools))) (inputs - `(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload + `(("bdb" ,bdb-4.8) ; Bitcoin Core requires bdb 4.8 for compatibility ("boost" ,boost) ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) @@ -104,8 +104,6 @@ (arguments `(#:configure-flags (list - ;; We use a bdb version newer than 4.8. - "--with-incompatible-bdb" ;; Boost is not found unless specified manually. (string-append "--with-boost=" (assoc-ref %build-inputs "boost")) @@ -128,6 +126,11 @@ (add-before 'check 'set-home (lambda _ (setenv "HOME" (getenv "TMPDIR")) ; Tests write to $HOME. + #t)) + (add-after 'check 'check-functional + (lambda _ + (invoke "python3" "./test/functional/test_runner.py" + (string-append "--jobs=" (number->string (parallel-job-count)))) #t))))) (home-page "https://bitcoin.org/en/") (synopsis "Bitcoin peer-to-peer client") -- cgit v1.2.3 From ca3757e1c2fdc1576d17239a57f0a493a47bc6dc Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 21:20:17 -0400 Subject: gnu: glibc: Add 2.27 supported locales patch. The 'glibc-supported-locales.patch' was updated for glibc 2.29, breaking compatibility with 2.27. Add a 2.27-specific supported locales patch. * gnu/packages/patches/glibc-2.27-supported-locales.patch: New file. * gnu/packages/base.scm (glibc-2.27)[source](patches): Use 'glibc-2.27-supported-locales.patch' instead. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 + gnu/packages/base.scm | 2 +- .../patches/glibc-2.27-supported-locales.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-2.27-supported-locales.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bac1a92741..f63ff1ff1e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -876,6 +876,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.28-supported-locales.patch \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-supported-locales.patch \ + %D%/packages/patches/glibc-2.27-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f26145cb0b..5878cbec5e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -854,7 +854,7 @@ with the Linux kernel.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" + "glibc-2.27-supported-locales.patch" "glibc-CVE-2018-11236.patch" "glibc-CVE-2018-11237.patch")))) (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes diff --git a/gnu/packages/patches/glibc-2.27-supported-locales.patch b/gnu/packages/patches/glibc-2.27-supported-locales.patch new file mode 100644 index 0000000000..2888052bb8 --- /dev/null +++ b/gnu/packages/patches/glibc-2.27-supported-locales.patch @@ -0,0 +1,33 @@ +This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. -- cgit v1.2.3 From d4137d84ac75edaf2739578d0868cd77dd6da43c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 4 Jul 2019 06:49:29 -0400 Subject: gnu: make-glibc-locales: Adjust patch for glibc 2.29. The patch for glibc 2.28 and earlier replaces the same content, but the context in the patch is different enough to fail to merge. * gnu/packages/base.scm (make-glibc-locales)[source]: Add patch. * gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.29 and move old file... * gnu/packages/patches/glibc-locales-2.28.patch: ...here. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/base.scm | 9 +++++++- gnu/packages/patches/glibc-locales-2.28.patch | 31 +++++++++++++++++++++++++++ gnu/packages/patches/glibc-locales.patch | 17 ++++++++------- 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/glibc-locales-2.28.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index f63ff1ff1e..e142122e6b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,6 +867,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ + %D%/packages/patches/glibc-locales-2.28.patch \ %D%/packages/patches/glibc-o-largefile.patch \ %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5878cbec5e..0df40d9c50 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -999,7 +999,14 @@ with the Linux kernel.") (inherit glibc) (name "glibc-locales") (source (origin (inherit (package-source glibc)) - (patches (cons (search-patch "glibc-locales.patch") + ;; The patch for glibc 2.28 and earlier replaces the same + ;; content, but the context in the patch is different + ;; enough to fail to merge. + (patches (cons (search-patch + (if (version>=? (package-version glibc) + "2.29") + "glibc-locales.patch" + "glibc-locales-2.28.patch")) (origin-patches (package-source glibc)))))) (synopsis "All the locales supported by the GNU C Library") (description diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch new file mode 100644 index 0000000000..31ee6c1ff3 --- /dev/null +++ b/gnu/packages/patches/glibc-locales-2.28.patch @@ -0,0 +1,31 @@ +This patch allows us to use glibc's build system to build locales +in a package separate from glibc. + + 1. Use 'localedef' from $PATH since we are not rebuilding it. + 2. Use '--no-archive' to avoid building the big locale archive, and + because the already-built 'localedef' would want to write it + to '/run/current-system/locale', which is not possible. + 3. Pass $(inst_complocaledir)/$$locale to install files in the right + place, and because otherwise, 'localedef' fails with: + "cannot write output files to `(null)'". + +--- glibc-2.27/localedata/Makefile ++++ glibc-2.27/localedata/Makefile +@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. + LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ +-$(rtld-prefix) $(common-objpfx)locale/localedef ++ localedef --no-archive + install-locales: $(INSTALL-SUPPORTED-LOCALES) + + install-locales-dir: +@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ + $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ + -i locales/$$input -f charmaps/$$charset \ +- $(addprefix --prefix=,$(install_root)) $$locale \ ++ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ + && echo ' done'; \ + + tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch index 31ee6c1ff3..9329a09063 100644 --- a/gnu/packages/patches/glibc-locales.patch +++ b/gnu/packages/patches/glibc-locales.patch @@ -9,23 +9,24 @@ in a package separate from glibc. place, and because otherwise, 'localedef' fails with: "cannot write output files to `(null)'". ---- glibc-2.27/localedata/Makefile -+++ glibc-2.27/localedata/Makefile -@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) +diff -ru glibc-2.29-old/localedata/Makefile glibc-2.29-new/localedata/Makefile +--- glibc-2.29-old/localedata/Makefile 2019-01-31 11:45:36.000000000 -0500 ++++ glibc-2.29-new/localedata/Makefile 2019-07-03 22:48:35.662015071 -0400 +@@ -385,7 +385,7 @@ # Sometimes the whole collection of locale files should be installed. LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ -$(rtld-prefix) $(common-objpfx)locale/localedef + localedef --no-archive - install-locales: $(INSTALL-SUPPORTED-LOCALES) + install-locales: install-locale-archive - install-locales-dir: -@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + # Create and install the locale-archive file. +@@ -414,7 +414,7 @@ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ -i locales/$$input -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale \ + $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ - && echo ' done'; \ + && echo ' done'; + endef - tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP -- cgit v1.2.3 From 680bc34da4aa067f2d35d6a4015cd33e32dfed2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 20:59:58 +0200 Subject: gnu: Python: Update to 3.7.4. * gnu/packages/python.scm (python-3.7): Update to 3.7.4. [source](snippet): Move disabled tests ... [arguments]<#:make-flags>: ... here. Enable previously failing tests. <#:phases>: Add 'set-TZDIR'. [native-inputs]: Add TZDATA-FOR-TESTS. * gnu/packages/commencement.scm (python-boot0)[arguments]: Clear <#:make-flags>. Delete 'set-TZDIR' phase. * gnu/packages/patches/python-3-fix-tests.patch: Disable two new tests that do not work in the build container. Adjust context. --- gnu/packages/commencement.scm | 6 +++- gnu/packages/patches/python-3-fix-tests.patch | 38 +++++++++++++++++------ gnu/packages/python.scm | 44 ++++++++++++++------------- 3 files changed, 57 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d06aa0a369..ff34392865 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1887,6 +1887,9 @@ the bootstrap environment." ((#:configure-flags _ ''()) `(list "--without-ensurepip" "--without-threads")) + ;; Clear #:make-flags, such that changes to the regular + ;; Python package won't interfere with this one. + ((#:make-flags _ ''()) ''()) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'disable-modules @@ -1897,7 +1900,8 @@ the bootstrap environment." ;; Prevent the 'ossaudiodev' extension from being ;; built, since it requires Linux headers. (("'linux', ") "")) - #t)))) + #t)) + (delete 'set-TZDIR))) ((#:tests? _ #f) #f)))))) (package-with-bootstrap-guile (package-with-explicit-inputs python %boot0-inputs diff --git a/gnu/packages/patches/python-3-fix-tests.patch b/gnu/packages/patches/python-3-fix-tests.patch index e4ba728a7e..e13790bd41 100644 --- a/gnu/packages/patches/python-3-fix-tests.patch +++ b/gnu/packages/patches/python-3-fix-tests.patch @@ -85,7 +85,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing. diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py -@@ -1301,6 +1301,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): +@@ -1323,6 +1323,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self._test_create_connection_ip_addr(m_socket, False) @patch_socket @@ -128,7 +128,7 @@ diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py -@@ -2130,8 +2130,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): +@@ -2134,8 +2134,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self.assertEqual(given, expect) self.assertEqual(set(p.rglob("FILEd*")), set()) @@ -141,7 +141,7 @@ diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py -@@ -1133,11 +1133,11 @@ def test_pdb_issue_20766(): +@@ -1150,11 +1150,11 @@ def test_pdb_issue_20766(): > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue @@ -158,7 +158,7 @@ diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py -@@ -764,6 +764,7 @@ class ArgsTestCase(BaseTestCase): +@@ -762,6 +762,7 @@ class ArgsTestCase(BaseTestCase): output = self.run_tests('--fromfile', filename) self.check_executed_tests(output, tests) @@ -166,12 +166,12 @@ diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py def test_interrupted(self): code = TEST_INTERRUPTED test = self.create_test('sigint', code=code) -@@ -781,6 +782,7 @@ class ArgsTestCase(BaseTestCase): +@@ -779,6 +780,7 @@ class ArgsTestCase(BaseTestCase): % (self.TESTNAME_REGEX, len(tests))) self.check_line(output, regex) + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_slow_interrupted(self): + def test_slowest_interrupted(self): # Issue #25373: test --slowest with an interrupted test code = TEST_INTERRUPTED diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py @@ -188,7 +188,7 @@ diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py -@@ -1135,6 +1135,7 @@ class TestShutil(unittest.TestCase): +@@ -1143,6 +1143,7 @@ class TestShutil(unittest.TestCase): self.assertRaises(ValueError, make_archive, base_name, 'xxx') @support.requires_zlib @@ -196,7 +196,7 @@ diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py def test_make_archive_owner_group(self): # testing make_archive with owner and group, with various combinations # this works even if there's not gid/uid support -@@ -1163,6 +1164,7 @@ class TestShutil(unittest.TestCase): +@@ -1171,6 +1172,7 @@ class TestShutil(unittest.TestCase): @support.requires_zlib @@ -269,7 +269,7 @@ diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py -@@ -2504,9 +2504,12 @@ def root_is_uid_gid_0(): +@@ -2509,9 +2509,12 @@ def root_is_uid_gid_0(): import pwd, grp except ImportError: return False @@ -285,6 +285,26 @@ diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py return False return True +diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py +--- a/Lib/test/test_threading.py ++++ b/Lib/test/test_threading.py +@@ -1249,6 +1249,7 @@ class MiscTestCase(unittest.TestCase): + + + class InterruptMainTests(unittest.TestCase): ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') + def test_interrupt_main_subthread(self): + # Calling start_new_thread with a function that executes interrupt_main + # should raise KeyboardInterrupt upon completion. +@@ -1260,6 +1261,8 @@ class InterruptMainTests(unittest.TestCase): + t.join() + t.join() + ++ ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') + def test_interrupt_main_mainthread(self): + # Make sure that if interrupt_main is called in main thread that + # KeyboardInterrupt is raised instantly. diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 68ea23ff57..9fec18287e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -76,6 +76,7 @@ (define-module (gnu packages python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) @@ -324,7 +325,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.3") + (version "3.7.4") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -335,7 +336,7 @@ data types.") "python-3-search-paths.patch")) (sha256 (base32 - "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s")) + "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv")) (modules '((guix build utils))) (snippet '(begin @@ -344,33 +345,31 @@ data types.") (substitute* "Modules/Setup.dist" ;; Link Expat instead of embedding the bundled one. (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) - - (for-each delete-file - '(;; This test may hang and eventually run out of - ;; memory on some systems: - ;; - "Lib/test/test_socket.py" - - ;; Delete test that fails on low-memory systems. - "Lib/test/test_mmap.py" - - ;; These tests fail on AArch64. - "Lib/ctypes/test/test_win32.py" - "Lib/test/test_fcntl.py" - "Lib/test/test_posix.py")) #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:make-flags _) `(list (string-append (format #f "TESTOPTS=-j~d" (parallel-job-count)) - ;; Exclude the following test, which fails as of 3.7.3 (see: - ;; https://bugs.python.org/issue35998). - ;; Exclude test_email, which fails with glibc 2.29 and later - ;; (see ). - " --exclude test_asyncio test_email"))) + ;; test_mmap fails on low-memory systems. + " --exclude test_mmap" + ;; test_socket may hang and eventually run out of memory + ;; on some systems: . + " test_socket" + ;; XXX: test_ctypes fails on some platforms due to a problem in + ;; libffi 3.2.1: . + ,@(if (string-prefix? "aarch64" (%current-system)) + '(" test_ctypes") + '())))) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'set-TZDIR + (lambda* (#:key inputs #:allow-other-keys) + ;; test_email requires the Olson time zone database. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it ;; again afterwards. See . (add-before 'check 'unset-SOURCE_DATE_EPOCH @@ -399,6 +398,9 @@ data types.") (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) #t))))))) + (native-inputs + `(("tzdata" ,tzdata-for-tests) + ,@(package-native-inputs python-2))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") -- cgit v1.2.3 From 33f460addfcc737a7a80dab244211811283b77f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:07:13 +0200 Subject: gnu: flex: Remove superfluous input. The configure script will warn that "make indent" is unavailable, but apart from that this input is not actually used for the build process. * gnu/packages/flex.scm (flex)[inputs]: Remove INDENT. * gnu/packages/commencement.scm (flex-boot0)[inputs]: Likewise. --- gnu/packages/commencement.scm | 3 +-- gnu/packages/flex.scm | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ff34392865..1107bb24d2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -33,7 +33,6 @@ #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) - #:use-module (gnu packages code) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages bison) @@ -1742,7 +1741,7 @@ exec " gcc "/bin/" program (let* ((flex (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) (propagated-inputs `(("m4" ,m4))) - (inputs `(("indent" ,indent))) + (inputs '()) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile (package-with-explicit-inputs flex %boot0-inputs diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 6038e92744..f9a21204d9 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -27,7 +27,6 @@ #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages bison) - #:use-module (gnu packages code) #:use-module (srfi srfi-1)) (define-public flex @@ -53,8 +52,7 @@ (substitute-keyword-arguments (package-arguments bison) ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) - `(("bison" ,bison-for-tests) - ("indent" ,indent)))) + `(("bison" ,bison-for-tests)))) ;; m4 is not present in PATH when cross-building (native-inputs `(("help2man" ,help2man) -- cgit v1.2.3 From 7fe6dcf70809b8aa4a94f9bb4aa6f0743bf66d21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:09:47 +0200 Subject: gnu: Remove indent@2.2.10. * gnu/packages/code.scm (indent): Update to 2.2.12. [native-inputs]: Add TEXINFO. (indent-2.2.12): Remove variable. --- gnu/packages/code.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c5dfa4aa7a..13e2c4ad44 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -626,13 +626,13 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") (define-public indent (package (name "indent") - (version "2.2.10") + (version "2.2.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/indent/indent-" version ".tar.gz")) - (sha256 (base32 - "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa")))) + (sha256 + (base32 "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) (build-system gnu-build-system) (arguments `(#:phases @@ -645,6 +645,8 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") (substitute* "doc/Makefile.in" (("^docdir = .*$") "docdir = @docdir@\n")) #t))))) + (native-inputs + `(("texinfo" ,texinfo))) (synopsis "Code reformatter") (description "Indent is a program that makes source code easier to read by @@ -655,19 +657,6 @@ extensions over the standard utility.") (license license:gpl3+) (home-page "https://www.gnu.org/software/indent/"))) -(define-public indent-2.2.12 - (package - (inherit indent) - (version "2.2.12") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/indent/indent-" version - ".tar.gz")) - (sha256 - (base32 - "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) - (native-inputs `(("texinfo" ,texinfo))))) - (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208") (revision "0") -- cgit v1.2.3 From e81b14f08d62b7fc3ffcef0fce56968d2a7eb8a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:26:21 +0200 Subject: gnu: freetype: Update to 2.10.1. * gnu/packages/fontutils.scm (freetype): Update to 2.10.1. [source](uri): Adjust for new tarball name. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 725d3ac878..8a9a9b8ef7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -58,13 +58,13 @@ (define-public freetype (package (name "freetype") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) + "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From 9e13a3e05928d0f9a052909c35cb59db5c07cffc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 22:16:30 +0200 Subject: gnu: glib: Update to 2.60.5. * gnu/packages/glib.scm (glib): Update to 2.60.5. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2f8b2bda5e..f50dba03ea 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -160,7 +160,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.60.4") + (version "2.60.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -168,7 +168,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b")) + "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 4e073dcd41d47d4e67cc398288bc35edc16ee549 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 22:17:39 +0200 Subject: gnu: glib: Remove superfluous input. * gnu/packages/glib.scm (glib)[inputs]: Remove BASH. --- gnu/packages/glib.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f50dba03ea..3d17bc768f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -30,7 +30,6 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages base) - #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -195,7 +194,6 @@ shared NFS home directories.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("perl" ,perl) ; needed by GIO tests - ("bash" ,bash) ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments `(#:phases -- cgit v1.2.3 From 78affefecc4a3c92a550be22ae0c357f273df659 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 23:35:30 +0200 Subject: gnu: oath-toolkit: Fix FTBFS with GCC 7. * gnu/packages/authentication.scm (oath-toolkit)[source](patches): Add upstream patch. --- gnu/packages/authentication.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index 68a6459828..70f2a8c103 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -26,8 +26,6 @@ #:use-module (guix packages)) (define-public oath-toolkit - ;; If gcc@7 breaks this package before its next release, try patching it: - ;; . (package (name "oath-toolkit") (version "2.6.2") @@ -36,7 +34,18 @@ (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) - (patches (search-patches "oath-toolkit-glibc-compat.patch")) + (patches + (append (search-patches "oath-toolkit-glibc-compat.patch") + (list (origin + ;; This huge commit updates gnulib for GCC 7 compatibility. + (method url-fetch) + (uri (string-append + "https://gitlab.com/oath-toolkit/oath-toolkit/commit/" + "2fffce2a471f74a585939c84cce16ef3015e5d3d.diff")) + (file-name "oath-toolkit-update-gnulib.patch") + (sha256 + (base32 + "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0")))))) (sha256 (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h")))) (build-system gnu-build-system) -- cgit v1.2.3 From c1f4073ff53aa6b958441b7457692a1e146ab565 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 00:29:32 +0200 Subject: gnu: rapidjson: Fix FTBFS with GCC 7. * gnu/packages/patches/rapidjson-gcc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/web.scm (rapidjson)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/rapidjson-gcc-compat.patch | 18 ++++++++++++++++++ gnu/packages/web.scm | 1 + 3 files changed, 20 insertions(+) create mode 100644 gnu/packages/patches/rapidjson-gcc-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index e142122e6b..c8fa44d1cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1240,6 +1240,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/rapicorn-isnan.patch \ + %D%/packages/patches/rapidjson-gcc-compat.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoison-shell.patch \ diff --git a/gnu/packages/patches/rapidjson-gcc-compat.patch b/gnu/packages/patches/rapidjson-gcc-compat.patch new file mode 100644 index 0000000000..b5ffc0a908 --- /dev/null +++ b/gnu/packages/patches/rapidjson-gcc-compat.patch @@ -0,0 +1,18 @@ +Disable -Werror=implicit-fallthrough on GCC7 and later. Taken from upstream: +https://github.com/Tencent/rapidjson/commit/fe19b7b6016d446722621fb407738209d1a911e8 +https://github.com/Tencent/rapidjson/commit/cba45fe9de6923b858edb0780e257b7257aa4f7b + +diff --git a/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h +index 422a5240..d4039716 100644 +--- a/include/rapidjson/internal/regex.h ++++ b/include/rapidjson/internal/regex.h +@@ -29,6 +29,9 @@ RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #ifdef __GNUC__ + RAPIDJSON_DIAG_PUSH + RAPIDJSON_DIAG_OFF(effc++) ++#if __GNUC__ >= 7 ++RAPIDJSON_DIAG_OFF(implicit-fallthrough) ++#endif + #endif + + #ifdef _MSC_VER diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 42c00e77a5..687c92e2a6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -761,6 +761,7 @@ current version of any major web browser.") (sha256 (base32 "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) + (patches (search-patches "rapidjson-gcc-compat.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From fa0d5854ef9105b7585b9c7f9d8dcc2966e254e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 20:23:46 +0200 Subject: gnu: ToME4: Fix FTBFS with GCC 7. * gnu/packages/games.scm (tome4)[arguments]: Preserve CPATH in 'set-sdl-paths' phase.. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a102dc962f..b6a63aba02 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4981,7 +4981,8 @@ Crowther & Woods, its original authors, in 1995. It has been known as (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) + "/include/SDL2:" + (getenv "CPATH"))) #t)) (delete 'check) ;; premake doesn't provide install target -- cgit v1.2.3 From ff1e80d7918df85b78216a70ab31062af320c0e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 20:25:40 +0200 Subject: gnu: python-cram: Fix build. * gnu/packages/python-xyz.scm (python-cram)[arguments]: Do not require 100% test coverage. While here, do not move the 'check' phase, as PYTHON-BUILD-SYSTEM now runs tests after install by default. --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f3fae63f59..ee347a3abf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6622,12 +6622,16 @@ pseudo terminal (pty), and interact with both the process and its pty.") ;; lines, but the test expects a single line... (("env\\['COLUMNS'\\] = '80'") "env['COLUMNS'] = '160'")) + + (substitute* "Makefile" + ;; Recent versions of python-coverage have caused the test + ;; coverage to decrease (as of version 0.7). Allow that. + (("--fail-under=100") + "--fail-under=90")) + #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check ;; The test phase uses the built library and executable. - ;; It's easier to run it after install since the build - ;; directory contains version-specific PATH. (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (setenv "PATH" (string-append (getenv "PATH") ":" -- cgit v1.2.3 From 568d060327291dd3fcb0e20c3b5c493047ae6902 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 15:40:20 +0200 Subject: gnu: libselinux: Install python bindings to separate output. This reduces the closure size of glib from 203.1 to 111.3 MiB. * gnu/packages/selinux.scm (libselinux)[outputs]: New field. [arguments]: Set PYSITEDIR to the new "python" output. --- gnu/packages/selinux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index e540a140a1..1c45cb8c7e 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -131,6 +131,7 @@ module into a binary representation.") (define-public libselinux (package (inherit libsepol) (name "libselinux") + (outputs '("out" "python")) (arguments (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) @@ -139,7 +140,7 @@ module into a binary representation.") (assoc-ref %build-inputs "libsepol") "/lib/libsepol.a") (string-append "PYSITEDIR=" - (assoc-ref %outputs "out") + (assoc-ref %outputs "python") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/") -- cgit v1.2.3 From dc23bb451365919f0bc7c2b6ec5707c23bca9629 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 15:42:42 +0200 Subject: gnu: python-pyicu: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyicu): Update to 2.3.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee347a3abf..952f2436fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1204,14 +1204,14 @@ Python 3.3+.") (define-public python-pyicu (package (name "python-pyicu") - (version "2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "PyICU" version)) (sha256 (base32 - "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa")))) + "1x4w8m7ifki9z2a187pgjr33z6z0rp2fii9b73djak1vhm9v9cnx")))) (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) -- cgit v1.2.3 From 1c4b72cb34640638e40c5190676e5c8c352d292d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 19:17:57 +0200 Subject: gnu: harfbuzz: Create hb-gobject-enums.h. * gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Add GLIB:BIN. --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2c751667dc..563895458c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -199,7 +199,8 @@ affine transformation (scale, rotation, shear, etc.).") ("graphite2" ,graphite2) ("icu4c" ,icu4c))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("glib:bin" ,glib "bin") ;for glib-mkenums + ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("which" ,which))) -- cgit v1.2.3 From 60ccc1653a8ed040bbdfbc89f010614b0d9c4139 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 01:05:13 +0200 Subject: gnu: Remove expat/fixed. The merge preceding this commit (fb9a23a3f3) ignored the replacement added in 5a836ce38c (gnu: expat: fix CVE-2018-20843), because the fix is already present in Expat 2.2.7. This commit removes the remaining bits. * gnu/packages/patches/expat-CVE-2018-20843.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/xml.scm (expat/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/patches/expat-CVE-2018-20843.patch | 21 --------------------- gnu/packages/xml.scm | 8 -------- 3 files changed, 30 deletions(-) delete mode 100644 gnu/packages/patches/expat-CVE-2018-20843.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index b9575ad201..75cb7b62af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -781,7 +781,6 @@ dist_patch_DATA = \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ - %D%/packages/patches/expat-CVE-2018-20843.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ diff --git a/gnu/packages/patches/expat-CVE-2018-20843.patch b/gnu/packages/patches/expat-CVE-2018-20843.patch deleted file mode 100644 index 216fbe9667..0000000000 --- a/gnu/packages/patches/expat-CVE-2018-20843.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix extraction of namespace prefix from XML name. -Fixes CVE-2018-20843 - -This patch comes from upstream commit 11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 -https://github.com/libexpat/libexpat/commit/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 - -CVE is https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20843 - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 30d55c5..737d7cd 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -6071,7 +6071,7 @@ setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *elementType) - else - poolDiscard(&dtd->pool); - elementType->prefix = prefix; -- -+ break; - } - } - return 1; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e708348006..78b9b713e5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -88,14 +88,6 @@ stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).") (license license:expat))) -(define expat/fixed - (package - (inherit expat) - (source - (origin - (inherit (package-source expat)) - (patches (search-patches "expat-CVE-2018-20843.patch")))))) - (define-public libebml (package (name "libebml") -- cgit v1.2.3 From ee46474d54a661e87cd501c3fde6e572b3423a60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:50:14 +0200 Subject: gnu: glib: Fix argument handling in keyfile backend. * gnu/packages/patches/glib-keyfile-arguments.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (glib)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 3 ++- gnu/packages/patches/glib-keyfile-arguments.patch | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-keyfile-arguments.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 75cb7b62af..0a34b917ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -851,6 +851,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ + %D%/packages/patches/glib-keyfile-arguments.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3d17bc768f..8f1b91e142 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -168,7 +168,8 @@ shared NFS home directories.") (sha256 (base32 "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) - (patches (search-patches "glib-tests-timer.patch")) + (patches (search-patches "glib-tests-timer.patch" + "glib-keyfile-arguments.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch b/gnu/packages/patches/glib-keyfile-arguments.patch new file mode 100644 index 0000000000..8d428f4192 --- /dev/null +++ b/gnu/packages/patches/glib-keyfile-arguments.patch @@ -0,0 +1,20 @@ +Fix a problem with the keyfile backend whereby instantiating it with +the default NULL value would cause an assertion error: + +https://gitlab.gnome.org/GNOME/glib/issues/1825 + +This issue showed up when running the test suites of uhttpmock and spice. + +diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c +--- a/gio/gkeyfilesettingsbackend.c ++++ b/gio/gkeyfilesettingsbackend.c +@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object, + case PROP_FILENAME: + /* Construct only. */ + g_assert (kfsb->file == NULL); +- kfsb->file = g_file_new_for_path (g_value_get_string (value)); ++ if (g_value_get_string (value)) ++ kfsb->file = g_file_new_for_path (g_value_get_string (value)); + break; + + case PROP_ROOT_PATH: -- cgit v1.2.3 From 4b8f131345132c3d563374f132c2552f387c991a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:22 +0200 Subject: gnu: glib-networking: Remove unused input. This is a follow-up to commit 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191. * gnu/packages/gnome.scm (glib-networking)[inputs]: Remove P11-KIT. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92f5abc292..aa9731b0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2613,8 +2613,7 @@ library.") (inputs `(("glib" ,glib) ("gnutls" ,gnutls) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("p11-kit" ,p11-kit))) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://www.gnome.org") (synopsis "Network-related GIO modules") (description -- cgit v1.2.3 From 03ecf85a761fce24e5c164b501f1f0823ba54342 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:57 +0200 Subject: gnu: gcr: Fix build with recent Glib. * gnu/packages/gnome.scm (gcr)[source](patches): New field. --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aa9731b0fc..ab32cd642b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -601,7 +601,20 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")))) + "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + (patches + (list + ;; This patch solves an ordering issue that showed up when + ;; running the test suite against newer Glib 2.60. See + ;; . + (origin + (method url-fetch) + (uri (string-append "https://gitlab.gnome.org/GNOME/gcr/commit/" + "45d637578d7643ff96c0183ac267497a0b4c6344.diff")) + (file-name "gcr-hashtable-ordering.patch") + (sha256 + (base32 + "1vsqiys8fsm1f1vvds783wwf7zwi5v282rhsai8jrsm6x7h79gbi"))))))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 44d9e575df891a45a7658e20e89deb46e95a6ce2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 17:37:32 +0200 Subject: gnu: gtksourceview: Update to 4.2.0. * gnu/packages/gtk.scm (gtksourceview): Update to 4.2.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 563895458c..9086e4945b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -398,7 +398,7 @@ printing and other features typical of a source code editor.") (define-public gtksourceview (package (name "gtksourceview") - (version "4.0.3") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gtksourceview/" @@ -406,7 +406,7 @@ printing and other features typical of a source code editor.") "gtksourceview-" version ".tar.xz")) (sha256 (base32 - "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x")))) + "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 07ace64143c7fddf4c54b56b6807559296ab44ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 17:37:54 +0200 Subject: gnu: gnome-calculator: Update to 3.32.2. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.32.2. [inputs]: Change GTKSOURCEVIEW-3 to GTKSOURCEVIEW. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab32cd642b..5e90557b89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7163,7 +7163,7 @@ handling the startup notification side.") (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.30.1") + (version "3.32.2") (source (origin (method url-fetch) @@ -7172,7 +7172,7 @@ handling the startup notification side.") name "-" version ".tar.xz")) (sha256 (base32 - "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) (native-inputs @@ -7184,7 +7184,7 @@ handling the startup notification side.") ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) - ("gtksourceview" ,gtksourceview-3) + ("gtksourceview" ,gtksourceview) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("mpc" ,mpc) -- cgit v1.2.3 From 56174ade333eca022626abb7ce93a03c698229c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:21:11 +0200 Subject: gnu: Add rpcsvc-proto. * gnu/packages/onc-rpc.scm (rpcsvc-proto): New public variable. --- gnu/packages/onc-rpc.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 9646fbf4bd..d3149a4629 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +102,26 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") universal addresses.") (license bsd-3))) +(define-public rpcsvc-proto + (package + (name "rpcsvc-proto") + (version "1.4") + (home-page "https://github.com/thkukuk/rpcsvc-proto") + (source (origin + (method url-fetch) + (uri (string-append home-page "/releases/download/v" version + "/rpcsvc-proto-" version ".tar.xz")) + (sha256 + (base32 + "0i93wbpw5dk2gf5v4a5hq6frh814wzgjydh7saj28wlgbpqdaja1")))) + (build-system gnu-build-system) + (synopsis "RPCSVC protocol definitions") + (description + "This package provides @code{rpcsvc} @file{protocol.x} files and headers +that are not included with the @code{libtirpc} package. Additionally it +contains @command{rpcgen}, which is used to produce header files and sources +from the protocol files.") + (license bsd-3))) (define-public libnsl (package -- cgit v1.2.3 From 2f15e0a1ebf74c5b4b645354db64daf65cd18e0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:21:57 +0200 Subject: gnu: samba: Provide 'rpcgen'. Glibc no longer includes Sun/ONC RPC support since commit 3670ea70e2e932969a3ffc0acf75a714c7b42540. * gnu/packages/samba.scm (samba)[native-inputs]: Add RPCSVC-PROTO. --- gnu/packages/samba.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 812a36ca9a..4ecac8ab55 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -225,6 +226,7 @@ anywhere.") (native-inputs `(("docbook-xsl" ,docbook-xsl) ;for generating manpages ("xsltproc" ,libxslt) ;ditto + ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 838a52a5fd148c899f5d254147f9407aa7e179cd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:45:47 +0200 Subject: gnu: vte: Update to 0.56.3. * gnu/packages/gnome.scm (vte): Update to 0.56.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e90557b89..aeeff5b92a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2302,7 +2302,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.54.2") + (version "0.56.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2310,7 +2310,7 @@ libraries written in C.") name "-" version ".tar.xz")) (sha256 (base32 - "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) + "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 70f2b0f97d9bda374bf4a6deddfde2ea3e38d016 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:50:28 +0200 Subject: gnu: libgnomekbd: Update to 3.26.1. * gnu/packages/gnome.scm (libgnomekbd): Update to 3.26.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aeeff5b92a..9c9f69258a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7094,7 +7094,7 @@ GLib/GObject code.") (define-public libgnomekbd (package (name "libgnomekbd") - (version "3.26.0") + (version "3.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7102,7 +7102,7 @@ GLib/GObject code.") name "-" version ".tar.xz")) (sha256 (base32 - "0xc8jrc44x2h24v28wv36k70k7bwxy6p2vsvxvvia1n3ay642fza")))) + "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 7555d539245ff3456848c02d61f9e601ee5af463 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 20:07:12 +0200 Subject: gnu: gnome-online-accounts: Fix cyclic reference in outputs. This exploits a new feature of 'gobject-introspection-absolute-shlibs.patch'. * gnu/packages/gnome.scm (gnome-online-accounts)[arguments]: Set the "outputs" variable before building. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9c9f69258a..4c7847ba94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5089,6 +5089,9 @@ window manager.") (("@libdir@") (string-append lib "/lib")) (("@includedir@") (string-append lib "/include")) (("@datadir@") (string-append lib "/share"))) + ;; Make sure gobject-introspection knows about the output + ;; too (see ). + (setenv "outputs" "out lib") #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 4c482696a68fc68ddd56fad2d397873089f1d0a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 01:43:47 +0200 Subject: gnu: node: Update to 10.16.0. * gnu/packages/node.scm (node): Update to 10.16.0. [arguments]: Enable previously failing tests. Disable 'sequential/test-performance.js' and 'parallel/test-dns.js'. --- gnu/packages/node.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index df59a42c74..05da1ba0e1 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -45,14 +45,14 @@ (define-public node (package (name "node") - (version "10.15.3") + (version "10.16.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf")) + "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq")) (modules '((guix build utils))) (snippet `(begin @@ -95,7 +95,8 @@ (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-stdio-closed.js") + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js") (("'/bin/sh'") (string-append "'" (which "sh") "'"))) @@ -109,18 +110,13 @@ ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file - '("test/async-hooks/test-ttywrap.readstream.js" - "test/parallel/test-util-inspect.js" - "test/parallel/test-v8-serdes.js" - "test/parallel/test-dgram-membership.js" - "test/parallel/test-dns-cancel-reverse-lookup.js" - "test/parallel/test-dns-resolveany.js" - "test/parallel/test-cluster-master-error.js" + '("test/parallel/test-cluster-master-error.js" "test/parallel/test-cluster-master-kill.js" - "test/parallel/test-net-listen-after-destroying-stdin.js" - "test/parallel/test-npm-install.js" - "test/sequential/test-child-process-emfile.js" - "test/sequential/test-http-regr-gh-2928.js")) + ;; See also . + "test/sequential/test-performance.js")) + + ;; This requires a DNS resolver. + (delete-file "test/parallel/test-dns.js") ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this -- cgit v1.2.3 From da460865074bf3cc3b3c51e7678909e7e755787a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:50:59 +0200 Subject: gnu: python2-cython: Fix failing test. This started failing because Python no longer bundles libexpat since commit d1659c0fb27c4f71c8ddc6a85d3cd9f3a10cca97. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: New field. --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac1c66a1d9..943ffdd4cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3239,11 +3239,39 @@ writing C extensions for Python as easy as Python itself.") (properties `((python2-variant . ,(delay python2-cython)))))) (define-public python2-cython - (package (inherit (package-with-python2 - (strip-python2-variant python-cython))) - (name "python2-cython") - (inputs - `(("python-2" ,python-2))))) ; this is not automatically changed + (let ((base (package-with-python2 (strip-python2-variant python-cython)))) + (package + (inherit base) + (name "python2-cython") + (inputs + `(("python-2" ,python-2))) ;this is not automatically changed + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'adjust-test_embed + (lambda _ + (substitute* "runtests.py" + ;; test_embed goes great lengths to find the static libpythonX.Y.a + ;; so it can give the right -L flag to GCC when embedding static + ;; builds of Python. It is unaware that the Python "config" + ;; directory (where the static library lives) was renamed in + ;; Python 3, and falls back to sysconfig.get_config_var('LIBDIR'), + ;; which works fine, because that is where the shared library is. + ;; + ;; It also appears to be unaware that the Makefile in Demos/embed + ;; already unconditionally pass the static library location to GCC, + ;; after checking sysconfig.get_config_var('LIBPL). + ;; + ;; The effect is that the linker is unable to resolve libexpat + ;; symbols when building for Python 2, because neither the Python 2 + ;; shared library nor Expat is available. To fix it, we can either + ;; add Expat as an input and make it visible to the linker, or just + ;; prevent it from overriding the Python shared library location. + ;; The end result is identical, so we take the easy route. + ((" or libname not in os\\.listdir\\(libdir\\)") + "")) + #t))))))))) ;; The RPython toolchain currently does not support Python 3. (define-public python2-rpython -- cgit v1.2.3 From e9194eb04896165f15830862c42673e96bc5c5f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:51:16 +0200 Subject: gnu: python-cython: Speed up test suite. * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the CHECK phase, disable compiler optimizations and enable (some) parallel tests. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 943ffdd4cc..a60e1c7e2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3229,7 +3229,12 @@ provides additional functionality on the produced Mallard documents.") (replace 'check (lambda _ - (invoke "python" "runtests.py" "-vv")))))) + ;; Disable compiler optimizations to greatly reduce the running + ;; time of the test suite. + (setenv "CFLAGS" "-O0") + + (invoke "python" "runtests.py" "-vv" + "-j" (number->string (parallel-job-count)))))))) (home-page "https://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From 8cae550021279668296e5462868a2c8a59d18c0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:53:23 +0200 Subject: gnu: gexiv2: Enable tests on all platforms. * gnu/packages/gnome.scm (gexiv2)[arguments]: Remove. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4c7847ba94..4d7f956162 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4629,14 +4629,6 @@ classes for commonly used data structures.") (base32 "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) (build-system meson-build-system) - (arguments - ;; On 32-bit platforms, the test fails with a rounding error: - ;; . Just skip it for - ;; now. - (if (and (not (%current-target-system)) - (member (%current-system) '("i686-linux" "armhf-linux"))) - '(#:tests? #f) - '())) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 33ef61ec726b6640595f82e38d4d72e6ef73e7e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:10:09 +0200 Subject: gnu: fontforge: Remove superfluous input. Pango propagates Glib nowadays, no need to list it eplicitly. * gnu/packages/fontutils.scm (fontforge)[inputs]: Remove GLIB. --- gnu/packages/fontutils.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8a9a9b8ef7..fb18440bac 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -582,7 +582,6 @@ definitions.") ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) ("gettext" ,gettext-minimal) - ("glib" ,glib) ;needed for pango detection ("libICE" ,libice) ("libSM" ,libsm) ("libX11" ,libx11) -- cgit v1.2.3 From 26a7ff6e10652270a4ef6ef9a08392b31ff86f40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:11:06 +0200 Subject: gnu: fontforge: Fix segfault on i686 (and possibly other platforms). * gnu/packages/fontutils.scm (fontforge)[source](patches): New field. --- gnu/packages/fontutils.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index fb18440bac..fe9e77d8c7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -573,6 +573,19 @@ definitions.") (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) + (patches (list (origin + ;; This patch is required to fix a segfault on i686: + ;; . + ;; It is a squashed version of these commits: + ;; . + (method url-fetch) + (uri (string-append + "https://github.com/fontforge/fontforge/commit/" + "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch")) + (file-name "fontforge-scripting-array-reference.patch") + (sha256 + (base32 + "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc"))))) (sha256 (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) -- cgit v1.2.3 From 145fed2a2b499e840c22c0165b6c2d062dd2ce88 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 11:43:03 +0100 Subject: gnu: gobject-introspection: Remove hardcoded store from patch. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Use the NIX_STORE environment variable, rather than hardcoding the store directory. --- .../patches/gobject-introspection-absolute-shlib-path.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 3c0bb1c6cf..956fa617c3 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -61,12 +61,14 @@ parser.add_option_group(group) --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) +def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape('/gnu/store') ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) + pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' + return re.compile(pattern % (store_dir, re.escape(library_name))) + @@ -109,14 +111,15 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): - for library, pattern in patterns.items(): - m = pattern.match(word) + for library, (pattern, guix_pattern) in patterns.items(): -+ if line.find('/gnu/store') != -1: ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: + m = guix_pattern.match(word) + else: + m = pattern.match(word) -- cgit v1.2.3 From 4f61513128284fab8745a317b4663e36b042da5d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 13 Jul 2019 17:40:31 -0400 Subject: gnu: Go: Use the default libgcc. * gnu/packages/golang.scm (go-1.4)[inputs]: Replace gcc-6 with gcc. --- gnu/packages/golang.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2f5396dd1e..ba683905d6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -195,11 +195,7 @@ (inputs `(("tzdata" ,tzdata) ("pcre" ,pcre) - ;; Building Go 1.10 with the Go 1.4 bootstrap, Thread Sanitizer from GCC - ;; 5 finds a data race during the the test suite of Go 1.10. With GCC 6, - ;; the race doesn't seem to be present: - ;; https://github.com/golang/go/issues/24046 - ("gcc:lib" ,gcc-6 "lib"))) + ("gcc:lib" ,gcc "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("which" ,which) -- cgit v1.2.3 From 2be878d8e54057980121e4c659ca48317b79970e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 22:51:48 +0100 Subject: gnu: python-pep8: Patch to fix test failure with Python 3.7. Patch from the upstream repository, see https://github.com/PyCQA/pycodestyle/issues/786 for more details. * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file. * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. --- .../python-pep8-stdlib-tokenize-compat.patch | 35 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch new file mode 100644 index 0000000000..f11d8f7be8 --- /dev/null +++ b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pep8.py ++++ b/pep8.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): + """ + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" + + + @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a60e1c7e2a..ac43ef9057 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6350,7 +6350,8 @@ applications.") (uri (pypi-uri "pep8" version)) (sha256 (base32 - "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) + "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")) + (patches (search-patches "python-pep8-stdlib-tokenize-compat.patch")))) (build-system python-build-system) (home-page "https://pep8.readthedocs.org/") (synopsis "Python style guide checker") -- cgit v1.2.3 From a5c2e7961c21ef8620ce4cfb3569109fbd694e1e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 22:58:33 +0100 Subject: gnu: python-gst: Fix build failure. Building python-gst fails with: Unbound variable: python-version Therefore, add python-build-system to #:modules so that it's imported, and give it a prefix to avoid clashing with the gnu-build-system. Also, simplify the code by using the site-packages function from the python-build-system module. * gnu/packages/gstreamer.scm (python-gst)[arguments]: Rework to fix build failure. --- gnu/packages/gstreamer.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b0f0b032b3..18c567e8b0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -431,17 +431,14 @@ compression formats through the use of the libav library.") "0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m")))) (build-system gnu-build-system) (arguments - ;; XXX: Factorize python-sitedir with python-build-system. - `(#:imported-modules (,@%gnu-build-system-modules + `(#:modules ((guix build gnu-build-system) + ((guix build python-build-system) #:prefix python:)) + #:imported-modules (,@%gnu-build-system-modules (guix build python-build-system)) #:configure-flags - (let* ((python (assoc-ref %build-inputs "python")) - (python-version (python-version python)) - (python-sitedir (string-append - "lib/python" python-version "/site-packages"))) - (list (string-append - "--with-pygi-overrides-dir=" %output "/" python-sitedir - "/gi/overrides"))))) + (list (string-append + "--with-pygi-overrides-dir=" + (python:site-packages %build-inputs %outputs) "gi/overrides")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 344f358fba76f4ff576c2702819f3cfd7a6c5348 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 17:26:24 +0200 Subject: gnu: rdma-core: Update to 22.3. * gnu/packages/linux.scm (rdma-core): Update to 22.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f2c86b21d..4ccf613a9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3896,7 +3896,7 @@ The package provides additional NTFS tools.") (define-public rdma-core (package (name "rdma-core") - (version "14") + (version "22.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -3904,7 +3904,7 @@ The package provides additional NTFS tools.") version ".tar.gz")) (sha256 (base32 - "0w03zd49k96bmly44qc8l0s9l671sd26k4wrilsp13xaspy048kd")))) + "0jgp1xh328x0kr6lkn4vq71cc627zd05wczr74b3j3151flhj828")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From ad60a3484c6d3221b78dbc6f173ce27bc3b1f96a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 17:30:42 +0200 Subject: gnu: gst-kaldi-nnet2-online: Adjust for GCC 7. * gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online)[arguments]: Don't read CPLUS_INCLUDE_PATH, or pass -std=c++11. End phases on #t. --- gnu/packages/machine-learning.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e216b9474a..fc527363c0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1139,16 +1139,16 @@ written in C++.") (replace 'configure (lambda* (#:key inputs #:allow-other-keys) (let ((glib (assoc-ref inputs "glib"))) - (setenv "CXXFLAGS" "-std=c++11 -fPIC") + (setenv "CXXFLAGS" "-fPIC") (setenv "CPLUS_INCLUDE_PATH" (string-append glib "/include/glib-2.0:" glib "/lib/glib-2.0/include:" (assoc-ref inputs "gstreamer") - "/include/gstreamer-1.0:" - (getenv "CPLUS_INCLUDE_PATH")))) + "/include/gstreamer-1.0"))) (substitute* "Makefile" (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") - (("\\$\\(error Cannot find") "#")))) + (("\\$\\(error Cannot find") "#")) + #t)) (add-before 'build 'build-depend (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "depend" make-flags))) -- cgit v1.2.3 From 97149c576762de7fd8e1a6ac8f46c97d3490b360 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:13:34 +0200 Subject: gnu: Adjust uses of C{,PLUS}_INCLUDE_PATH for GCC 7. These variables are no longer set in the build environment by default. GCC still respects these search paths and treats them as "system headers" so we can continue to use them, just not expect them to be available. * gnu/packages/mpi.scm (openmpi)[arguments]: Do not attempt to read from C_INCLUDE_PATH, nor CPLUS_INCLUDE_PATH. * gnu/packages/games.scm (kiki)[arguments]: Likewise. * gnu/packages/networking.scm (hcxtools)[arguments]: Likewise. * gnu/packages/synergy.scm (synergy)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (gemma, sailfish)[arguments]: Likewise. * gnu/packages/maths.scm (dune-alugrid)[arguments]: Likewise. --- gnu/packages/bioinformatics.scm | 8 ++------ gnu/packages/games.scm | 3 +-- gnu/packages/maths.scm | 3 +-- gnu/packages/mpi.scm | 6 ++---- gnu/packages/networking.scm | 3 +-- gnu/packages/synergy.scm | 3 +-- 6 files changed, 8 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92bc532196..0dcbb94666 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3260,9 +3260,7 @@ comment or quality sections.") (lambda* (#:key inputs #:allow-other-keys) ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t)) (add-before 'build 'bin-mkdir @@ -11697,9 +11695,7 @@ bytes of memory space, where n is the length of the string.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t))))) (inputs diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b6a63aba02..6e54abc5d0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4175,8 +4175,7 @@ over 100 user-created campaigns.") (string-append (assoc-ref inputs "sdl-union") "/include/SDL:" (assoc-ref inputs "python") - "/include/python2.7:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/python2.7")) (substitute* "src/main/main.cpp" (("#include " line) (string-append line " diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index df8bad13e0..3f9cd8be6e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4740,8 +4740,7 @@ assemble global function spaces on finite-element grids.") (add-after 'build 'build-tests (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share:" - (getenv "CPLUS_INCLUDE_PATH"))) + (string-append (assoc-ref inputs "dune-grid") "/share")) (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index c9cd7b1382..c02e1d2e2b 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -217,12 +217,10 @@ bind processes, and much more.") (lambda* (#:key inputs #:allow-other-keys) (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "C_INCLUDE_PATH"))) + "/include/infiniband")) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/infiniband")) #t)) (add-before 'build 'remove-absolute (lambda _ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 53c11f6d95..ce9afaf16d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2289,8 +2289,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (string-append (assoc-ref inputs "curl") "/include:" (assoc-ref inputs "libpcap") "/include:" (assoc-ref inputs "openssl") "/include:" - (assoc-ref inputs "zlib") "/include:" - (getenv "C_INCLUDE_PATH"))) + (assoc-ref inputs "zlib") "/include")) #t))))) (home-page "https://github.com/ZerBea/hcxtools") (synopsis "Capture wlan traffic to hashcat and John the Ripper") diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index da8787285f..9de3ee57e4 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -63,8 +63,7 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") - "/include/avahi-compat-libdns_sd/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/avahi-compat-libdns_sd")) ;; See https://github.com/symless/synergy-core/pull/6359/ (substitute* "src/gui/src/ScreenSetupView.cpp" (("#include " m) -- cgit v1.2.3 From a46cf184fecb62fe93f3510eb32cc4772cf51cb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:13:59 +0200 Subject: gnu: criu: Fix build with GCC 7. * gnu/packages/virtualization.scm (criu)[arguments]: Do not read from C_INCLUDE_PATH, but add LINUX-LIBRE-HEADERS on it. --- gnu/packages/virtualization.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a640a64d40..e9bf459eee 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -694,8 +694,14 @@ domains, their live performance and resource utilization statistics.") ;; The includes for libnl are located in a sub-directory. (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "libnl") - "/include/libnl3:" - (getenv "C_INCLUDE_PATH"))) + "/include/libnl3" + ;; Also add the kernel headers here so that GCC + ;; treats them as "system headers". Otherwise + ;; the build fails with -Werror because parasite.c + ;; includes both and , + ;; which define some of the same constants. + (assoc-ref inputs "kernel-headers") + "/include")) ;; Prevent xmlto from failing the install phase. (substitute* "Documentation/Makefile" (("XMLTO.*:=.*") -- cgit v1.2.3 From ab2a1aed202b881da75f7de5a07206df54d0c9ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:17:26 +0200 Subject: gnu: criu: Fix typo. This is a follow-up to commit a46cf184fecb62fe93f3510eb32cc4772cf51cb8. * gnu/packages/virtualization.scm (criu)[arguments]: Add missing ":". --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e9bf459eee..0a61e4403e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -694,7 +694,7 @@ domains, their live performance and resource utilization statistics.") ;; The includes for libnl are located in a sub-directory. (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "libnl") - "/include/libnl3" + "/include/libnl3:" ;; Also add the kernel headers here so that GCC ;; treats them as "system headers". Otherwise ;; the build fails with -Werror because parasite.c -- cgit v1.2.3 From d4ae2d15eff3a8ada5028c942c3be3831d54a00a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 23 Jun 2019 22:10:50 -0400 Subject: gnu: baobab: Update to 3.30.0. * gnu/packages/gnome.scm (baobab): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4d7f956162..e9a0166e96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6273,7 +6273,7 @@ files.") (define-public baobab (package (name "baobab") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append @@ -6282,7 +6282,7 @@ files.") name "-" version ".tar.xz")) (sha256 (base32 - "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk")))) + "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From bd15da3a379821e3943403c5540b877d476c7f0d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 25 Jun 2019 22:01:44 -0400 Subject: gnu: font-abattis-cantarell: Update to 0.111. * gnu/packages/fonts.scm (font-cantarell): Update to 0.111. [build-system]: Use meson-build-system. [native-inputs]: Add appstream-glib and gettext-minimal. --- gnu/packages/fonts.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c24e58de0d..5b52b84a57 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -51,10 +51,13 @@ #:use-module (guix git-download) #:use-module (guix build-system font) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -182,7 +185,7 @@ itself.")))) (define-public font-cantarell (package (name "font-abattis-cantarell") - (version "0.0.25") + (version "0.111") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -190,8 +193,11 @@ itself.")))) "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl")))) - (build-system gnu-build-system) + "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5")))) + (build-system meson-build-system) + (native-inputs + `(("appstream-glib" ,appstream-glib) + ("gettext" ,gettext-minimal))) ;for msgfmt (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist -- cgit v1.2.3 From f37dfe1ec3887315f3debf60ca51321f948be81a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 26 Jun 2019 11:48:35 -0400 Subject: gnu: epiphany: Update to 3.30.4. * gnu/packages/gnome.scm (epiphany): Update to 3.30.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9a0166e96..f5b56fdbc8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4375,7 +4375,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.30.2") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4383,7 +4383,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) + "0nk0krzrfck6hhfs52f4sjmj93yjyvabm72bq8i8f9l1pass5vgd")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 976e7801ac6f3b4701fcde327f79627ec34f8319 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:48:21 -0400 Subject: gnu: file-roller: Update to 3.30.1. * gnu/packages/gnome.scm (file-roller): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f5b56fdbc8..99b29fb09f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4696,7 +4696,7 @@ share them with others via social networking and more.") (define-public file-roller (package (name "file-roller") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4704,7 +4704,7 @@ share them with others via social networking and more.") name "-" version ".tar.xz")) (sha256 (base32 - "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1")))) + "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1")))) (build-system meson-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database -- cgit v1.2.3 From 42f95e3476d061d17982594f74488c7cd8199c62 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:49:47 -0400 Subject: gnu: gedit: Update to 3.30.2. * gnu/packages/gnome.scm (gedit): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99b29fb09f..03d3d888f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4866,7 +4866,7 @@ javascript engine and the GObject introspection framework.") (define-public gedit (package (name "gedit") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4874,7 +4874,7 @@ javascript engine and the GObject introspection framework.") name "-" version ".tar.xz")) (sha256 (base32 - "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i")))) + "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From 235743a62725a93121962d3cc3400863161913a6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:52:55 -0400 Subject: gnu: zenity: Update to 3.30.0. * gnu/packages/gnome.scm (zenity): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03d3d888f2..ed27c4f70b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4926,7 +4926,7 @@ powerful general purpose text editor.") (define-public zenity (package (name "zenity") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4934,7 +4934,7 @@ powerful general purpose text editor.") name "-" version ".tar.xz")) (sha256 (base32 - "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv")))) + "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 29b85910f668d14b72b92874c47fdcf26e54a135 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:58:57 -0400 Subject: gnu: gnome-backgrounds: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed27c4f70b..eb251498e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6309,7 +6309,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6318,7 +6318,7 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj")))) + "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc")))) (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) -- cgit v1.2.3 From bba7a77ed9ad826bcdc6d9b8a183d66a23229501 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 23:06:24 +0200 Subject: gnu: MariaDB: Disable the TokuDB plugin. Fixes . Reported by Mark H Weaver . * gnu/packages/databases.scm (mariadb)[arguments]: Pass "-DTOKUDB_OK" in <#:configure-flags>. Enable the "innodb_fts.crash_recovery" test, which likely failed because of the high I/O load induced by TokuDB. [inputs]: Remove SNAPPY. --- gnu/packages/databases.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6bfeaad9a2..26f7bb8f73 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -659,6 +659,10 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Disable the TokuDB engine, because its test suite frequently fails, + ;; and loading it crashes the server: . + "-DTOKUDB_OK=OFF" + ;; Ensure the system libraries are used. "-DWITH_JEMALLOC=yes" "-DWITH_PCRE=system" @@ -706,9 +710,6 @@ Language.") ;; 2030-12-31. See for details. "main.mysqldump" - ;; XXX: Fails sporadically. - "innodb_fts.crash_recovery" - ;; FIXME: This test fails on i686: ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) @@ -786,7 +787,6 @@ Language.") ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("pcre" ,pcre) - ("snappy" ,snappy) ("xz" ,xz) ("zlib" ,zlib))) (propagated-inputs -- cgit v1.2.3 From 982c0b368daa2443de6fb642d73469d6a6ca468a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:01:12 -0400 Subject: gnu: gnome-control-center: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.30.3. [source](patches): New field. [arguments]: Adjust "patch-paths" phase. [inputs]: Add libsecret and udisks. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 11 +- ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 +++++++++++++++++++++ 3 files changed, 230 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0a34b917ce..123ff115a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,6 +889,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eb251498e9..ea854ff38a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5809,7 +5809,7 @@ devices using the GNOME desktop.") (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.28.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5817,7 +5817,10 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz")))) + "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) + (patches + (search-patches + "gnome-control-center-use-udisks-to-get-disk-size.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -5834,7 +5837,7 @@ devices using the GNOME desktop.") (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) - (substitute* "panels/datetime/test-endianess.c" + (substitute* "tests/datetime/test-endianess.c" (("/usr/share/locale") (string-append libc "/share/locale"))) (substitute* "panels/region/cc-region-panel.c" @@ -5877,6 +5880,7 @@ devices using the GNOME desktop.") ("libgudev" ,libgudev) ("libgtop" ,libgtop) ("libpwquality" ,libpwquality) + ("libsecret" ,libsecret) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libwacom" ,libwacom) @@ -5888,6 +5892,7 @@ devices using the GNOME desktop.") ("pulseaudio" ,pulseaudio) ("smbclient" ,samba) ("tzdata" ,tzdata) + ("udisks" ,udisks) ("upower" ,upower))) (synopsis "Utilities to configure the GNOME desktop") (home-page "https://www.gnome.org/") diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + -- cgit v1.2.3 From d29298ef5b79c024819569fac0297265b3e31382 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:02:28 -0400 Subject: gnu: gnome-online-accounts: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea854ff38a..955ccbd757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5056,7 +5056,7 @@ window manager.") (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.30.0") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5064,7 +5064,7 @@ window manager.") name "-" version ".tar.xz")) (sha256 (base32 - "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) + "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From da886d6fce0510a7e404b02a11e7645ee82afc3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:03:52 -0400 Subject: gnu: gnome-session: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-session): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 955ccbd757..a6a4bada10 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4732,7 +4732,7 @@ such as gzip tarballs.") (define-public gnome-session (package (name "gnome-session") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4740,7 +4740,7 @@ such as gzip tarballs.") name "-" version ".tar.xz")) (sha256 (base32 - "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq")))) + "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa")))) (arguments '(#:glib-or-gtk? #t #:phases -- cgit v1.2.3 From 90fdc80f776a84da4a210e3cafc049c0e1bf19b1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:06:12 -0400 Subject: gnu: gnome-settings-daemon: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6a4bada10..f99d5ab2c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3238,7 +3238,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.30.1.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -3247,7 +3247,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) + "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 5088834271a2899cd7d1a86983fbefa1b3ceb3aa Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:07:31 -0400 Subject: gnu: gnome-terminal: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f99d5ab2c6..8090bcd6cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2934,7 +2934,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) @@ -2943,7 +2943,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) + "0bar8qazk39acsif31h8i408nl82mzdcdg6p7ymak4l9pxyscxf8")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1f8b5515edbc2077387cf59d355adb9ab6d797cf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:18:04 -0400 Subject: gnu: gucharmap: Update to 12.0.1. * gnu/packages/gnome.scm (gucharmap): Update to 12.0.1. [native-inputs]: Update unicode-files. --- gnu/packages/gnome.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8090bcd6cf..0c6942c23d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7230,20 +7230,20 @@ basically a text box in which notes can be written.") (define-public gucharmap (let ((unicode-files '(("Blocks.txt" - "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas") + "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1") ("DerivedAge.txt" - "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h") + "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6") ("NamesList.txt" - "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1") + "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61") ("Scripts.txt" - "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh") + "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx") ("UnicodeData.txt" - "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj") + "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap") ("Unihan.zip" - "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1")))) + "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf")))) (package (name "gucharmap") - (version "10.0.4") + (version "12.0.1") (source (origin (method url-fetch) @@ -7252,7 +7252,7 @@ basically a text box in which notes can be written.") name "-" version ".tar.xz")) (sha256 (base32 - "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv")))) + "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir")))) (build-system glib-or-gtk-build-system) (arguments `(#:modules ((ice-9 match) @@ -7284,7 +7284,7 @@ basically a text box in which notes can be written.") ,(origin (method url-fetch) (uri (string-append - "http://www.unicode.org/Public/10.0.0/ucd/" + "http://www.unicode.org/Public/12.0.0/ucd/" file)) (sha256 (base32 hash)))))) unicode-files) -- cgit v1.2.3 From 12fe48467395671cb0acaed36ac208ea73d49a19 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:36:40 -0400 Subject: gnu: gvfs: Update to 1.40.1. * gnu/packages/gnome.scm (gvfs): Update to 1.40.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c6942c23d..d6d07e041a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4158,7 +4158,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.38.1") + (version "1.40.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4166,7 +4166,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") name "-" version ".tar.xz")) (sha256 (base32 - "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From c71bb3f29dadf9b748e4c98d430a437274741739 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:38:15 -0400 Subject: gnu: nautilus: Update to 3.30.5. * gnu/packages/gnome.scm (nautilus): Update to 3.30.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d07e041a..85c4cc7625 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6226,7 +6226,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "3.30.4") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6234,7 +6234,7 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) + "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 18138ab939090f11d70220e830e06101d7f6acf3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:39:42 -0400 Subject: gnu: shared-mime-info: Update to 1.10. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.10. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 85c4cc7625..25e3ee0e5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -977,14 +977,14 @@ guidelines.") (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 - "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw")))) + "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. -- cgit v1.2.3 From 77425f04f246426421d79b1928dd7484ee811390 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:46:22 -0400 Subject: gnu: totem: Update to 3.30.0. * gnu/packages/gnome.scm (totem): Update to 3.30.0. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 25e3ee0e5a..f51f534748 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3305,7 +3305,7 @@ settings, themes, mouse settings, and startup of other daemons.") (define-public totem-pl-parser (package (name "totem-pl-parser") - (version "3.26.1") + (version "3.26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/totem-pl-parser/" @@ -3313,7 +3313,7 @@ settings, themes, mouse settings, and startup of other daemons.") "totem-pl-parser-" version ".tar.xz")) (sha256 (base32 - "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka")))) + "13a45py2j1r9967zgww8kd24bn2fhycd4m3kzr90sxx9l2w03z8f")))) (build-system meson-build-system) (arguments ;; FIXME: Tests require gvfs. @@ -3835,7 +3835,7 @@ for application developers.") (define-public totem (package (name "totem") - (version "3.26.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -3844,7 +3844,7 @@ for application developers.") name "-" version ".tar.xz")) (sha256 (base32 - "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) + "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0")) (patches (search-patches "totem-meson-easy-codec.patch" "totem-meson-compat.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From bea6b829b89718f789d41c99301e7ce44dd21cf5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:23:47 -0400 Subject: gnu: gcr: Update to 3.28.1. * gnu/packages/gnome.scm (gcr): Update to 3.28.1. [native-inputs]: Add vala. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f51f534748..2d6b78c907 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -593,7 +593,7 @@ and keep up to date translations of documentation.") (define-public gcr (package (name "gcr") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -601,7 +601,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m")) (patches (list ;; This patch solves an ordering issue that showed up when @@ -643,6 +643,7 @@ and keep up to date translations of documentation.") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("libxml2" ,libxml2) + ("vala" ,vala) ("xsltproc" ,libxslt))) ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc (propagated-inputs -- cgit v1.2.3 From 9d4d439b0a455e205da75515852a4147fe378d63 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:30:52 -0400 Subject: gnu: gnome-tweaks: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-tweaks): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2d6b78c907..a20db29e2a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6781,7 +6781,7 @@ existing databases over the internet.") (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.30.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6791,7 +6791,7 @@ existing databases over the internet.") (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) + "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d054fbf57dacdf9bd177bb920d7f4c941dc1f9e9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:35:02 -0400 Subject: gnu: gjs: Update to 1.56.2. * gnu/packages/gnome.scm (gjs): Update to 1.56.2. [arguments]: Adjust pre-check phase. [propagated-inputs]: Replace mozjs-52 with mozjs-60. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a20db29e2a..3ddca75f81 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4812,7 +4812,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.52.3") + (version "1.56.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4820,7 +4820,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff")))) + "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4840,6 +4840,9 @@ configuration program to choose applications starting on login.") (substitute* "installed-tests/js/testLocale.js" ((".*toBeDefined.*") "") ((".*expect\\(datestr\\).*") "")) + (substitute* "installed-tests/scripts/testCommandLine.sh" + (("Valentín") "") + (("☭") "")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources @@ -4853,7 +4856,7 @@ configuration program to choose applications starting on login.") ;; These are all in the Requires.private field of gjs-1.0.pc. `(("cairo" ,cairo) ("gobject-introspection" ,gobject-introspection) - ("mozjs" ,mozjs-52))) + ("mozjs" ,mozjs-60))) (inputs `(("gtk+" ,gtk+) ("readline" ,readline))) -- cgit v1.2.3 From f828d05b28ed79c63c0eb521350506ad3b42cbf8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 05:15:16 -0400 Subject: gnu: Add amtk. * gnu/packages/gnome.scm (amtk): New variable. --- gnu/packages/gnome.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3ddca75f81..92ba991fc2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3375,6 +3375,37 @@ playlists in a variety of formats.") which are easy to play with the aid of a mouse.") (license license:gpl3+))) +(define-public amtk + (package + (name "amtk") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-gtk-doc"))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkenums + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+))) + (home-page "https://wiki.gnome.org/Projects/Amtk") + (synopsis "Actions, Menus and Toolbars Kit for GTK+ applications") + (description + "Amtk is the acronym for @acronym{Amtk, Actions Menus and Toolbars Kit}. +It is a basic GtkUIManager replacement based on GAction. It is suitable for +both a traditional UI or a modern UI with a GtkHeaderBar.") + (license license:lgpl2.1+))) + (define-public devhelp (package (name "devhelp") -- cgit v1.2.3 From 11d28bd9f654f292b61c876e093e62a5ea242660 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:36:55 -0400 Subject: gnu: devhelp: Update to 3.30.1. * gnu/packages/gnome.scm (devhelp): Update to 3.30.1. [build-system]: Use meson-build-system. [native-inputs]: Add gobject-introspection, glib:bin and gtk+:bin. [inputs]: Add amtk. --- gnu/packages/gnome.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92ba991fc2..f9727ac477 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3409,7 +3409,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") (define-public devhelp (package (name "devhelp") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3417,14 +3417,18 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") name "-" version ".tar.xz")) (sha256 (base32 - "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s")))) - (build-system glib-or-gtk-build-system) + "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a")))) + (build-system meson-build-system) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) + ("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkmenus + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + `(("amtk" ,amtk) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") -- cgit v1.2.3 From 7734b4a2d9b0f5f63396bff2eb3d6598800eda5b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:40:38 -0400 Subject: gnu: gdm: Update to 3.30.3. * gnu/packages/gnome.scm (gdm): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9727ac477..d13ab8ea43 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5599,7 +5599,7 @@ libxml2.") (define-public gdm (package (name "gdm") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5607,7 +5607,7 @@ libxml2.") name "-" version ".tar.xz")) (sha256 (base32 - "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) + "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From b1a8b40818ed100a395b0e244457d2c6a6257912 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 06:35:48 -0400 Subject: gnu: gexiv2: Update to 0.12.0. * gnu/packages/gnome.scm (gexiv2): Update to 0.12.0. [native-inputs]: Add gcr and vala. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d13ab8ea43..04cd56f0d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4655,7 +4655,7 @@ classes for commonly used data structures.") (define-public gexiv2 (package (name "gexiv2") - (version "0.10.10") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4663,11 +4663,13 @@ classes for commonly used data structures.") name "-" version ".tar.xz")) (sha256 (base32 - "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) + "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq")))) (build-system meson-build-system) (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + `(("gcr" ,gcr) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (propagated-inputs ;; Listed in "Requires" section of gexiv2.pc `(("exiv2" ,exiv2))) -- cgit v1.2.3 From 3b79afa6a83a2d68109afb8f85ab82596a531b3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:42:15 -0400 Subject: gnu: shotwell: Update to 0.30.4. * gnu/packages/gnome.scm (shotwell): Update to 0.30.4. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add desktop-file-utils. Remove itstool duplicate. Order inputs alphabetically. --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 04cd56f0d0..9ccdcbd83c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4687,7 +4687,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.28.4") + (version "0.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4695,16 +4695,18 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "03k7n2kmzqn11kf3733w7m6xjh2b5q9xr84za2hli11fjymzaxm9")))) - (build-system glib-or-gtk-build-system) + "1yiz3j0y2yg6985y3alb3hpkfbv68n8ibys5gpwcjdhmhf3czg5p")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (propagated-inputs `(("dconf" ,dconf))) (native-inputs - `(("pkg-config" ,pkg-config) - ("itstool" ,itstool) + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gettext" ,gettext-minimal) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 00b14dbb09f5ba8f6057b8f98041ead17ddd1809 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:53:48 -0400 Subject: gnu: cheese: Update to 3.30.0. * gnu/packages/gnome.scm (cheese): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ccdcbd83c..95b472a7b1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7718,7 +7718,7 @@ photo-booth-like software, such as Cheese.") (define-public cheese (package (name "cheese") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7726,7 +7726,7 @@ photo-booth-like software, such as Cheese.") version ".tar.xz")) (sha256 (base32 - "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw")))) + "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr")))) (arguments ;; Tests require GDK. `(#:tests? #f -- cgit v1.2.3 From 676e7cb4fa054d7a2a21967dd4bf399bef04d7d3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:55:38 -0400 Subject: gnu: gnome-screenshot: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-screenshot): Update to 3.30.0. [home-page]: Update URI. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 95b472a7b1..16b048b552 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6385,7 +6385,7 @@ can add your own files to the collection.") (define-public gnome-screenshot (package (name "gnome-screenshot") - (version "3.26.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6394,7 +6394,7 @@ can add your own files to the collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1fy8fjl29i3xhj8caik03d3za06x96xgkk8r4fwz88iqbmci3g0v")))) + "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -6408,7 +6408,7 @@ can add your own files to the collection.") ("libcanberra" ,libcanberra) ("libx11" ,libx11) ("libxext" ,libxext))) - (home-page "https://git.gnome.org/browse/gnome-screenshot") + (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") (synopsis "Take pictures of your screen") (description "GNOME Screenshot is a utility used for taking screenshots of the entire -- cgit v1.2.3 From ef9b7d4c9fa25e57035f1a825db26a9ddb37ce16 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:58:08 -0400 Subject: gnu: orca: Update to 3.30.2. * gnu/packages/gnome.scm (orca): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 16b048b552..62c7937360 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7461,7 +7461,7 @@ accessibility infrastructure.") (define-public orca (package (name "orca") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append @@ -7470,7 +7470,7 @@ accessibility infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g")))) + "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit v1.2.3 From 2aabc647f2691cc10f93456b3379d57ac669204f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:00:08 -0400 Subject: gnu: gnome-shell-extensions: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 62c7937360..101c5c009a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6882,7 +6882,7 @@ GNOME Shell appearance and extension, etc.") (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6890,7 +6890,7 @@ GNOME Shell appearance and extension, etc.") name "-" version ".tar.xz")) (sha256 (base32 - "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9")))) + "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dextension_set=all"))) -- cgit v1.2.3 From 496d7ccd4d65599020f77d97c8930eecf597e26b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:03:08 -0400 Subject: gnu: gnome-calendar: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 101c5c009a..d1b8cdce58 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6693,7 +6693,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6701,7 +6701,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") name "-" version ".tar.xz")) (sha256 (base32 - "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw")))) + "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 757f863bd28cc4dd21372f7e087757bd25601d3c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:05:23 -0400 Subject: gnu: gnome-clocks: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-clocks): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d1b8cdce58..c7f0046109 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6655,7 +6655,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") (define-public gnome-clocks (package (name "gnome-clocks") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6663,7 +6663,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") name "-" version ".tar.xz")) (sha256 (base32 - "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl")))) + "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From bc09c416317f08f8ef388ddee89f2ea38736960f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:06:47 -0400 Subject: gnu: dconf-editor: Update to 3.30.2. * gnu/packages/gnome.scm (dconf-editor): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7f0046109..f242e7181f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6419,7 +6419,7 @@ beautifying border effects.") (define-public dconf-editor (package (name "dconf-editor") - (version "3.28.0") + (version "3.30.2") (source (origin (method url-fetch) @@ -6428,7 +6428,7 @@ beautifying border effects.") name "-" version ".tar.xz")) (sha256 (base32 - "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5")))) + "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. -- cgit v1.2.3 From 794ce8eaf72537d05a3ca460b9c189e96e683001 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:09:33 -0400 Subject: gnu: libgweather: Update to 3.28.3. * gnu/packages/gnome.scm (libgweather): Update to 3.28.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f242e7181f..ae5b85d9d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3197,7 +3197,7 @@ service via the system message bus.") (define-public libgweather (package (name "libgweather") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3205,7 +3205,7 @@ service via the system message bus.") name "-" version ".tar.xz")) (sha256 (base32 - "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708")))) + "1xz60h59zgyk61y2wwzm0xlqav72i668g7v0x7rh9idz240hxls5")))) (build-system meson-build-system) (arguments `(#:tests? #f ; one of two tests requires network access -- cgit v1.2.3 From d08482f03fb8abb529b36dfdae8e53d326b8002f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:43:57 +0200 Subject: gnu: python-hamcrest: Update to 1.9.0-0.25fdc5f. * gnu/packages/check.scm (python-pyhamcrest): Update to 1.9.0-0.25fdc5f. [arguments]: Replace CHECK phase with custom Pytest invokation. --- gnu/packages/check.scm | 64 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 901ee2cacb..67ea968e43 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2124,33 +2124,45 @@ retried.") (package-with-python2 python-flaky)) (define-public python-pyhamcrest - (package - (name "python-pyhamcrest") - (version "1.9.0") - (source (origin - ;; Tests not distributed from pypi release. - (method git-fetch) - (uri (git-reference - (url "https://github.com/hamcrest/PyHamcrest") - (commit (string-append "V" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01qnzj9qnzz0y78qa3ing24ssvszb0adw59xc4qqmdn5wryy606b")))) - (native-inputs ; All native inputs are for tests - `(("python-pytest-cov" ,python-pytest-cov) - ("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) - ("python-hypothesis" ,python-hypothesis))) - (propagated-inputs - `(("python-six" ,python-six))) - (build-system python-build-system) - (home-page "http://hamcrest.org/") - (synopsis "Hamcrest matchers for Python") - (description - "PyHamcrest is a framework for writing matcher objects, + ;; The latest release was in 2016 and its test suite does not work with recent + ;; versions of Pytest. Just take the master branch for now, which seems stable. + (let ((commit "25fdc5f00bdf3084335353bc9247253098ec4cf2") + (revision "0")) + (package + (name "python-pyhamcrest") + (version (git-version "1.9.0" revision commit)) + (source (origin + ;; Tests not distributed from pypi release. + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamcrest/PyHamcrest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1miqmhhi68vaix8sqc1lvpvbm27bacffxh5anm5cbfsvk7g9n6f3")))) + (native-inputs ;all native inputs are for tests + `(("python-pytest-cov" ,python-pytest-cov) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-hypothesis" ,python-hypothesis))) + (propagated-inputs + `(("python-six" ,python-six))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append "build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) + (home-page "http://hamcrest.org/") + (synopsis "Hamcrest matchers for Python") + (description + "PyHamcrest is a framework for writing matcher objects, allowing you to declaratively define \"match\" rules.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python2-pyhamcrest (package-with-python2 python-pyhamcrest)) -- cgit v1.2.3 From c1cb85bf765e71aef674a132df644f4edf06a8e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:51:16 +0200 Subject: gnu: gRPC: Re-add custom c-ares variant. Commit e8393ebe46d9ad09aceb152618db490378ba5ded updated c-ares without knowing that cmake-build-system was the most important feature of 'c-ares-next'. * gnu/packages/adns.scm (c-ares/cmake): New hidden package. * gnu/packages/machine-learning.scm (grpc)[inputs]: Change C-ARES to C-ARES/CMAKE. --- gnu/packages/adns.scm | 15 +++++++++++++++ gnu/packages/machine-learning.scm | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index f6df825e7c..541612d41a 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2015, 2016, 2018 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,3 +83,17 @@ queries without blocking, or need to perform multiple DNS queries in parallel. The primary examples of such applications are servers which communicate with multiple clients and programs with graphical user interfaces.") (license (x11-style "https://c-ares.haxx.se/license.html")))) + +;; gRPC requires a c-ares built with CMake in order to get the .cmake modules. +;; We can not build c-ares itself with CMake because that would introduce a +;; circular dependency through nghttp2. +;; XXX: It would be nice if we could extract the modules somehow and make them +;; work with the "normal" c-ares package instead of building a whole new library. +(define-public c-ares/cmake + (hidden-package + (package + (inherit c-ares) + (build-system cmake-build-system) + (arguments + `(;; XXX: Tests require name resolution (the normal variant runs no tests). + #:tests? #f))))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index fc527363c0..ace52b4c9d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1292,7 +1292,7 @@ Python.") "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package"))) (inputs - `(("c-ares" ,c-ares) + `(("c-ares" ,c-ares/cmake) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From b5b56b7f27dc902721ce23dfcbbbf777026186e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:56:15 +0200 Subject: gnu: python-gevent: Fix build with libev 4.25 and GCC 7. * gnu/packages/python-xyz.scm (python-gevent)[arguments]: Simplify libev unbundling, which failed with the newer libev. Use C_INCLUDE_PATH instead of CPATH. [native-inputs]: Remove (PACKAGE-SOURCE LIBEV). --- gnu/packages/python-xyz.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac43ef9057..e58acc3578 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9823,13 +9823,6 @@ graphviz.") (guix build utils) (guix build python-build-system)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-libev - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "deps/libev") - ;; FIXME: gevent requires building libev, even though - ;; it only links against the proper one. - (invoke "tar" "-xf" (assoc-ref inputs "libev-source") - "--strip-components=1" "-C" "deps/libev"))) (add-before 'patch-source-shebangs 'patch-hard-coded-paths (lambda _ (substitute* "src/gevent/subprocess.py" @@ -9847,6 +9840,11 @@ graphviz.") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") + ;; Prevent building bundled libev. + (substitute* "setup.py" + (("run_make=_BUILDING") + "run_make=False")) + (let ((greenlet (string-append (assoc-ref inputs "python-greenlet") "/include"))) @@ -9854,7 +9852,7 @@ graphviz.") (lambda (item) (string-prefix? "python" item))) ((python) - (setenv "CPATH" + (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python))))) #t)) (add-before 'check 'skip-timer-test @@ -9886,8 +9884,7 @@ graphviz.") `(("python-greenlet" ,python-greenlet) ("python-objgraph" ,python-objgraph))) (native-inputs - `(("libev-source" ,(package-source libev)) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) -- cgit v1.2.3 From 0b58cb427db55ec710d54330191cf9b4ebab3e6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:13:39 +0200 Subject: gnu: python-datrie: Update to 0.8. * gnu/packages/python-xyz.scm (python-datrie): Update to 0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e58acc3578..21f8a916d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5860,23 +5860,15 @@ of the structure, dynamics, and functions of complex networks.") (define-public python-datrie (package (name "python-datrie") - (version "0.7.1") + (version "0.8") (source (origin (method url-fetch) (uri (pypi-uri "datrie" version)) (sha256 (base32 - "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs")))) + "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'cythonize - (lambda _ - ;; Regenerate Cython classes to solve ABI issues with Python - ;; 3.7.0. See . - (invoke "cython" "src/datrie.pyx" "src/cdatrie.pxd" - "src/stdio_ext.pxd" "-a")))))) (native-inputs `(("python-cython" ,python-cython) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From f8e0d93ca3424a3be238b211501cef84a151ec7b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:21:47 +0200 Subject: gnu: salmon: Fix build with GCC 7. * gnu/packages/bioinformatics.scm (salmon)[arguments]: Do not read from CPLUS_INCLUDE_PATH, and add headers to CPATH only. --- gnu/packages/bioinformatics.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0dcbb94666..1372bb411a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11874,14 +11874,11 @@ The following file formats are supported: (("lib/libdivsufsort.a") "/lib/libdivsufsort.so")) ;; Ensure that all headers can be found - (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") + (setenv "CPATH" + (string-append (getenv "CPATH") ":" (assoc-ref inputs "eigen") "/include/eigen3")) - (setenv "CPATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) #t)) ;; CMAKE_INSTALL_PREFIX does not exist when the tests are ;; run. It only exists after the install phase. -- cgit v1.2.3 From 2ec3df7019073a2825e2a105acb6ac6a111c2db7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:44:01 +0200 Subject: gnu: lua-libmpack: Do not use unstable source tarball. * gnu/packages/serialization.scm (lua-libmpack)[source]: Change to GIT-FETCH. --- gnu/packages/serialization.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 505c196abd..2d50756806 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -169,13 +169,14 @@ that implements both the msgpack and msgpack-rpc specifications.") (package (inherit libmpack) (name "lua-libmpack") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libmpack/libmpack-lua/" - "archive/" (package-version libmpack) ".tar.gz")) - (file-name (string-append name "-" (package-version libmpack) ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libmpack/libmpack-lua") + (commit (package-version libmpack)))) + (file-name (git-file-name name (package-version libmpack))) (sha256 (base32 - "153zrrbyxhf71dgzjjhrk56rfwk3nisslpgcqyg44v8fnz1xpk6i")))) + "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3 From adad147b4b178665606c3995d4b0d3fef0765037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:45:36 +0200 Subject: gnu: lua-libmpack: Update to 1.0.8. * gnu/packages/serialization.scm (lua-libmpack): Update to 1.0.8. --- gnu/packages/serialization.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2d50756806..0f4cc554a8 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -168,15 +168,16 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public lua-libmpack (package (inherit libmpack) (name "lua-libmpack") + (version "1.0.8") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/libmpack/libmpack-lua") - (commit (package-version libmpack)))) - (file-name (git-file-name name (package-version libmpack))) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) + "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3 From cdc07e6854f26f7034f424822f681f2fb578247d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:51:17 +0200 Subject: gnu: msgpack: Update to 3.2.0. * gnu/packages/serialization.scm (msgpack): Update to 3.2.0. [build-system]: Change to CMAKE-BUILD-SYSTEM. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/serialization.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0f4cc554a8..2847886d61 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 David Craven -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2019 Marius Bakke ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017 Gregor Giesen @@ -101,7 +101,7 @@ such as compact binary encodings, XML, or JSON.") (define-public msgpack (package (name "msgpack") - (version "1.4.2") + (version "3.2.0") (source (origin (method url-fetch) @@ -117,13 +117,10 @@ such as compact binary encodings, XML, or JSON.") #t)) (sha256 (base32 - "18hzmyfg3mvnp7ab03nqdzzvqagkl42gygjpi4zv4i7aca2dmwf0")))) - (build-system gnu-build-system) + "1zhsap7d9zqdm9h1qnpaw78v1sh3rx2if7gk4dszs5m3cg1jiapv")))) + (build-system cmake-build-system) (native-inputs `(("googletest" ,googletest) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (propagated-inputs `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, -- cgit v1.2.3 From 5ba856aba340d85744cedcfeeb34319cb778de11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 19:46:40 +0200 Subject: gnu: Adjust CPATH overrides to work with GCC 7 search paths. * gnu/packages/education.scm (gcompris)[arguments]: Preserve original CPATH, if any. * gnu/packages/games.scm (ltris, prboom-plus, abbaye, red-eclipse, btanks, 4dtris, edgar)[arguments]: Likewise. --- gnu/packages/education.scm | 3 ++- gnu/packages/games.scm | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f3d8907583..493a97fdf8 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -83,7 +83,8 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-mixer") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("gtk+" ,gtk+-2) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6e54abc5d0..9ada6438e1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -906,7 +906,8 @@ Chess). It is similar to standard chess but this variant is far more complicate (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-mixer))))) @@ -1118,7 +1119,8 @@ Every puzzle has a complete solution, although there may be more than one.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("fluidsynth" ,fluidsynth) @@ -1350,7 +1352,8 @@ can be explored and changed freely.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")))) + "/include/SDL:" + (or (getenv "CPATH") ""))))) (add-after 'patch-source-shebangs 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) ;; Replace /usr with package output directory. @@ -2992,7 +2995,8 @@ http://lavachat.symlynx.com/unix/") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) + "/include/SDL2:" + (or (getenv "CPATH") ""))) #t)) (add-after 'install 'copy-data (lambda* (#:key outputs #:allow-other-keys) @@ -6398,7 +6402,8 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t)) (add-after 'unpack 'fix-compilation-errors (lambda _ @@ -6517,7 +6522,8 @@ affected by the gravity of the planets.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("fontconfig" ,fontconfig) @@ -6636,7 +6642,8 @@ the desired spell.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl2-union") - "/include/SDL2")) + "/include/SDL2:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) -- cgit v1.2.3 From e6e09dc9c53df38e48be331a5f930ef6d52454f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 20:09:51 +0200 Subject: gnu: sooperlooper: Adjust for GCC 7. * gnu/packages/music.scm (sooperlooper)[arguments]: Remove <#:make-flags>. Preserve CPATH in <#:phases>. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a2c2e01661..9119817056 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2942,8 +2942,7 @@ with a number of bugfixes and changes to improve IT playback.") (patches (search-patches "sooperlooper-build-with-wx-30.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CXXFLAGS=-std=gnu++11") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'add-sigc++-includes (lambda* (#:key inputs #:allow-other-keys) @@ -2955,7 +2954,8 @@ with a number of bugfixes and changes to improve IT playback.") sig "/lib/sigc++-2.0/include:" xml "/include/libxml2/:" cwd "/libs/pbd:" - cwd "/libs/midi++"))) + cwd "/libs/midi++:" + (or (getenv "CPATH") "")))) (substitute* '("src/control_osc.hpp" "src/gui/app_frame.hpp" "src/gui/config_panel.hpp" -- cgit v1.2.3 From 4b70b776e5b397fc5c15f628561a332e29d1584e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 21:18:01 +0200 Subject: gnu: libnsl: Fix build with gettext 0.20. * gnu/packages/onc-rpc.scm (libnsl)[arguments]: New field. --- gnu/packages/onc-rpc.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index d3149a4629..553553e2c2 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -137,6 +137,14 @@ from the protocol files.") (base32 "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'bootstrap 'gettextize + (lambda _ + ;; Regenerate the bundled Makefile.in.in to avoid a + ;; "gettext infrastructure mismatch" because the + ;; existing version was generated by an older gettext. + (invoke "gettextize" "-f")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 464a29d3d74e7d2f27042db6ab166bfdbe1f992e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 21:19:35 +0200 Subject: gnu: libnsl: Do not build 'libnsl.a'. * gnu/packages/onc-rpc.scm (libnsl)[arguments]: Add <#:configure-flags>. --- gnu/packages/onc-rpc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 553553e2c2..7e424dd185 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -138,7 +138,8 @@ from the protocol files.") "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'gettextize (lambda _ ;; Regenerate the bundled Makefile.in.in to avoid a -- cgit v1.2.3 From d619686250d8bb15bf67031f8ac80f9cfb400a26 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 14 Jul 2019 23:47:44 -0400 Subject: gnu: evolution-data-server: Fix locale handling. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Add a phase that patches the source code to fix a locale handling issue. --- gnu/packages/gnome.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae5b85d9d0..f42b5064c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5211,6 +5211,22 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) + ;; This phase fixes locale canonicalization when using newer + ;; versions of ICU. The bug has been fixed upstream, and + ;; should appear starting in version 3.33.5. + ;; . + (add-after 'unpack 'patch-locale-canonicalization + (lambda _ + (substitute* "src/libedataserver/e-collator.c" + (("len = uloc_canonicalize \\(posix_locale,.*" x) + ((lambda (xs) (string-join xs "\n" 'suffix)) + (list + "if (posix_locale && (" + " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" + " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" + " posix_locale = \"en_US_POSIX\";" + x)))) + #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" -- cgit v1.2.3 From 86b995dcce534363ef56ae4335e402f77740ae24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 17:11:03 +0200 Subject: gnu: Qt@4: Build with GCC 5 and OpenSSL 1.0. * gnu/packages/qt.scm (qt-4)[inputs]: Replace OPENSSL with OPENSSL-1.0. [native-inputs]: Add GCC-5. --- gnu/packages/qt.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index afc4d8dc06..e5fc40b351 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) @@ -423,11 +425,16 @@ system, and the core design of Django is reused in Grantlee.") (inputs `(,@(fold alist-delete (package-inputs qt) - '("harfbuzz" "libjpeg")) + '("harfbuzz" "libjpeg" "openssl")) ("libjpeg" ,libjpeg-8) - ("libsm" ,libsm))) + ("libsm" ,libsm) + ("openssl" ,openssl-1.0))) (native-inputs - `(,@(fold alist-delete + `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. + ;; We could build it with -std=gnu++98, but then we'll get in trouble with + ;; ICU later. Just keep using GCC 5 for now. + ("gcc" ,gcc-5) + ,@(fold alist-delete (package-native-inputs qt) '("vulkan-headers")))) -- cgit v1.2.3 From 5229bea128bc225583198d76678d758eafb83023 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 09:52:22 -0400 Subject: gnu: evolution: Update to 3.30.5. * gnu/packages/gnome.scm (evolution): Update to 3.30.5. [arguments]: Add "patch-ui-module-dir", "glib-or-gtk-compile-schemas" and "glib-or-gtk-wrap" phases. --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f42b5064c9..3b5deb2a82 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8016,7 +8016,7 @@ generic enough to work for everyone.") (define-public evolution (package (name "evolution") - (version "3.28.1") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evolution/" @@ -8024,13 +8024,34 @@ generic enough to work for everyone.") "evolution-" version ".tar.xz")) (sha256 (base32 - "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) + "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged - "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release + "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release ; in four years and cannot be built. + #:phases + (modify-phases %standard-phases + ;; The build system attempts to install user interface modules to the + ;; output directory of the "evolution-data-server" package. This + ;; change redirects that change. + (add-after 'unpack 'patch-ui-module-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/modules/alarm-notify/CMakeLists.txt" + (("\\$\\{edsuimoduledir\\}") + (string-append (assoc-ref outputs "out") + "/lib/evolution-data-server/ui-modules"))) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 68c3ca933d1621586b9e73944b194e5304130198 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 08:33:25 -0400 Subject: gnu: evolution-data-server: Update to 3.30.5. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.5. [arguments]: Remove "-std=gnu++11" configure flag. Disable more failing tests. --- gnu/packages/gnome.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b5deb2a82..b0bbc12cdf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5155,7 +5155,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.30.2") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5163,7 +5163,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") name "-" version ".tar.xz")) (sha256 (base32 - "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) + "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5177,13 +5177,11 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove - ;; "-std=gnu++11" when our default compiler is >= GCC6. ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until ;; evolution-data-server has been updated to qualify ICU types ;; explicitly, as required by ICU 61 and later. See: ;; - "-DCMAKE_CXX_FLAGS=-std=gnu++11 -DU_USING_ICU_NAMESPACE=1" + "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 3d0b40ad7c369534f7f4c0c148b5b3b3ddc73542 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 19:09:15 +0200 Subject: gnu: evolution-data-server: Remove obsolete workaround. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Do not pass "-DU_USING_ICU_NAMESPACE" in <#:configure-flags>. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0bbc12cdf..dc36d052c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5177,11 +5177,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until - ;; evolution-data-server has been updated to qualify ICU types - ;; explicitly, as required by ICU 61 and later. See: - ;; - "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 3549e23b25303d46f4725628a50c2a302d5e59f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 20:10:17 +0200 Subject: gnu: nanopolish: Fix build with GCC 7. * gnu/packages/bioinformatics.scm (nanopolish)[arguments]: Preserve the existing CPATH variable, if any. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1372bb411a..313ffa11ae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14072,7 +14072,8 @@ choosing which reads pass the filter.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) + "/include/eigen3:" + (or (getenv "CPATH") ""))) #t)) (delete 'configure) (replace 'install -- cgit v1.2.3 From 7f080fb97c28fd94da1efaaa8fec8b5b830c328d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 23:17:21 +0200 Subject: gnu: ceph: Fix build with recent CMake. * gnu/packages/storage.scm (ceph)[arguments]: Drop "-DENABLE_SHARED" from <#:configure-flags> in favor of "-DBUILD_SHARED_LIBS". Add phase to remove installed test executables. --- gnu/packages/storage.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 4f3fa05aa7..5c702e3362 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; ;;; This file is part of GNU Guix. @@ -108,7 +108,7 @@ (string-append "-DXFS_INCLUDE_DIR=" (assoc-ref %build-inputs "xfsprogs") "/include") "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" - "-DENABLE_SHARED=ON" + "-DBUILD_SHARED_LIBS=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_PYTHON3=ON" @@ -279,6 +279,17 @@ (wrap-program (string-append out "/bin/" executable) `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) scripts) + #t))) + (add-before 'validate-runpath 'remove-test-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; FIXME: The BUILD_SHARED_LIBS CMake flag causes the test executables + ;; to link the bundled googletest dynamically, which in turn causes + ;; RUNPATH validation failures because 'libgtest.so' and friends do + ;; not get absolute RUNPATH entries. The next version of Ceph can use + ;; an external googletest; for now just remove the test executables. + (for-each delete-file (find-files (string-append out "/bin") + "ceph_(test|perf)")) #t)))))) (outputs '("out" "lib")) -- cgit v1.2.3 From 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jul 2019 15:12:50 +0200 Subject: gnu: multipath-tools: Treat libaio headers as system headers. * gnu/packages/linux.scm (multipath-tools)[arguments]: Set C_INCLUDE_PATH in <#:make-flags>. --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4ccf613a9b..22f001d040 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3271,6 +3271,12 @@ arrays when needed.") (string-append "DESTDIR=" (assoc-ref %outputs "out")) "SYSTEMDPATH=lib" + ;; Add the libaio headers to GCCs system header + ;; search path to suppress -Werror=cast-qual on + ;; the included headers. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "libaio") + "/include") (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 0de9a1be04a2f93bcdf81bdb0f6c2dca12225974 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Jul 2019 15:58:34 +0200 Subject: gnu: gnome-control-center: Shorten patch file name. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: Rename to... * gnu/packages/patches/gnome-control-center-udisks.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (gnome-control-center)[source]: Likewise. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 3 +- .../patches/gnome-control-center-udisks.patch | 221 +++++++++++++++++++++ ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 --------------------- 4 files changed, 223 insertions(+), 224 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-udisks.patch delete mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c41836ad3c..49c3826685 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,7 +889,7 @@ dist_patch_DATA = \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ - %D%/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch \ + %D%/packages/patches/gnome-control-center-udisks.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 46dd268f8f..beaba3b4c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5941,8 +5941,7 @@ devices using the GNOME desktop.") (base32 "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) (patches - (search-patches - "gnome-control-center-use-udisks-to-get-disk-size.patch")))) + (search-patches "gnome-control-center-udisks.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-control-center-udisks.patch b/gnu/packages/patches/gnome-control-center-udisks.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-udisks.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch deleted file mode 100644 index 823684b2e9..0000000000 --- a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch +++ /dev/null @@ -1,221 +0,0 @@ -This patch is derived from upstream commit 2520aea6 and fixes upstream issues -285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. - -diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 ---- a/panels/info/cc-info-overview-panel.c -+++ b/panels/info/cc-info-overview-panel.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #include - -@@ -81,9 +82,7 @@ typedef struct - - GCancellable *cancellable; - -- /* Free space */ -- GList *primary_mounts; -- guint64 total_bytes; -+ UDisksClient *client; - - GraphicsData *graphics_data; - } CcInfoOverviewPanelPrivate; -@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel - CcInfoOverviewPanelPrivate *priv; - }; - --static void get_primary_disc_info_start (CcInfoOverviewPanel *self); -- - typedef struct - { - char *major; -@@ -486,111 +483,51 @@ get_os_type (void) - } - - static void --query_done (GFile *file, -- GAsyncResult *res, -- CcInfoOverviewPanel *self) -+get_primary_disc_info (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv; -- g_autoptr(GFileInfo) info = NULL; -- g_autoptr(GError) error = NULL; -- -- info = g_file_query_filesystem_info_finish (file, res, &error); -- if (info != NULL) -- { -- priv = cc_info_overview_panel_get_instance_private (self); -- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); -- } -- else -- { -- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -- return; -- else -- { -- g_autofree char *path = NULL; -- path = g_file_get_path (file); -- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); -- } -- } -+ GDBusObjectManager *manager; -+ g_autolist(GDBusObject) objects = NULL; -+ GList *l; -+ guint64 total_size; - -- /* And onto the next element */ -- get_primary_disc_info_start (self); --} -- --static void --get_primary_disc_info_start (CcInfoOverviewPanel *self) --{ -- GUnixMountEntry *mount; -- g_autoptr(GFile) file = NULL; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ priv = cc_info_overview_panel_get_instance_private (self); -+ total_size = 0; - -- if (priv->primary_mounts == NULL) -+ if (!priv->client) - { -- g_autofree char *size = NULL; -- -- size = g_format_size (priv->total_bytes); -- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -- -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); - return; - } - -- mount = priv->primary_mounts->data; -- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); -- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); -- g_unix_mount_free (mount); -- -- g_file_query_filesystem_info_async (file, -- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, -- 0, -- priv->cancellable, -- (GAsyncReadyCallback) query_done, -- self); --} -- --static void --get_primary_disc_info (CcInfoOverviewPanel *self) --{ -- GList *points; -- GList *p; -- GHashTable *hash; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -- -- hash = g_hash_table_new (g_str_hash, g_str_equal); -- points = g_unix_mount_points_get (NULL); -- -- /* If we do not have /etc/fstab around, try /etc/mtab */ -- if (points == NULL) -- points = g_unix_mounts_get (NULL); -+ manager = udisks_client_get_object_manager (priv->client); -+ objects = g_dbus_object_manager_get_objects (manager); - -- for (p = points; p != NULL; p = p->next) -+ for (l = objects; l != NULL; l = l->next) - { -- GUnixMountEntry *mount = p->data; -- const char *mount_path; -- const char *device_path; -- -- mount_path = g_unix_mount_get_mount_path (mount); -- device_path = g_unix_mount_get_device_path (mount); -- -- /* Do not count multiple mounts with same device_path, because it is -- * probably something like btrfs subvolume. Use only the first one in -- * order to count the real size. */ -- if (gsd_should_ignore_unix_mount (mount) || -- gsd_is_removable_mount (mount) || -- g_str_has_prefix (mount_path, "/media/") || -- g_str_has_prefix (mount_path, g_get_home_dir ()) || -- g_hash_table_lookup (hash, device_path) != NULL) -+ UDisksDrive *drive; -+ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); -+ -+ /* Skip removable devices */ -+ if (drive == NULL || -+ udisks_drive_get_removable (drive) || -+ udisks_drive_get_ejectable (drive)) - { -- g_unix_mount_free (mount); - continue; - } - -- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); -- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); -+ total_size += udisks_drive_get_size (drive); - } -- g_list_free (points); -- g_hash_table_destroy (hash); - -- priv->cancellable = g_cancellable_new (); -- get_primary_disc_info_start (self); -+ if (total_size > 0) -+ { -+ g_autofree gchar *size = g_format_size (total_size); -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -+ } -+ else -+ { -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); -+ } - } - - static char * -@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) - g_clear_object (&priv->cancellable); - } - -- if (priv->primary_mounts) -- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); -+ g_clear_object (&priv->client); - - g_free (priv->gnome_version); - g_free (priv->gnome_date); -@@ -895,6 +831,7 @@ static void - cc_info_overview_panel_init (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ g_autoptr(GError) error = NULL; - - gtk_widget_init_template (GTK_WIDGET (self)); - -@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) - else - gtk_widget_destroy (priv->updates_button); - -+ priv->client = udisks_client_new_sync (NULL, &error); -+ -+ if (error != NULL) -+ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", -+ error->message); -+ - info_overview_panel_setup_overview (self); - info_overview_panel_setup_virt (self); - } -diff --git a/panels/info/meson.build b/panels/info/meson.build -index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 ---- a/panels/info/meson.build -+++ b/panels/info/meson.build -@@ -61,6 +61,7 @@ sources += gnome.compile_resources( - - deps = common_deps + [ - polkit_gobject_dep, -+ dependency('udisks2', version: '>= 2.1.8'), - dependency('libgtop-2.0') - ] - -- cgit v1.2.3 From 995c30d0d65c1ad8c98897a7b0ff08740dbed38f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 16:31:14 +0200 Subject: gnu: libmp4v2: Fix build with C++11. * gnu/packages/patches/libmp4v2-c++11.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (libmp4v2)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/libmp4v2-c++11.patch | 14 ++++++++++++++ gnu/packages/video.scm | 1 + 3 files changed, 16 insertions(+) create mode 100644 gnu/packages/patches/libmp4v2-c++11.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 49c3826685..e97ff507e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1023,6 +1023,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-boost.patch \ diff --git a/gnu/packages/patches/libmp4v2-c++11.patch b/gnu/packages/patches/libmp4v2-c++11.patch new file mode 100644 index 0000000000..e12f89bd84 --- /dev/null +++ b/gnu/packages/patches/libmp4v2-c++11.patch @@ -0,0 +1,14 @@ +Avoid a type mismatch that shows up in C++11. +Taken from . + +--- a/src/rtphint.cpp 2012-05-20 16:11:53.000000000 -0600 ++++ b/src/rtphint.cpp 2017-05-16 10:25:26.930705191 -0600 +@@ -339,7 +339,7 @@ + pSlash = strchr(pSlash, '/'); + if (pSlash != NULL) { + pSlash++; +- if (pSlash != '\0') { ++ if (*pSlash != '\0') { + length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); + *ppEncodingParams = (char *)MP4Calloc(length + 1); + strncpy(*ppEncodingParams, pSlash, length); diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 995f7fab15..5fa9070ba7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2746,6 +2746,7 @@ of modern, widely supported codecs.") "code-archive-downloads/v2/" "code.google.com/mp4v2/mp4v2-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2")) + (patches (search-patches "libmp4v2-c++11.patch")) (sha256 (base32 "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683")))) -- cgit v1.2.3 From 4788c1ae17feda6a9a6e6897e499fcc1cc49fc73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 16:47:11 +0200 Subject: gnu: innoextract: Fix build with Boost 1.70 and GCC 7. * gnu/packages/compression.scm (innoextract)[arguments]: Add <#:configure-flags> and <#:phases>. --- gnu/packages/compression.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1321791841..11cc00d19c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau -;;; Copyright © 2016, 2018 Marius Bakke +;;; Copyright © 2016, 2018, 2019 Marius Bakke ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis @@ -1793,7 +1793,21 @@ single-member files which can't be decompressed in parallel.") (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ;; No tests available. + `(#:tests? #f + ;; XXX: Work around a problem with the CMake support in Boost 1.70: + ;; . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") + #:phases (modify-phases %standard-phases + (add-before 'configure 'glibc-is-already-a-system-library + (lambda _ + ;; Prevent the build system from passing the glibc + ;; header files to GCC as "system headers", because + ;; it conflicts with the system headers already known + ;; to GCC, causing #include_next failures. + (substitute* "CMakeLists.txt" + (("include_directories\\(SYSTEM \\$\\{iconv") + "include_directories(${iconv")) + #t))))) (inputs `(("boost" ,boost) ("libiconv" ,libiconv) ("xz" ,xz))) -- cgit v1.2.3 From 308af63460c37e0d2a58f78aa9118404de3d54ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 18:28:19 +0200 Subject: gnu: libvirt: Provide ''. * gnu/packages/virtualization.scm (libvirt)[inputs]: Add LIBTIRPC. [arguments]: Add phase 'patch-libtirpc-file-names'. --- gnu/packages/virtualization.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0a61e4403e..da971a8805 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -423,6 +424,15 @@ manage system or application containers.") (substitute* "config.h.in" (("/bin/sh") (which "sh"))) #t)) + (add-before 'configure 'patch-libtirpc-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libvirt uses an m4 macro instead of pkg-config to determine where + ;; the RPC headers are located. Tell it to look in the right place. + (substitute* "configure" + (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc"))) + #t)) (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly @@ -459,8 +469,9 @@ manage system or application containers.") ("qemu" ,qemu) ("libpcap" ,libpcap) ("libnl" ,libnl) + ("libtirpc" ,libtirpc) ;for ("libuuid" ,util-linux) - ("lvm2" ,lvm2) ; for libdevmapper + ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 25e491691b83a54552bb22113b951cf9fad18704 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 18:48:31 +0200 Subject: gnu: openal: Build with GCC 9. * gnu/packages/audio.scm (openal)[native-inputs]: Add GCC-9. --- gnu/packages/audio.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index db7076b003..6a006b2a24 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -1996,6 +1997,13 @@ lv2-c++-tools.") "/lib/libasound.so.2" "\")"))) #t))))) + (native-inputs + `(;; FIXME: On i686-linux, GCC 7 hits an internal compiler error + ;; upon building utils/makehrtf.c:3281: + ;; "internal compiler error: in gen_rtx_SUBREG, at emit-rtl.c:908" + ;; https://ci.guix.gnu.org/log/r2fjx9m75m9rifg2yjbnn853wqy2547n-openal-1.19.1 + ;; Remove this when the default compiler is GCC 9 or later. + ("gcc" ,gcc-9))) (inputs `(("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) -- cgit v1.2.3 From 4b42b1067468dd7e5f3a5e11d64f16895bb16a25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:11:51 +0200 Subject: gnu: openimageio: Fix build with Boost 1.70 and CMake 3.14. * gnu/packages/graphics.scm (openimageio)[arguments]: Add <#:configure-flags>. --- gnu/packages/graphics.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 94a797c8f5..2d9becc3ec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -468,7 +468,11 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL - (arguments `(#:tests? #f)) + (arguments + `(#:tests? #f + ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14. See + ;; for details. + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 5d1f5b305f0ddefb3d381fe320de338966e1b8a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:23:08 +0200 Subject: gnu: zeromq: Update to 4.3.2. * gnu/packages/networking.scm (zeromq): Update to 4.3.2. [source](uri): Adjust accordingly. --- gnu/packages/networking.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d5b266db2..c58e3bcd83 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -273,14 +273,14 @@ transparently check connection attempts against an access control list.") (define-public zeromq (package (name "zeromq") - (version "4.0.7") + (version "4.3.2") (source (origin (method url-fetch) - (uri (string-append "http://download.zeromq.org/zeromq-" - version ".tar.gz")) + (uri (string-append "https://github.com/zeromq/libzmq/releases" + "/download/v" version "/zeromq-" version ".tar.gz")) (sha256 (base32 - "00vvwhgcdr1lva2pavicvy92iad0hj8cf71n702hv6blw1kjj2z0")))) + "0qzp80ky4y2k7k1ya09v9gkivvfbz2km813snrb8jhnn634bbmzb")))) (build-system gnu-build-system) (home-page "http://zeromq.org") (synopsis "Library for message-based applications") -- cgit v1.2.3 From e77947db06339a38979d9ef838ca9ed00d527db2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:25:41 +0200 Subject: gnu: openmw: Add Boost workaround. * gnu/packages/game-development.scm (openmw)[arguments]: Set "-DBoost_NO_BOOST_CMAKE=ON" in <#:configure-flags>. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7eac935a69..5a4b81a988 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1116,7 +1116,8 @@ of use.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DDESIRED_QT_VERSION=5"))) + (list "-DDESIRED_QT_VERSION=5" + "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around (native-inputs `(("boost" ,boost) ("doxygen" ,doxygen) -- cgit v1.2.3 From 40a7153d198821c4111d5bb864f872d2df108013 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 23:15:50 +0200 Subject: gnu: python-flake8-polyfill: Adjust tests for Pytest 4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[arguments]: Add substitution in setup.cfg. --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a7a21da5d..e2ef589acf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6541,6 +6541,12 @@ complexity of Python source code.") (modify-phases %standard-phases (replace 'check (lambda _ + ;; Be compatible with Pytest 4: + ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 + (substitute* "setup.cfg" + (("\\[pytest\\]") + "[tool:pytest]")) + (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) -- cgit v1.2.3 From bc2076f053d66b8293db800710bc72a7f5617396 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 23:29:07 +0200 Subject: gnu: bpp: Use the default GCC. * gnu/packages/bioinformatics.scm (bpp-core, bpp-phyl, bpp-popgen, bpp-seq, bppsuite)[inputs]: Remove GCC-5. --- gnu/packages/bioinformatics.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bfac90ecf7..e25a4e1d60 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1109,9 +1109,6 @@ relying on a complex dependency tree.") (build-system cmake-build-system) (arguments `(#:parallel-build? #f)) - (inputs - `(("gcc" ,gcc-5))) ; Compilation of bpp-phyl fails with GCC 4.9 so we - ; compile all of the bpp packages with GCC 5. (home-page "http://biopp.univ-montp2.fr") (synopsis "C++ libraries for Bioinformatics") (description @@ -1147,10 +1144,7 @@ providing them a set of re-usable tools.") #:out-of-source? #f)) (inputs `(("bpp-core" ,bpp-core) - ("bpp-seq" ,bpp-seq) - ;; GCC 4.8 fails due to an 'internal compiler error', so we use a more - ;; modern GCC. - ("gcc" ,gcc-5))) + ("bpp-seq" ,bpp-seq))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ phylogenetic Library") (description @@ -1182,8 +1176,7 @@ library provides phylogenetics-related modules.") #:tests? #f)) ; There are no tests. (inputs `(("bpp-core" ,bpp-core) - ("bpp-seq" ,bpp-seq) - ("gcc" ,gcc-5))) + ("bpp-seq" ,bpp-seq))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ population genetics library") (description @@ -1216,8 +1209,7 @@ library provides population genetics-related modules.") ;; so the tests fail. #:out-of-source? #f)) (inputs - `(("bpp-core" ,bpp-core) - ("gcc" ,gcc-5))) ; Use GCC 5 as per 'bpp-core'. + `(("bpp-core" ,bpp-core))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ sequence library") (description @@ -1255,8 +1247,7 @@ library provides sequence-related modules.") `(("bpp-core" ,bpp-core) ("bpp-seq" ,bpp-seq) ("bpp-phyl" ,bpp-phyl) - ("bpp-phyl" ,bpp-popgen) - ("gcc" ,gcc-5))) + ("bpp-phyl" ,bpp-popgen))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bioinformatics tools written with the Bio++ libraries") (description -- cgit v1.2.3 From 3401526fcf1e3a049797b38412a46ce01b5cf435 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 00:12:14 +0200 Subject: gnu: pidentd: Build against OpenSSL 1.0. * gnu/packages/networking.scm (pidentd)[inputs]: Change OPENSSL to OPENSSL-1.0. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c58e3bcd83..9abbd1196c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1626,7 +1626,7 @@ enabled due to license conflicts between the BSD advertising clause and the GPL. (arguments `(#:tests? #f)) ; No tests are included (inputs - `(("openssl" ,openssl))) ; For the DES library + `(("openssl" ,openssl-1.0))) ;for the DES library (home-page "https://www.lysator.liu.se/~pen/pidentd/") (synopsis "Small Ident Daemon") (description -- cgit v1.2.3 From c498a07e2d5a0dbe3a68cae02355202095146697 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 00:19:42 +0200 Subject: gnu: python-pympler: Update to 0.7. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e2ef589acf..0dc61c1099 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2207,13 +2207,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) + "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 90efc2f28e49595c3c467f3e72dd27812dd7cc54 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:15:31 +0200 Subject: gnu: ovmf: Build with GCC 5. * gnu/packages/firmware.scm (ovmf)[native-inputs]: Add GCC-5. --- gnu/packages/firmware.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8f0b6cb15e..c473ccd920 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -249,6 +249,7 @@ coreboot.") (build-system gnu-build-system) (native-inputs `(("acpica" ,acpica) + ("gcc" ,gcc-5) ("nasm" ,nasm) ("python-2" ,python-2) ("util-linux" ,util-linux))) -- cgit v1.2.3 From 1a58e1d4442cb4ba504fd76b9567da9aef47b1b0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:30:53 +0200 Subject: gnu: john-the-ripper-jumbo: Build against OpenSSL 1.0. * gnu/packages/password-utils.scm (john-the-ripper-jumbo): Change OPENSSL to OPENSSL-1.0. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..8b1bca37e1 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -754,7 +754,7 @@ between hosts and entries in the password store.") ("krb5" ,mit-krb5) ("libpcap" ,libpcap) ("nss" ,nss) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (arguments `(#:configure-flags -- cgit v1.2.3 From 04842543e8231d99aad4c8ec232f41272886fbd1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:40:03 +0200 Subject: gnu: fbreader: Build with GCC 5. * gnu/packages/ebook.scm (fbreader)[native-inputs]: Add GCC-5. --- gnu/packages/ebook.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index cf424f285d..5062515cf0 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) + #:use-module (gnu packages gcc) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) @@ -294,7 +295,8 @@ designed to be used in a generic text renderer.") ("sqlite" ,sqlite) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gcc" ,gcc-5) + ("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ; No tests exist. #:make-flags `("CC=gcc" "TARGET_ARCH=desktop" "UI_TYPE=gtk" -- cgit v1.2.3 From 0fdec2a309bfc9c62b449524e3e71714674bca6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 14:57:06 +0200 Subject: gnu: tensorflow: Provide older setuptools version. * gnu/packages/python-xyz.scm (python-setuptools-for-tensorflow): New public variable. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs]: Add it. --- gnu/packages/machine-learning.scm | 3 +++ gnu/packages/python-xyz.scm | 13 +++++++++++++ 2 files changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ace52b4c9d..e3c69948e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1604,6 +1604,9 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("protobuf:native" ,protobuf-next) ; protoc ("protobuf:src" ,(package-source protobuf-next)) ("eigen:src" ,(package-source eigen-for-tensorflow)) + ;; install_pip_packages.sh wants setuptools 39.1.0 specifically. + ("python-setuptools" ,python-setuptools-for-tensorflow) + ;; The commit hashes and URLs for third-party source code are taken ;; from "tensorflow/workspace.bzl". ("boringssl-src" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 65dffd33bf..6796f1c065 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -713,6 +713,19 @@ Python 3 support.") (define-public python2-setuptools (package-with-python2 python-setuptools)) +;; The setuptools provided by Python 3.7.4 is too new for Tensorflow. +(define-public python-setuptools-for-tensorflow + (hidden-package + (package + (inherit python-setuptools) + (version "39.1.0") + (source (origin + (inherit (package-source python-setuptools)) + (uri (pypi-uri "setuptools" version ".zip")) + (sha256 + (base32 + "1mzdhvfhnv4lggxa8rjl0dzqxvfx377gg5sqs57v89wrp09lwj65"))))))) + (define-public python-uniseg (package (name "python-uniseg") -- cgit v1.2.3 From f02ab17b4a664b21294f75cb6d8ef62a022565ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:00:03 +0200 Subject: gnu: czmq: Update to 4.2.0. * gnu/packages/networking.scm (czmq): Update to 4.2.0. [arguments]: Enable tests, but patch out the non-working one. --- gnu/packages/networking.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9abbd1196c..a51497c206 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -296,7 +296,7 @@ more.") (define-public czmq (package (name "czmq") - (version "4.1.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append @@ -305,21 +305,19 @@ more.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh")))) + "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg")))) (build-system gnu-build-system) (arguments - '(;; TODO Tests fail for some reason: - ;; * zauth: OK - ;; * zbeacon: OK (skipping test, no UDP broadcasting) - ;; E: (czmq_selftest) 18-02-24 16:25:52 No broadcast interface found, (ZSYS_INTERFACE=lo) - ;; make[2]: *** [Makefile:2245: check-local] Segmentation fault - ;; make[2]: Leaving directory '/tmp/guix-build-czmq-4.1.0.drv-0/czmq-4.1.0' - ;; make[1]: *** [Makefile:2032: check-am] Error 2 - ;; make[1]: Leaving directory '/tmp/guix-build-czmq-4.1.0.drv-0/czmq-4.1.0' - ;; make: *** [Makefile:1588: check-recursive] Error 1 - ;; phase `check' failed after 19.4 seconds - #:tests? #f - #:configure-flags '("--enable-drafts"))) + '(#:configure-flags '("--enable-drafts") + #:phases (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda _ + ;; XXX FIXME: Disable the zproc test, which fails on some + ;; hardware: . + (substitute* "src/czmq_selftest.c" + (("\\{ \"zproc\", zproc_test.*") + "")) + #t))))) (inputs `(("zeromq" ,zeromq))) (home-page "http://zeromq.org") -- cgit v1.2.3 From 65db770833af9578642d733c4bc305c81ae5358f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:01:03 +0200 Subject: gnu: zyre: Kernel headers are system headers. * gnu/packages/networking.scm (zyre)[arguments]: Add <#:make-flags>. --- gnu/packages/networking.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a51497c206..f31e758944 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2016,6 +2016,12 @@ remotely.") (base32 "0qz2730bng1gs9xbqxhkw88qbsmszgmmrl2g9k6xrg6r3bqvsdc7")))) (build-system gnu-build-system) + (arguments + `(;; Ensure the kernel headers are treated as system headers to suppress + ;; harmless -Werror=pedantic warnings. + #:make-flags (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")))) (inputs `(("zeromq" ,zeromq) ("czmq" ,czmq) ("libsodium" ,libsodium))) -- cgit v1.2.3 From ca49d732256fd768941b91b3e92404430832de27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:01:40 +0200 Subject: gnu: librime: Update to 1.5.3. * gnu/packages/ibus.scm (librime): Update to 1.5.3. [arguments]: Add <#:configure-flags>. --- gnu/packages/ibus.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index eab35dbadd..9291a74394 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -305,7 +305,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.4.0") + (version "1.5.3") (source (origin (method git-fetch) @@ -315,7 +315,7 @@ Japanese language input in most graphical applications.") (file-name (git-file-name name version)) (sha256 (base32 - "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd")) + "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv")) (modules '((guix build utils))) (snippet '(begin @@ -325,7 +325,9 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(#:phases + '(;; XXX: Work around . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit v1.2.3 From b16e08279938fae329e62154da749860bdccef04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:44:26 +0200 Subject: gnu: python-keras: Add upstream patch. * gnu/packages/patches/python-keras-integration-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/machine-learning.scm (python-keras)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 1 + .../patches/python-keras-integration-test.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/python-keras-integration-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 01ec94484f..35775041b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1225,6 +1225,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e3c69948e2..3eeb9cb1e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1853,6 +1853,7 @@ with image data, text data, and sequence data.") (origin (method url-fetch) (uri (pypi-uri "Keras" version)) + (patches (search-patches "python-keras-integration-test.patch")) (sha256 (base32 "1j8bsqzh49vjdxy6l1k4iwax5vpjzniynyd041xjavdzvfii1dlh")))) diff --git a/gnu/packages/patches/python-keras-integration-test.patch b/gnu/packages/patches/python-keras-integration-test.patch new file mode 100644 index 0000000000..aa2b1a273d --- /dev/null +++ b/gnu/packages/patches/python-keras-integration-test.patch @@ -0,0 +1,19 @@ +Fix a test failure with recent versions of ... Pytest? Python? + +Taken from upstream: +https://github.com/keras-team/keras/commit/fe35050a8f18dc52304aa8da4e463eececa25240 + +diff --git a/tests/integration_tests/applications_test.py b/tests/integration_tests/applications_test.py +index 979f2f2abd6..6e3b57fa8e2 100644 +--- a/tests/integration_tests/applications_test.py ++++ b/tests/integration_tests/applications_test.py +@@ -58,7 +58,8 @@ def _test_application_basic(app, last_dim=1000): + def _test_application_notop(app, last_dim): + output_shape = _get_output_shape( + lambda: app(weights=None, include_top=False)) +- assert output_shape == (None, None, None, last_dim) ++ assert len(output_shape) == 4 ++ assert output_shape[-1] == last_dim + + + def test_mobilenet_v2_legacy_import(): -- cgit v1.2.3 From 57d87f435fcb05a8e44a6d0545d0212429826bd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:00:41 +0200 Subject: gnu: supertux: Adjust for recent GCC and Boost. * gnu/packages/patches/supertux-fix-build-with-gcc5.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/games.scm (supertux)[source](patches): Remove. [arguments]: Adjust <#:configure-flags>. --- gnu/local.mk | 1 - gnu/packages/games.scm | 6 +- .../patches/supertux-fix-build-with-gcc5.patch | 75 ---------------------- 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/supertux-fix-build-with-gcc5.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 35775041b8..528ad703a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1307,7 +1307,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ - %D%/packages/patches/supertux-fix-build-with-gcc5.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8e9db1412a..1088d2ff4b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3519,12 +3519,12 @@ with the \"Stamp\" tool within Tux Paint.") (base32 "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4")) (patches - (search-patches "supertux-fix-build-with-gcc5.patch" - "supertux-unbundle-squirrel.patch")))) + (search-patches "supertux-unbundle-squirrel.patch")))) (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - "-DENABLE_BOOST_STATIC_LIBS=OFF" + ;; XXX: Work around . + "-DBoost_NO_BOOST_CMAKE=ON" "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch b/gnu/packages/patches/supertux-fix-build-with-gcc5.patch deleted file mode 100644 index 6393215ca1..0000000000 --- a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch +++ /dev/null @@ -1,75 +0,0 @@ -Taken from https://github.com/SuperTux/supertux/commit/a75317ef0a94847d9b6a7833b9c6652ef29edde3. -This patch fixes building with gcc versions earlier than 6. - -From a75317ef0a94847d9b6a7833b9c6652ef29edde3 Mon Sep 17 00:00:00 2001 -From: Ingo Ruhnke -Date: Fri, 28 Dec 2018 22:45:35 +0100 -Subject: [PATCH] Add workaround for backwards compatibilty with gcc5 - -Fixes #1014 ---- - src/video/gl/gl_painter.cpp | 11 ++++++----- - src/video/ttf_surface.cpp | 16 +++++++++------- - 2 files changed, 15 insertions(+), 12 deletions(-) - -diff --git a/src/video/gl/gl_painter.cpp b/src/video/gl/gl_painter.cpp -index 5e0d1e7b1e..32fb7a09b6 100644 ---- a/src/video/gl/gl_painter.cpp -+++ b/src/video/gl/gl_painter.cpp -@@ -37,12 +37,13 @@ namespace { - - inline std::tuple blend_factor(Blend blend) - { -+ using B = std::tuple; - switch(blend) { -- case Blend::NONE: return {GL_ONE, GL_ZERO}; -- case Blend::BLEND: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; -- case Blend::ADD: return {GL_SRC_ALPHA, GL_ONE}; -- case Blend::MOD: return {GL_DST_COLOR, GL_ZERO}; -- default: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; -+ case Blend::NONE: return B(GL_ONE, GL_ZERO); -+ case Blend::BLEND: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -+ case Blend::ADD: return B(GL_SRC_ALPHA, GL_ONE); -+ case Blend::MOD: return B(GL_DST_COLOR, GL_ZERO); -+ default: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - } - } - -diff --git a/src/video/ttf_surface.cpp b/src/video/ttf_surface.cpp -index 7c9505004f..b41d67b2c8 100644 ---- a/src/video/ttf_surface.cpp -+++ b/src/video/ttf_surface.cpp -@@ -55,12 +55,13 @@ TTFSurface::create(const TTFFont& font, const std::string& text) - SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); - SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); - -+ using P = std::tuple; - const std::initializer_list > positions[] = { - {}, -- {{0, 0}}, -- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, -- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, -- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} -+ {P{0, 0}}, -+ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, -+ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, -+ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} - }; - - int shadow_size = std::min(2, font.get_shadow_size()); -@@ -77,11 +78,12 @@ TTFSurface::create(const TTFFont& font, const std::string& text) - SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); - SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); - -+ using P = std::tuple; - const std::initializer_list > positions[] = { - {}, -- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, -- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, -- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} -+ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, -+ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, -+ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} - }; - - int border = std::min(2, font.get_border()); -- cgit v1.2.3 From da9adfc7f7e11e6aeaa6322331e867bbafdab055 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:02:43 +0200 Subject: gnu: colobot, leela-zero: Add Boost workaround. This works around and incompatibility with CMake 3.14 and Boost 1.70, see . * gnu/packages/games.scm (colobot, leela-zero)[arguments]: Add "-DBoost_NO_BOOST_CMAKE=ON" in <#:configure-flags>. --- gnu/packages/games.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1088d2ff4b..30fa0463f4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5397,6 +5397,8 @@ Github or Gitlab.") (build-system cmake-build-system) (arguments `(#:tests? #f ;no test + ;; XXX: Work around . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -7621,7 +7623,9 @@ remake of that series or any other game.") ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - '(#:configure-flags '("-DUSE_BLAS=YES") + '(#:configure-flags '("-DUSE_BLAS=YES" + ;; XXX: Work around . + "-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From e1f174ae284d9954840f1723ac012c0d3fbcecb4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 10:36:21 -0400 Subject: gnu: evolution-data-server: Use a proper patch for locales. See . * gnu/packages/patches/evolution-data-server-locales.patch: New file. * gnu/local.mk: Add it. * gnu/packages/gnome.scm (evolution-data-server): Replace the 'patch-locale-canonicalization' phase with the new patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 17 +---------- .../patches/evolution-data-server-locales.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 gnu/packages/patches/evolution-data-server-locales.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 528ad703a4..c95a5c8126 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -780,6 +780,7 @@ dist_patch_DATA = \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index beaba3b4c5..9190301ee9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5162,6 +5162,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "evolution-data-server-locales.patch")) (sha256 (base32 "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) @@ -5205,22 +5206,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) - ;; This phase fixes locale canonicalization when using newer - ;; versions of ICU. The bug has been fixed upstream, and - ;; should appear starting in version 3.33.5. - ;; . - (add-after 'unpack 'patch-locale-canonicalization - (lambda _ - (substitute* "src/libedataserver/e-collator.c" - (("len = uloc_canonicalize \\(posix_locale,.*" x) - ((lambda (xs) (string-join xs "\n" 'suffix)) - (list - "if (posix_locale && (" - " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" - " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" - " posix_locale = \"en_US_POSIX\";" - x)))) - #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" diff --git a/gnu/packages/patches/evolution-data-server-locales.patch b/gnu/packages/patches/evolution-data-server-locales.patch new file mode 100644 index 0000000000..48baefb0d8 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-locales.patch @@ -0,0 +1,33 @@ +This patch fixes locale canonicalization when using newer versions of +ICU. It comes from the upstream repo, and should appear starting in +version 3.33.5. + +From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 16 Jul 2019 07:22:07 +0200 +Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137 +--- + src/libedataserver/e-collator.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c +index 718eac5da..ec2cf7951 100644 +--- a/src/libedataserver/e-collator.c ++++ b/src/libedataserver/e-collator.c +@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale, + gint len; + const gchar *collation_type = NULL; + ++ if (posix_locale && ( ++ g_ascii_strcasecmp (posix_locale, "C") == 0 || ++ g_ascii_strcasecmp (posix_locale, "POSIX") == 0)) ++ posix_locale = "en_US_POSIX"; ++ + len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status); + + if (U_FAILURE (status)) { +-- +2.22.0 + -- cgit v1.2.3 From 1c9b99234c8322467ca22be70a94aa1678658476 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 12:05:58 -0400 Subject: gnu: gnome-session: Do not patch in absolute paths. This is no longer needed as upstream is now using absolute paths. * gnu/packages/gnome.scm (gnome-session): Remove phase that patches absolute paths into the session desktop entry files. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9190301ee9..3ac5025fce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4806,14 +4806,6 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) - #t))) - (add-after 'install 'add-absolute-paths-to-desktop-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (map (lambda (x) - (string-append out "/share/xsessions/" x)) - '("gnome.desktop" "gnome-xorg.desktop")) - (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags -- cgit v1.2.3 From d478cc043557ca3fcd5fced87d2e2c8e246eff03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:38:11 +0200 Subject: gnu: pybind11: Update to 2.3.0. * gnu/packages/python-xyz.scm (pybind11): Update to 2.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6796f1c065..d3744e82c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14888,7 +14888,7 @@ under Python 2.7.") (define-public pybind11 (package (name "pybind11") - (version "2.2.4") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -14896,7 +14896,7 @@ under Python 2.7.") (commit (string-append "v" version)))) (sha256 (base32 - "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv")) + "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 2cf1e37c109c8d03fae75bc84f7012f3afa956e5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 28 Jul 2019 08:49:00 -0400 Subject: gnu: gnome-maps: Update to 3.30.3.1. * gnu/packages/geo.scm (gnome-maps): Update to 3.30.3.1. [inputs]: Replace gdk-pixbuf with gdk-pixbuf+svg and gnome-online-accounts with gnome-online-accounts:lib. [arguments]: Adjust 'wrap' phase accordingly. --- gnu/packages/geo.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5dce3f9a58..09ca77e69b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -108,7 +108,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.30.2.1") + (version "3.30.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -116,7 +116,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57")))) + "0xqk3yrds0w8bjmpf4jw0370phvm65av82nqrx7fp1648h9nq7xi")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -130,8 +130,11 @@ topology functions.") (assoc-ref inputs "geocode-glib") "/lib")) (goa-path (string-append - (assoc-ref inputs "gnome-online-accounts") + (assoc-ref inputs "gnome-online-accounts:lib") "/lib")) + (gdk-pixbuf-path (string-append + (assoc-ref inputs "gdk-pixbuf") + "/lib")) (webkitgtk-path (string-append (assoc-ref inputs "webkitgtk") "/lib"))) @@ -140,9 +143,11 @@ topology functions.") ;; There seems to be no way to embed the path of ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37, - ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0 + ;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and + ;; libgeocode-glib.so.0 `("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path + ,gdk-pixbuf-path ,geocode-glib-path))) #t)))))) (native-inputs @@ -158,14 +163,14 @@ topology functions.") ("libsoup" ,libsoup) ("libgweather" ,libgweather) ("libxml2" ,libxml2) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib-networking" ,glib-networking) ("geoclue" ,geoclue) ("geocode-glib" ,geocode-glib) ("gfbgraph" ,gfbgraph) ("gjs" ,gjs) ("glib" ,glib) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("rest" ,rest) ("webkitgtk" ,webkitgtk))) -- cgit v1.2.3 From c7e31cde04f6308615734f5c6fd91de87e1a60f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Apr 2019 15:46:36 +0200 Subject: gnu: ftgl: Update to 2.4.0. * gnu/packages/gl.scm (ftgl): Update to 2.4.0. [home-page]: Change to maintained fork at . [source]: Change to GIT-FETCH. [native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/gl.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f615ebd71c..e7d50a5b8a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -149,15 +149,16 @@ the X-Consortium license.") (define-public ftgl (package (name "ftgl") - (version "2.1.3-rc5") + (version "2.4.0") + (home-page "https://github.com/frankheckenbach/ftgl") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/ftgl/FTGL%20Source/2.1.3~rc5/" - "ftgl-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l")))) + "0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) @@ -167,8 +168,10 @@ the X-Consortium license.") ("mesa" ,mesa) ("glu" ,glu))) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://ftgl.sourceforge.net") + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (synopsis "Font rendering library for OpenGL applications") (description "FTGL is a font rendering library for OpenGL applications. Supported -- cgit v1.2.3 From e4e2bef12d1f170cc3d16812b2a1c7016500c25d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 13:26:35 +0200 Subject: gnu: prank: Update to 170427. * gnu/packages/bioinformatics.scm (prank): Update to 170427. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eb99eceb14..b1cf294177 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4829,7 +4829,7 @@ generated using the PacBio Iso-Seq protocol.") (define-public prank (package (name "prank") - (version "150803") + (version "170427") (source (origin (method url-fetch) (uri (string-append @@ -4837,7 +4837,7 @@ generated using the PacBio Iso-Seq protocol.") version ".tgz")) (sha256 (base32 - "0am4z94fs3w2n5xpfls9zda61vq7qqz4q2i7b9hlsxz5q4j3kfm4")))) + "0nc8g9c5rkdxcir46s0in9ci1sxwzbjibxrvkksf22ybnplvagk2")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cfad3defb727ff3f0df0382531963911e9d38f1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 16:06:22 +0200 Subject: gnu: gpsbabel: Remove GCC 5 workaround. * gnu/packages/gps.scm (gpsbabel)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/gps.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 852d095300..2d24a9ac22 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -66,11 +66,7 @@ ;; TODO: "make doc" requires Docbook & co. (arguments `(#:configure-flags - '("--with-zlib=system" - ;; XXX Use -fPIC to work around build problems with Qt, GCC 5, and - ;; recent binutils: - ;; https://codereview.qt-project.org/#/c/111787/ - "CXXFLAGS=-std=gnu++11 -fPIC") + '("--with-zlib=system") ;; On i686, 'raymarine.test' fails because of a rounding error: ;; . As a workaround, disable tests ;; on these platforms. -- cgit v1.2.3 From 7999d317bcc12d9c1ebc63bd519145ee4954e410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:08:18 +0200 Subject: gnu: icu4c: Add upstream patches. This is necessary to fix a test failure in 'node' when built for i686-linux. * gnu/packages/icu4c.scm (%icu4c-patches): New variable. (icu4c)[source](patches, patch-flags): New fields. --- gnu/packages/icu4c.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index fc3409ed3f..258721963b 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -31,6 +31,28 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) +;; These patches are taken from ICUs 'maint-64' branch and will be included in +;; 64.3. The latter patch is needed because many packages use "invalid" +;; locales which misbehave with ICU 64.2. See discussion at +;; . +(define %icu4c-patches + (list (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "7788f04eb9be0d7ecade6af46cf7b9825447763d.patch")) + (file-name "icu4c-datetime-regression.patch") + (sha256 + (base32 + "0gs2sbdfpzwwdjqcqr0c16fw3g7wy3gb1gbgvzs9k1ciw0bhpv4w"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "cfb20862909ff105d4f2c43923c97561bc5a5815.patch")) + (file-name "icu4c-locale-mapping.patch") + (sha256 + (base32 + "0s5psb60aisj6icziblvlp9dqcz56n3887i8ib0yidbjnnrw5b97"))))) + (define-public icu4c (package (name "icu4c") @@ -43,6 +65,8 @@ "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) + (patches %icu4c-patches) + (patch-flags '("-p2")) (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) -- cgit v1.2.3 From f73fe13ccd1ef3fe6f6e0409fa817e5feb612e40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:11:33 +0200 Subject: gnu: icu4c: Make 'libicudata.so' behave the same on all architectures. * gnu/packages/icu4c.scm (icu4c)[arguments]: Do not pass '--with-data-packaging=archive' in #:configure-flags. Add phase to enable use of standard libraries in libicudata.so. --- gnu/packages/icu4c.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 258721963b..922dfbd348 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -76,17 +76,19 @@ `(("perl" ,perl))) (arguments `(#:configure-flags - '("--enable-rpath" - ,@(if (let ((s (or (%current-target-system) - (%current-system)))) - (or (string-prefix? "arm" s) - (string-prefix? "mips" s))) - '("--with-data-packaging=archive") - '())) + '("--enable-rpath") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source (lambda _ (chdir "source") #t)) + (add-after 'chdir-to-source 'update-LDFLAGS + (lambda _ + ;; Do not create a "data-only" libicudata.so because it causes + ;; problems on some architectures (notably armhf and MIPS). + (substitute* "config/mh-linux" + (("LDFLAGSICUDT=-nodefaultlibs -nostdlib") + "LDFLAGSICUDT=")) + #t)) (add-after 'install 'avoid-coreutils-reference ;; Don't keep a reference to the build tools. (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 80ba43b5f8c70cd823cf0821ae32491e7b3edd3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:18:22 +0200 Subject: gnu: libarchive: Enable zstd support. CMake 3.15 has a test that expects zstd to be enabled. It adds ~1 MiB to the closure size. * gnu/packages/backup.scm (libarchive)[inputs]: Add ZSTD:LIB. Sort alphabetically. [arguments]: Adjust one of the zstd tests. Adjust libarchive.pc. --- gnu/packages/backup.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1bb05d9d15..abb8eed259 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,12 +213,13 @@ backups (called chunks) to allow easy burning to CD/DVD.") "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("nettle" ,nettle) - ("lzo" ,lzo) - ("bzip2" ,bzip2) + `(("bzip2" ,bzip2) ("libxml2" ,libxml2) - ("xz" ,xz))) + ("lzo" ,lzo) + ("nettle" ,nettle) + ("xz" ,xz) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (arguments `(#:phases (modify-phases %standard-phases @@ -232,6 +234,13 @@ backups (called chunks) to allow easy burning to CD/DVD.") ;; test_write_disk_lookup tests expect user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. ;; + ;; XXX: Adjust test that fails with zstd 1.4.1 because the default + ;; options compresses two bytes better than this test expects. + ;; https://github.com/libarchive/libarchive/issues/1226 + (substitute* "libarchive/test/test_write_filter_zstd.c" + (("compression-level\", \"6\"") + "compression-level\", \"7\"")) + ;; The tests allow one to disable tests matching a globbing pattern. (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") ;; XXX: This glob disables too much. @@ -246,6 +255,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (libxml2 (assoc-ref inputs "libxml2")) (xz (assoc-ref inputs "xz")) (zlib (assoc-ref inputs "zlib")) + (zstd (assoc-ref inputs "zstd")) (bzip2 (assoc-ref inputs "bzip2"))) (substitute* (string-append lib "/pkgconfig/libarchive.pc") (("-lnettle") @@ -256,6 +266,8 @@ backups (called chunks) to allow easy burning to CD/DVD.") (string-append "-L" xz "/lib -llzma")) (("-lz") (string-append "-L" zlib "/lib -lz")) + (("-lzstd") + (string-append "-L" zstd "/lib -lzstd")) (("-lbz2") (string-append "-L" bzip2 "/lib -lbz2"))) #t)))))) -- cgit v1.2.3 From f8071e9b3be91bdc0ceef7cbc8e93f58738da194 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:05:49 +0200 Subject: gnu: libarchive: Do not build 'libarchive.a'. * gnu/packages/backup.scm (libarchive)[arguments]: Add <#:configure-flags>. --- gnu/packages/backup.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index abb8eed259..1e9298f68c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -221,7 +221,8 @@ backups (called chunks) to allow easy burning to CD/DVD.") ("zlib" ,zlib) ("zstd" ,zstd "lib"))) (arguments - `(#:phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'build 'patch-pwd (lambda _ -- cgit v1.2.3 From 1664e2ab39b3d9f6252ce8b532468c45439aa01d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:36:26 +0200 Subject: gnu: libarchive: Embed absolute references to required libraries in .la file. * gnu/packages/backup.scm (libarchive)[arguments]: Substitute -lfoo compiler flags with absolute references in libarchive.la, in addition to libarchive.pc. --- gnu/packages/backup.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1e9298f68c..a92c8c9aca 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -258,7 +258,9 @@ backups (called chunks) to allow easy burning to CD/DVD.") (zlib (assoc-ref inputs "zlib")) (zstd (assoc-ref inputs "zstd")) (bzip2 (assoc-ref inputs "bzip2"))) - (substitute* (string-append lib "/pkgconfig/libarchive.pc") + ;; Embed absolute references to these inputs to avoid propagation. + (substitute* (list (string-append lib "/pkgconfig/libarchive.pc") + (string-append lib "/libarchive.la")) (("-lnettle") (string-append "-L" nettle "/lib -lnettle")) (("-lxml2") -- cgit v1.2.3 From 0a6e9e13c54fb8a4574c9e1eb4e6d243f45b12ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:37:58 +0200 Subject: gnu: Remove workarounds for missing libarchive nettle propagation. * gnu/packages/gnome.scm (brasero, libgxps, aisleriot, grilo, grilo-plugins, totem, rhythmbox, gvfs, d-feet, gnome-session, gnome-autoar, tracker, nautilus)[inputs]: Remove NETTLE. * gnu/packages/linux.scm (singularity)[inputs]: Likewise. * gnu/packages/mate.scm (atril)[inputs]: Likewise. * gnu/packages/package-management.scm (rpm, libostree, flatpak)[inputs]: Likewise. --- gnu/packages/gnome.scm | 22 +++------------------- gnu/packages/linux.scm | 2 -- gnu/packages/mate.scm | 2 -- gnu/packages/package-management.scm | 4 ---- 4 files changed, 3 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e8c26f5370..e2ecc1bb6a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -223,7 +223,6 @@ ("libnotify" ,libnotify) ("libsm" ,libsm) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (home-page "https://projects.gnome.org/brasero/") (synopsis "CD/DVD burning tool for Gnome") @@ -428,8 +427,7 @@ access the common Google services, and has full asynchronous support.") `(("gtk+" ,gtk+) ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) - ("libtiff" ,libtiff) - ("nettle" ,nettle))) + ("libtiff" ,libtiff))) (propagated-inputs ;; In Requires of libgxps.pc. `(("cairo" ,cairo) @@ -818,10 +816,6 @@ forgotten when the session ends.") ("libcanberra" ,libcanberra) ("libsecret" ,libsecret) - ;; XXX: 'libarchive.pc' adds '-lnettle' so Nettle should really be - ;; propagated from there. - ("nettle" ,nettle) - ;; For tests. ("dogtail" ,python2-dogtail))) (native-inputs @@ -3332,8 +3326,7 @@ settings, themes, mouse settings, and startup of other daemons.") ("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2))) (inputs - `(("nettle" ,nettle) - ("libsoup" ,libsoup))) + `(("libsoup" ,libsoup))) (home-page "https://projects.gnome.org/totem") (synopsis "Library to parse and save media playlists for GNOME") (description "Totem-pl-parser is a GObjects-based library to parse and save @@ -3788,7 +3781,6 @@ as possible!") ("libxml2" ,libxml2) ("liboauth" ,liboauth) ("libsoup" ,libsoup) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (arguments `(#:phases @@ -3837,7 +3829,6 @@ for application developers.") ("pkg-config" ,pkg-config))) (inputs `(("grilo" ,grilo) - ("nettle" ,nettle) ; XXX: required by libgrlpls-0.3.la ("glib" ,glib) ("libxml2" ,libxml2) ("sqlite" ,sqlite) @@ -3926,7 +3917,6 @@ for application developers.") ("totem-pl-parser" ,totem-pl-parser) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) - ("nettle" ,nettle) ("vala" ,vala))) (arguments `(#:glib-or-gtk? #t @@ -4028,7 +4018,6 @@ which can read a large number of file formats.") ("python-pygobject" ,python2-pygobject) ("vala" ,vala) ("gmime" ,gmime) - ("nettle" ,nettle) ("adwaita-icon-theme" ,adwaita-icon-theme) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) @@ -4244,7 +4233,6 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) - ("nettle" ,nettle) ; XXX: required by libarchive.pc ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) @@ -4760,7 +4748,6 @@ share them with others via social networking and more.") ("json-glib" ,json-glib) ("libarchive" ,libarchive) ("libnotify" ,libnotify) - ("nettle" ,nettle) ("itstool" ,itstool) ("libxml2" ,libxml2))) (synopsis "Graphical archive manager for GNOME") @@ -6217,8 +6204,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") (propagated-inputs `(("libarchive" ,libarchive))) ; XXX document why (inputs - `(("gtk+" ,gtk+) - ("nettle" ,nettle))) ; XXX: required by libarchive.pc + `(("gtk+" ,gtk+))) (synopsis "Archives integration support for GNOME") (home-page "https://git.gnome.org/browse/gnome-autoar/") (description @@ -6286,7 +6272,6 @@ easy, safe, and automatic.") ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("sqlite" ,sqlite) - ("nettle" ,nettle) ; XXX why is this needed? ("python" ,python) ("poppler" ,poppler) ("libgsf" ,libgsf) @@ -6355,7 +6340,6 @@ shared object databases, search tools and indexing.") ("gnome-autoar" ,gnome-autoar) ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) - ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) ;; XXX: gtk+ is required by libnautilus-extension.pc ;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b7a31d110..998f197304 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -90,7 +90,6 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) - #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) @@ -3182,7 +3181,6 @@ thanks to the use of namespaces.") (inputs `(("libarchive" ,libarchive) ("python" ,python-wrapper) - ("nettle" ,nettle) ("zlib" ,zlib) ("squashfs-tools" ,squashfs-tools))) (home-page "https://singularity.lbl.gov/") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 9e9fda0929..ba90ccec73 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pdf) @@ -819,7 +818,6 @@ infamous 'Wanda the Fish'.") ("libgnome-keyring" ,libgnome-keyring) ("libarchive" ,libarchive) ("marco" ,marco) - ("nettle" ,nettle) ("openjpeg" ,openjpeg-1) ("pango" ,pango) ;;("texlive" ,texlive) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b641340a1a..84bb3542f1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) @@ -542,7 +541,6 @@ symlinks to the files in a common directory such as /usr/local.") ("nss" ,nss) ("nspr" ,nspr) ("libarchive" ,libarchive) - ("nettle" ,nettle) ;XXX: actually a dependency of libarchive ("file" ,file) ("bzip2" ,bzip2) ("zlib" ,zlib) @@ -1012,7 +1010,6 @@ for packaging and deployment of cross-compiled Windows applications.") ("gpgme" ,gpgme) ("libarchive" ,libarchive) ("libsoup" ,libsoup) - ("nettle" ,nettle) ; required by 'libarchive.la' ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") @@ -1071,7 +1068,6 @@ the boot loader configuration.") ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("util-linux" ,util-linux))) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop -- cgit v1.2.3 From 14767d4466c7f7bcf32c68b2d10cc359c79d7160 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:20:55 +0200 Subject: gnu: CMake: Update to 3.15.1. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.15.1. [arguments]: Do not patch /bin/sh in removed file. --- gnu/packages/cmake.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 8a0bba2e8f..387456be50 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.5") + (version "3.15.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "01lcl6ynxfgqn09ncfz1gr24ha5pv1slk0azzaawaqrwpsgf8njh")) + "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq")) (modules '((guix build utils))) (snippet '(begin @@ -125,7 +125,6 @@ (substitute* '("Modules/CompilerId/Xcode-3.pbxproj.in" "Modules/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" "Source/cmGlobalXCodeGenerator.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" -- cgit v1.2.3 From 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:06:23 +0200 Subject: gnu: boost: Do not install CMake files. Fixes . * gnu/packages/boost.scm (boost)[arguments]: Add "--no-cmake-config" to <#:configure-flags>. --- gnu/packages/boost.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6b8eebcecb..a2253a9efc 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -69,6 +69,11 @@ #:make-flags (list "threading=multi" "link=shared" + ;; XXX: Disable installation of Boosts modular CMake config scripts + ;; which conflicts in 1.70.0 with the ones provided by CMake. + ;; See . + "--no-cmake-config" + ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 888940c2d3ad81826741f4fcdf0b330c7c7799f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:29:16 +0200 Subject: gnu: curl: Update to 7.65.3. * gnu/packages/curl.scm (curl): Update to 7.65.3. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 24932c9f99..5e1e7eb400 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.1") + (version "7.65.3") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) + "1sjz4fq7jg96mpmpqq82nd61njna6jp3c4m9yrbx2j1rh5a8ingj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From e23dd493606d268111c115d2948dd3f66efb9124 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:23:14 +0200 Subject: gnu: poppler: Update to 0.79.0. * gnu/packages/pdf.scm (poppler): Update to 0.79.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 046c18c345..7108386a34 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -85,14 +85,14 @@ (define-public poppler (package (name "poppler") - (version "0.78.0") + (version "0.79.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1hiqg4wc6lpf52x3k630w2y1x90fhb6vfqdqg0xrqcx7hwqxsbv2")))) + "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From d7342997cd9d28eed3602424b98b8f6a00e61efb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:21:01 +0200 Subject: gnu: libtasn1: Update to 4.14. * gnu/packages/tls.scm (libtasn1): Update to 4.14. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 999c113836..84461a70b2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -70,7 +70,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.13") + (version "4.14") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.gz")) (sha256 (base32 - "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky")))) + "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From bffe4305ec2daaa87cb31a0121214983b2bd5589 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:21:27 +0200 Subject: gnu: gnutls: Update to 3.6.9. * gnu/packages/tls.scm (gnutls): Update to 3.6.9. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 84461a70b2..f2e7f4ad0c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -163,7 +163,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.8") + (version "3.6.9") (source (origin (method url-fetch) (uri @@ -175,7 +175,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da")))) + "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From 014d4c149594f8e7f0e74eefd7255a03946596f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:24:46 +0200 Subject: gnu: libice: Update to 1.0.10. * gnu/packages/xorg.scm (libice): Update to 1.0.10. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7c5268c30b..62ff420171 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4786,7 +4786,7 @@ common definitions and porting layer.") (define-public libice (package (name "libice") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) @@ -4796,7 +4796,7 @@ common definitions and porting layer.") ".tar.bz2")) (sha256 (base32 - "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g")))) + "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From f9f72d35361bde53b8face634c72530aa7d81edf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:45:54 +0200 Subject: gnu: glib: Update to 2.60.6. * gnu/packages/patches/glib-keyfile-arguments.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (glib): Update to 2.60.6. [source](patches): Remove obsolete patch. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 7 +++---- gnu/packages/patches/glib-keyfile-arguments.patch | 20 -------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 gnu/packages/patches/glib-keyfile-arguments.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0517578bd2..27edacbc7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -856,7 +856,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ - %D%/packages/patches/glib-keyfile-arguments.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8f1b91e142..438c1f9cbc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -159,7 +159,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.60.5") + (version "2.60.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -167,9 +167,8 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) - (patches (search-patches "glib-tests-timer.patch" - "glib-keyfile-arguments.patch")) + "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz")) + (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch b/gnu/packages/patches/glib-keyfile-arguments.patch deleted file mode 100644 index 8d428f4192..0000000000 --- a/gnu/packages/patches/glib-keyfile-arguments.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix a problem with the keyfile backend whereby instantiating it with -the default NULL value would cause an assertion error: - -https://gitlab.gnome.org/GNOME/glib/issues/1825 - -This issue showed up when running the test suites of uhttpmock and spice. - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object, - case PROP_FILENAME: - /* Construct only. */ - g_assert (kfsb->file == NULL); -- kfsb->file = g_file_new_for_path (g_value_get_string (value)); -+ if (g_value_get_string (value)) -+ kfsb->file = g_file_new_for_path (g_value_get_string (value)); - break; - - case PROP_ROOT_PATH: -- cgit v1.2.3 From 51d4c79dc28c70cde61348eb52775f45125a2ee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:54:59 +0200 Subject: gnu: Remove workarounds for . These are no longer needed since 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c. * gnu/packages/compression.scm (innoextract)[arguments]: Remove "-DBoost_NO_BOOST_CMAKE=ON" from <#:configure-flags>. * gnu/packages/game-development.scm (openmw)[arguments]: Likewise. * gnu/packages/games.scm (supertux, colobot, leela-zero)[arguments]: Likewise. * gnu/packages/graphics.scm (openimageio)[arguments]: Likewise. * gnu/packages/ibus.scm (librime)[arguments]: Likewise. --- gnu/packages/compression.scm | 3 --- gnu/packages/game-development.scm | 3 +-- gnu/packages/games.scm | 8 +------- gnu/packages/graphics.scm | 5 +---- gnu/packages/ibus.scm | 4 +--- 5 files changed, 4 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index da9e646f5f..774abad5c9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1822,9 +1822,6 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f - ;; XXX: Work around a problem with the CMake support in Boost 1.70: - ;; . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'glibc-is-already-a-system-library (lambda _ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5a4b81a988..7eac935a69 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1116,8 +1116,7 @@ of use.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DDESIRED_QT_VERSION=5" - "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around + (list "-DDESIRED_QT_VERSION=5"))) (native-inputs `(("boost" ,boost) ("doxygen" ,doxygen) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4e7fb2e428..66b642ebd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3516,8 +3516,6 @@ with the \"Stamp\" tool within Tux Paint.") (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON" "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases @@ -5390,8 +5388,6 @@ Github or Gitlab.") (build-system cmake-build-system) (arguments `(#:tests? #f ;no test - ;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -7616,9 +7612,7 @@ remake of that series or any other game.") ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - '(#:configure-flags '("-DUSE_BLAS=YES" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON") + '(#:configure-flags '("-DUSE_BLAS=YES") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 66d47fdb84..f4f9228a07 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -467,10 +467,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") ;; third party sources have to be present. For details see ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL (arguments - `(#:tests? #f - ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14. See - ;; for details. - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) + `(#:tests? #f)) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9291a74394..96fded0f4e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -325,9 +325,7 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") - #:phases + '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit v1.2.3 From 497b2d39427af4aaddbaa8922d4a6a858bbdaee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 16:52:39 +0200 Subject: gnu: dbus-c++: Fix build with GCC 7. * gnu/packages/patches/dbus-c++-gcc-compat.patch, gnu/packages/patches/dbus-c++-threading-mutex.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus-c++)[source](patches): New field. [arguments]: End phases on #t. --- gnu/local.mk | 2 ++ gnu/packages/glib.scm | 5 ++- gnu/packages/patches/dbus-c++-gcc-compat.patch | 14 ++++++++ .../patches/dbus-c++-threading-mutex.patch | 37 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dbus-c++-gcc-compat.patch create mode 100644 gnu/packages/patches/dbus-c++-threading-mutex.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 27edacbc7e..41f4e4eec2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -750,6 +750,8 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dbus-c++-gcc-compat.patch \ + %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dealii-mpi-deprecations.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 438c1f9cbc..3e17330447 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -791,6 +791,8 @@ This package provides the library for GLib applications.") "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/" version "/libdbus-c%2B%2B-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "dbus-c++-gcc-compat.patch" + "dbus-c++-threading-mutex.patch")) (sha256 (base32 "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw")))) @@ -812,7 +814,8 @@ This package provides the library for GLib applications.") (lambda _ (substitute* "include/dbus-c++/eventloop-integration.h" (("#include ") - "#include \n#include "))))))) + "#include \n#include ")) + #t))))) (synopsis "D-Bus API for C++") (description "This package provides D-Bus client API bindings for the C++ programming language. It also contains the utility diff --git a/gnu/packages/patches/dbus-c++-gcc-compat.patch b/gnu/packages/patches/dbus-c++-gcc-compat.patch new file mode 100644 index 0000000000..c4f126858c --- /dev/null +++ b/gnu/packages/patches/dbus-c++-gcc-compat.patch @@ -0,0 +1,14 @@ +Fix a string comparison in C++ 11. + +Taken from Debian: +https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/06_fix_gcc-7_ftbfs.patch/ + +--- a/src/pipe.cpp ++++ b/src/pipe.cpp +@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigne + void Pipe::signal() + { + // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... +- ::write(_fd_write, '\0', 1); ++ ::write(_fd_write, "\0", 1); + } diff --git a/gnu/packages/patches/dbus-c++-threading-mutex.patch b/gnu/packages/patches/dbus-c++-threading-mutex.patch new file mode 100644 index 0000000000..b201700dc0 --- /dev/null +++ b/gnu/packages/patches/dbus-c++-threading-mutex.patch @@ -0,0 +1,37 @@ +Description: Fix FTBFS if DBUS_HAS_RECURSIVE_MUTEX is undefined +Author: Peter Williams +Last-Update: 2018-01-26 + +Taken from Debian: +https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/07_fix_mutex_ftbfs.patch/ + +--- dbus-c++-0.9.0.orig/include/dbus-c++/dispatcher.h ++++ dbus-c++-0.9.0/include/dbus-c++/dispatcher.h +@@ -267,6 +267,19 @@ struct Threading + return new Mx; + } + ++#ifndef DBUS_HAS_RECURSIVE_MUTEX ++ static bool mutex_free(Mutex *mx) ++ { ++ delete mx; ++ return true; ++ } ++ ++ static bool mutex_lock(Mutex *mx) ++ { ++ mx->lock(); ++ return true; ++ } ++#else + static void mutex_free(Mutex *mx) + { + delete mx; +@@ -276,6 +289,7 @@ struct Threading + { + mx->lock(); + } ++#endif + + static void mutex_unlock(Mutex *mx) + { -- cgit v1.2.3 From 5a7c6d02b287a5134511f139406889dbf965923f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Aug 2019 15:49:28 +0200 Subject: gnu: emacs-cmake-mode: Do not inherit inputs and outputs from CMake. * gnu/packages/cmake.scm (emacs-cmake-mode)[native-inputs, inputs, outputs]: New fields. [arguments]: End phases on #t. --- gnu/packages/cmake.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 387456be50..1d8d829ec5 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -9,7 +9,6 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer - ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,6 +211,9 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake) (name "emacs-cmake-mode") + (native-inputs '()) + (inputs '()) + (outputs '("out")) (build-system emacs-build-system) (arguments `(#:phases @@ -219,7 +221,8 @@ and workspaces that can be used in the compiler environment of your choice.") (add-after 'unpack 'chdir-elisp ;; Elisp directory is not in root of the source. (lambda _ - (chdir "Auxiliary")))))) + (chdir "Auxiliary") + #t))))) (synopsis "Emacs major mode for editing Cmake expressions") (description "@code{cmakeos-mode} provides an Emacs major mode for editing Cmake files. It supports syntax highlighting, indenting and refilling of -- cgit v1.2.3 From 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Aug 2019 16:25:32 +0200 Subject: gnu: qca: Update to 2.2.1. * gnu/packages/kde.scm (qca): Update to 2.2.1. [source](uri): Adjust to current. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 31b3670079..b5b1d4eb20 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -477,15 +477,15 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.1.3") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/qca/" version - "/src/qca-" version ".tar.xz")) + "/qca-" version ".tar.xz")) (sha256 (base32 - "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0")))) + "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2b3a10b6b5f2a48665cf4bfa27525c4caca175d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 20:43:08 +0200 Subject: gnu: Remove leftover patch. This patch was rendered obsolete by the preceding merge. * gnu/packages/patches/scribus-poppler-0.73.patch: Delete file. --- gnu/packages/patches/scribus-poppler-0.73.patch | 36 ------------------------- 1 file changed, 36 deletions(-) delete mode 100644 gnu/packages/patches/scribus-poppler-0.73.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch deleted file mode 100644 index 5cf4cf721d..0000000000 --- a/gnu/packages/patches/scribus-poppler-0.73.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix build with Poppler 0.73. - -This is an amalgamation of these upstream commits: -https://github.com/scribusproject/scribus/commit/d34e59bfe495250ba023ba0f99e672ee32300a27 -https://github.com/scribusproject/scribus/commit/c43a89030026f8ffab5070b6935daee8bd74838a - -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index c46448b80a..4dac7c3983 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. - #include "selection.h" - #include "vgradient.h" - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) - #include -+#endif - #include - #include - #include -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index f6b3950377..80ac796501 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -37,4 +37,11 @@ for which a new license (GPL+exception) is in place. - #define getCString c_str - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) -+#define Guchar unsigned char -+#define Gushort unsigned short -+#define Guint unsigned int -+#define Gulong unsigned long -+#endif -+ - #endif -- cgit v1.2.3 From 5c3f1e4306f252c7dc397ac765caa288a57f99f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Aug 2019 22:25:30 +0200 Subject: gnu: sssd: Update to 1.16.4. * gnu/packages/patches/sssd-curl-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/sssd.scm (sssd): Update to 1.16.4. [source](patches): Remove. [arguments]: Enable fixed tests. --- gnu/local.mk | 1 - gnu/packages/patches/sssd-curl-compat.patch | 18 ------------------ gnu/packages/sssd.scm | 9 ++------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/sssd-curl-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c6962aebd1..08bc205623 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1309,7 +1309,6 @@ dist_patch_DATA = \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ - %D%/packages/patches/sssd-curl-compat.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/strace-ipc-tests.patch \ %D%/packages/patches/streamlink-update-test.patch \ diff --git a/gnu/packages/patches/sssd-curl-compat.patch b/gnu/packages/patches/sssd-curl-compat.patch deleted file mode 100644 index ecab737153..0000000000 --- a/gnu/packages/patches/sssd-curl-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with curl >= 7.62. Patch taken from upstream: - -https://pagure.io/SSSD/sssd/c/4d3841ca379afc01184453ba45ab3e75ffec60da?branch=sssd-1-16 - -diff --git a/src/util/tev_curl.c b/src/util/tev_curl.c -index 6a7a580..d70a429 100644 ---- a/src/util/tev_curl.c -+++ b/src/util/tev_curl.c -@@ -97,7 +97,9 @@ static errno_t curl_code2errno(CURLcode crv) - return ETIMEDOUT; - case CURLE_SSL_ISSUER_ERROR: - case CURLE_SSL_CACERT_BADFILE: -+#if LIBCURL_VERSION_NUM < 0x073e00 - case CURLE_SSL_CACERT: -+#endif - case CURLE_SSL_CERTPROBLEM: - return ERR_INVALID_CERT; - diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 6d6caab0ad..7bb71dce13 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -81,15 +81,14 @@ fundamental object types for C.") (define-public sssd (package (name "sssd") - (version "1.16.2") + (version "1.16.4") (source (origin (method url-fetch) (uri (string-append "http://releases.pagure.org/SSSD/sssd/" "sssd-" version ".tar.gz")) - (patches (search-patches "sssd-curl-compat.patch")) (sha256 (base32 - "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy")))) + "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -130,10 +129,6 @@ fundamental object types for C.") (lambda _ (substitute* "src/tests/responder_socket_access-tests.c" (("tcase_add_test\\(tc_utils, resp_str_to_array_test\\);") "")) - ;; XXX: These tests fail with recent versions of ldb. See - ;; . - (substitute* "Makefile.in" - (("sysdb-tests\\$\\(EXEEXT\\)") "")) #t))))) (inputs `(("augeas" ,augeas) -- cgit v1.2.3 From ab4561489e9e3a07be121582160df128e38a44e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Aug 2019 22:25:37 +0200 Subject: gnu: ruby-nio4r: Update to 2.4.0. * gnu/packages/ruby.scm (ruby-nio4r): Update to 2.4.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b70f842ae..1efd2925f1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8453,14 +8453,14 @@ interface over different adapters.") (define-public ruby-nio4r (package (name "ruby-nio4r") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "nio4r" version)) (sha256 (base32 - "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr")))) + "0v2cpqmw6dmysa91ffzl736kgjjzmnf4xlgz6g16fk4yqhn71340")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit v1.2.3 From 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 19 Aug 2019 09:03:44 +0200 Subject: gnu: qemu: Update to 4.1.0. * gnu/local.mk: Remove qemu-CVE-2018-16872.patch and qemu-CVE-2019-6778.patch. * gnu/packages/patches/qemu-CVE-2018-16872.patch: Remove file. * gnu/packages/patches/qemu-CVE-2019-6778.patch: Remove file. * gnu/packages/virtualization.scm (qemu): Update to 4.1.0. [source]: Remove obsolete patches. [arguments]: Add phases 'prevent-network-configuration and 'disable-unusable-tests. --- gnu/local.mk | 2 - gnu/packages/patches/qemu-CVE-2018-16872.patch | 88 -------------------------- gnu/packages/patches/qemu-CVE-2019-6778.patch | 43 ------------- gnu/packages/virtualization.scm | 19 ++++-- 4 files changed, 14 insertions(+), 138 deletions(-) delete mode 100644 gnu/packages/patches/qemu-CVE-2018-16872.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2019-6778.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 08bc205623..0002f49409 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,8 +1253,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ - %D%/packages/patches/qemu-CVE-2018-16872.patch \ - %D%/packages/patches/qemu-CVE-2019-6778.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-old-kernel.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2018-16872.patch b/gnu/packages/patches/qemu-CVE-2018-16872.patch deleted file mode 100644 index 094e823ee4..0000000000 --- a/gnu/packages/patches/qemu-CVE-2018-16872.patch +++ /dev/null @@ -1,88 +0,0 @@ -Fixes CVE-2018-16872: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16872 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=commitdiff;h=bab9df35ce73d1c8e19a37e2737717ea1c984dc1 - -From bab9df35ce73d1c8e19a37e2737717ea1c984dc1 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 13 Dec 2018 13:25:11 +0100 -Subject: [PATCH] usb-mtp: use O_NOFOLLOW and O_CLOEXEC. - -Open files and directories with O_NOFOLLOW to avoid symlinks attacks. -While being at it also add O_CLOEXEC. - -usb-mtp only handles regular files and directories and ignores -everything else, so users should not see a difference. - -Because qemu ignores symlinks, carrying out a successful symlink attack -requires swapping an existing file or directory below rootdir for a -symlink and winning the race against the inotify notification to qemu. - -Fixes: CVE-2018-16872 -Cc: Prasad J Pandit -Cc: Bandan Das -Reported-by: Michael Hanselmann -Signed-off-by: Gerd Hoffmann -Reviewed-by: Michael Hanselmann -Message-id: 20181213122511.13853-1-kraxel@redhat.com ---- - hw/usb/dev-mtp.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c -index 100b7171f4..36c43b8c20 100644 ---- a/hw/usb/dev-mtp.c -+++ b/hw/usb/dev-mtp.c -@@ -653,13 +653,18 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) - { - struct dirent *entry; - DIR *dir; -+ int fd; - - if (o->have_children) { - return; - } - o->have_children = true; - -- dir = opendir(o->path); -+ fd = open(o->path, O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW); -+ if (fd < 0) { -+ return; -+ } -+ dir = fdopendir(fd); - if (!dir) { - return; - } -@@ -1007,7 +1012,7 @@ static MTPData *usb_mtp_get_object(MTPState *s, MTPControl *c, - - trace_usb_mtp_op_get_object(s->dev.addr, o->handle, o->path); - -- d->fd = open(o->path, O_RDONLY); -+ d->fd = open(o->path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW); - if (d->fd == -1) { - usb_mtp_data_free(d); - return NULL; -@@ -1031,7 +1036,7 @@ static MTPData *usb_mtp_get_partial_object(MTPState *s, MTPControl *c, - c->argv[1], c->argv[2]); - - d = usb_mtp_data_alloc(c); -- d->fd = open(o->path, O_RDONLY); -+ d->fd = open(o->path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW); - if (d->fd == -1) { - usb_mtp_data_free(d); - return NULL; -@@ -1658,7 +1663,7 @@ static void usb_mtp_write_data(MTPState *s) - 0, 0, 0, 0); - goto done; - } -- d->fd = open(path, O_CREAT | O_WRONLY, mask); -+ d->fd = open(path, O_CREAT | O_WRONLY | O_CLOEXEC | O_NOFOLLOW, mask); - if (d->fd == -1) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); --- -2.20.1 - diff --git a/gnu/packages/patches/qemu-CVE-2019-6778.patch b/gnu/packages/patches/qemu-CVE-2019-6778.patch deleted file mode 100644 index 315f2922da..0000000000 --- a/gnu/packages/patches/qemu-CVE-2019-6778.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fixes CVE-2019-6778: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6778 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a7104eda7dab99d0cdbd3595c211864cba415905 - -From a7104eda7dab99d0cdbd3595c211864cba415905 Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit -Date: Sun, 13 Jan 2019 23:29:48 +0530 -Subject: [PATCH] slirp: check data length while emulating ident function - -While emulating identification protocol, tcp_emu() does not check -available space in the 'sc_rcv->sb_data' buffer. It could lead to -heap buffer overflow issue. Add check to avoid it. - -Reported-by: Kira <864786842@qq.com> -Signed-off-by: Prasad J Pandit -Signed-off-by: Samuel Thibault ---- - slirp/tcp_subr.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c -index 4a9a5b5edc..23a841f26e 100644 ---- a/slirp/tcp_subr.c -+++ b/slirp/tcp_subr.c -@@ -634,6 +634,11 @@ tcp_emu(struct socket *so, struct mbuf *m) - socklen_t addrlen = sizeof(struct sockaddr_in); - struct sbuf *so_rcv = &so->so_rcv; - -+ if (m->m_len > so_rcv->sb_datalen -+ - (so_rcv->sb_wptr - so_rcv->sb_data)) { -+ return 1; -+ } -+ - memcpy(so_rcv->sb_wptr, m->m_data, m->m_len); - so_rcv->sb_wptr += m->m_len; - so_rcv->sb_rptr += m->m_len; --- -2.20.1 - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5535d7a421..2e5b1ce16e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -107,16 +107,14 @@ (define-public qemu (package (name "qemu") - (version "3.1.0") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (patches (search-patches "qemu-CVE-2018-16872.patch" - "qemu-CVE-2019-6778.patch")) (sha256 (base32 - "1z5bd5nfyjvhfi1s95labc82y4hjdjjkdabw931362ls0zghh1ba")))) + "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -180,13 +178,24 @@ exec smbd $@"))) (chmod "samba-wrapper" #o755) (install-file "samba-wrapper" libexec)) #t)) - (add-before 'check 'disable-test-qga + (add-before 'configure 'prevent-network-configuration (lambda _ + ;; Prevent the build from trying to use git to fetch from the net. + (substitute* "Makefile" + (("@./config.status") + "")) #t)) + (add-before 'check 'disable-unusable-tests + (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "tests/Makefile.include" ;; Comment out the test-qga test, which needs /sys and ;; fails within the build environment. (("check-unit-.* tests/test-qga" all) (string-append "# " all))) + (substitute* "tests/Makefile.include" + ;; Comment out the test-char test, which needs networking and + ;; fails within the build environment. + (("check-unit-.* tests/test-char" all) + (string-append "# " all))) #t))))) (inputs ; TODO: Add optional inputs. `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From f32c3d4d068c22b57d8759fb427be7a18a77f78f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 22 Aug 2019 11:47:54 +0200 Subject: gnu: bootstrap: Add ftp.gnu.org to '%bootstrap-base-urls'. * gnu/packages/bootstrap.scm (%bootstrap-base-urls): Add ftp.gnu.org/gnu/guix/bootstrap. --- gnu/packages/bootstrap.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 6cd3e13567..3b47847e33 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -290,7 +290,9 @@ or false to signal an error." (define %bootstrap-base-urls ;; This is where the initial binaries come from. - '("https://alpha.gnu.org/gnu/guix/bootstrap" + '("https://ftp.gnu.org/gnu/guix/bootstrap" + "https://alpha.gnu.org/gnu/guix/bootstrap" + "http://ftp.gnu.org/gnu/guix/bootstrap" "http://alpha.gnu.org/gnu/guix/bootstrap" "ftp://alpha.gnu.org/gnu/guix/bootstrap" "http://www.fdn.fr/~lcourtes/software/guix/packages" -- cgit v1.2.3 From 7f1d2dd35a317724058e89734cd2ec73828c82c7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Aug 2019 15:39:57 -0400 Subject: gnu: bootstrap: Update to the 20190815 bootstrap binaries. These new bootstrap binaries were built using Guix at commit 9e6256ba0f32ab12d61c914a3fed879dac881762, tagged as "bootstrap-20190815". * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Update the download URL. (%bootstrap-mescc-tools, %bootstrap-mes): Update the download URL and hash. --- gnu/packages/bootstrap.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3b47847e33..ee713db0cf 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2014, 2015, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong @@ -494,7 +494,7 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" + "/i686-linux/20190815/" "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 @@ -739,12 +739,12 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" - "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") + "/i686-linux/20190815/" + "mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 (base32 - "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz"))))))) + "0c3kklgghzh4q2dbpl6asb74cimp7hp6jscdwqwmzxbapgcl6582"))))))) (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) @@ -788,12 +788,12 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" + "/i686-linux/20190815/" "mes-minimal-stripped-0.19-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 (base32 - "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))) + "1q4xjpx6nbn44kxnilpgl12bhpmwy2bblzwszc2ci7xkf400jcpv"))))))) (supported-systems '("i686-linux" "x86_64-linux")) (synopsis "Bootstrap binaries of Mes") (description synopsis) -- cgit v1.2.3 From c55fae452032aa4b1b63406983e9abdf70adc957 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 28 Aug 2019 23:56:10 +0200 Subject: gnu: bison-boot0: Build sequentially. This is a followup to 2c35ae82192fd6f1732b15fa41aec87aa61a1879 and b1593c1c4fd8f4fc6df4c43cab51334426e3aa76. * gnu/packages/commencement.scm (bison-boot0)[arguments]: Add #:parallel-build? and #:parallel-tests? on x86. --- gnu/packages/commencement.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 69d1f87605..79f2e49008 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1719,6 +1719,17 @@ exec " gcc "/bin/" program (arguments `(#:tests? #f ;... and thus disable tests + ;; XXX: These flags should be unconditional, but for now + ;; we just add them on x86 to avoid a full rebuild. + ;; TODO: On the next core-updates, use + ;; 'substitute-keyword-arguments' to inherit them from + ;; BISON. + ,@(if (member (%current-system) + '("x86_64-linux" "i686-linux")) + '(#:parallel-build? #f + #:parallel-tests? #f) + '()) + ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) -- cgit v1.2.3 From bd3d71cb16de546b534be7a3d03880922f6a1c07 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 13:15:30 +0200 Subject: gnu: hdf4: Build with libtirpc. * gnu/packages/patches/hdf4-tirpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (hdf4)[source](patches): Use it. [inputs]: Add LIBTIRPC. [arguments]: Adjust #:configure-flags accordingly. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 12 +++++++++--- gnu/packages/patches/hdf4-tirpc.patch | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/hdf4-tirpc.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index fe476534c2..b40472709f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -944,6 +944,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ + %D%/packages/patches/hdf4-tirpc.patch \ %D%/packages/patches/hdf5-config-date.patch \ %D%/packages/patches/hdf5-mpi-deprecations.patch \ %D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38bb81242f..9e515fd3d1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages netpbm) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) #:use-module (gnu packages popt) #:use-module (gnu packages perl) @@ -684,7 +685,8 @@ computations.") (base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm")) (patches (search-patches "hdf4-architectures.patch" "hdf4-reproducibility.patch" - "hdf4-shared-fortran.patch")))) + "hdf4-shared-fortran.patch" + "hdf4-tirpc.patch")))) (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran) @@ -692,10 +694,14 @@ computations.") ("flex" ,flex))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc))) (arguments `(#:parallel-tests? #f - #:configure-flags '("--enable-shared") + #:configure-flags (list "--enable-shared" + (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "libtirpc") + "/include/tirpc")) #:phases (modify-phases %standard-phases ;; This is inspired by two of Debian's patches. diff --git a/gnu/packages/patches/hdf4-tirpc.patch b/gnu/packages/patches/hdf4-tirpc.patch new file mode 100644 index 0000000000..3f436e3887 --- /dev/null +++ b/gnu/packages/patches/hdf4-tirpc.patch @@ -0,0 +1,33 @@ +Build with libtirpc on all architectures because glibc no longer provides +SunRPC support. + +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -23635,10 +23635,13 @@ + *-pc-cygwin*) + LIBS="$LIBS -ltirpc" + CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; ++ *-linux-gnu) ++ LIBS="$LIBS -ltirpc" ++ CPPFLAGS="$CPPFLAGS" ;; + *) ;; + esac + +-if test "X$BUILD_XDR" != "Xyes"; then ++if test "X$BUILD_XDR" = "Xyes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -23693,9 +23696,9 @@ + ## but we need to make sure that it is present on the system. Do that here, + ## The SunRPC of the glibc has been replaced by a TI-RPC (Transport Independent RPC) library for IPv6 support + case "$host" in +- *-pc-cygwin*) ++ *) + HAVE_RPC="yes" +- ac_fn_c_check_header_mongrel "$LINENO" "rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default" + if test "x$ac_cv_header_rpc_h" = xyes; then : + : + else -- cgit v1.2.3 From 25bdbb618a4947e8d5dcf14c440bf58fad58165f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 18:49:32 +0200 Subject: gnu: hdf-eos2: Add libtirpc input. * gnu/packages/maths.scm (hdf-eos2)[inputs]: Add LIBTIRPC. --- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9e515fd3d1..5735c17bc6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1050,8 +1050,11 @@ implemented in C.") `(("gfortran" ,gfortran))) (inputs `(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API + ;; XXX: These inputs are really dependencies of hdf4. ("zlib" ,zlib) ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc) + ("gctp" ,gctp))) (arguments `( #:configure-flags '("--enable-install-include" "--enable-shared" -- cgit v1.2.3 From 4fb59c9e4dbb6455ef273c83113472be9c8bb51e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 16:17:39 +0200 Subject: gnu: classpath-bootstrap: Remove call to free. Fixes . * gnu/packages/java.scm (classpath-bootstrap)[arguments]: Add build phase "remove-call-to-free" to let us build ant-bootstrap later. --- gnu/packages/java.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 403c446a82..cde32e451a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -152,6 +152,17 @@ and binary format defined in The Java Virtual Machine Specification.") "--disable-gjdoc") #:phases (modify-phases %standard-phases + ;; XXX: This introduces a memory leak as we remove a call to free up + ;; memory for the file name string. This was necessary because of a + ;; runtime error that would have prevented us from building + ;; ant-bootstrap later. See https://issues.guix.gnu.org/issue/36685 + ;; for the gnarly details. + (add-after 'unpack 'remove-call-to-free + (lambda _ + (substitute* "native/jni/java-io/java_io_VMFile.c" + (("result = cpio_isFileExists.*" m) + (string-append m "\n//"))) + #t)) (add-after 'install 'install-data (lambda _ (invoke "make" "install-data")))))) (native-inputs -- cgit v1.2.3 From 22bd735a3f060206ba42bd2542a4b82ff5e2bf6f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 16:22:53 +0200 Subject: gnu: jamvm-1-bootstrap: Use older GCC and glibc. * gnu/packages/java.scm (jamvm-1-bootstrap)[native-inputs]: Add GCC version 5 and glibc 2.28. --- gnu/packages/java.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cde32e451a..fee0970e74 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -202,6 +202,11 @@ language.") `(("classpath" ,classpath-bootstrap) ("jikes" ,jikes) ("zlib" ,zlib))) + ;; When built with a recent GCC and glibc the configure step of icedtea-6 + ;; fails with an invalid instruction error. + (native-inputs + `(("gcc" ,gcc-5) + ("libc" ,glibc-2.28))) (home-page "http://jamvm.sourceforge.net/") (synopsis "Small Java Virtual Machine") (description "JamVM is a Java Virtual Machine conforming to the JVM -- cgit v1.2.3 From 306c1e614d617f02e9943c95a829395a2bc713fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 16:23:54 +0200 Subject: gnu: icedtea-6: Patch required freetype version. * gnu/packages/java.scm (icedtea-6)[arguments]: Patch hardcoded version string for freetype version check. --- gnu/packages/java.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fee0970e74..e2c47e417f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -756,6 +756,9 @@ machine."))) (with-directory-excursion "openjdk" (invoke "tar" "xvf" (assoc-ref inputs "hotspot-src")) (rename-file "hg-checkout" "hotspot")) + (substitute* "patches/freetypeversion.patch" + (("REQUIRED_FREETYPE_VERSION = 2.2.1") + "REQUIRED_FREETYPE_VERSION = 2.10.1")) (substitute* "Makefile.in" (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;") "echo \"trust me\";") -- cgit v1.2.3 From 64ad3989d7ebe85c73d2f49ac65eebdbfbee3bf3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 16:25:08 +0200 Subject: gnu: icedtea-6: Remove old GCC. * gnu/packages/java.scm (icedtea-6)[native-inputs]: Remove gcc-4.9. --- gnu/packages/java.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2c47e417f..51e738d864 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -926,7 +926,6 @@ machine."))) ("fastjar" ,fastjar) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gcc" ,gcc-4.9) ; there's a segmentation fault when compiling with gcc-5 or gcc-7 ("gtk" ,gtk+-2) ("gawk" ,gawk) ("giflib" ,giflib) -- cgit v1.2.3 From 6b7e09ae6bb78c9e2d07a259d93d9b4911234f4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 16:25:47 +0200 Subject: gnu: icedtea-7: Patch code to enable build with newer glibc. * gnu/packages/java.scm (icedtea-7)[arguments]: Add build phase "patch-bitrot". (icedtea-8)[arguments]: Remove phase "patch-bitrot". --- gnu/packages/java.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 51e738d864..def2c8d92d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1125,6 +1125,18 @@ bootstrapping purposes.") ((name . _) name)) inputs)))) #t))) + (add-after 'unpack 'patch-bitrot + (lambda _ + (substitute* '("patches/boot/revert-6973616.patch" + "openjdk.src/jdk/make/common/shared/Defs-versions.gmk") + (("REQUIRED_FREETYPE_VERSION = 2.2.1") + "REQUIRED_FREETYPE_VERSION = 2.10.1")) + ;; As of attr 2.4.48 this header is no longer + ;; included. It is provided by the libc instead. + (substitute* '("configure" + "openjdk.src/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c") + (("attr/xattr.h") "sys/xattr.h")) + #t)) (add-after 'unpack 'fix-x11-extension-include-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk" @@ -1604,6 +1616,7 @@ IcedTea build harness.") (delete 'patch-paths) (delete 'set-additional-paths) (delete 'patch-patches) + (delete 'patch-bitrot) ;; Prevent the keytool from recording the current time when ;; adding certificates at build time. (add-after 'unpack 'patch-keystore -- cgit v1.2.3 From d7303a048da4d400c203be113235a9fbb9673103 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Sep 2019 10:46:14 +0200 Subject: bootstrap: mes-boot: Fix at 0.19. This allows updating Mes without triggering a rebuild. * gnu/packages/commencement.scm (mes-boot): Fix 0.19. --- gnu/packages/commencement.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 63f1dcf015..7f67fa6441 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -89,6 +89,14 @@ (package (inherit mes) (name "mes-boot") + (version "0.19") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) (inputs '()) (propagated-inputs '()) (native-inputs -- cgit v1.2.3 From 0b2ea78173f05c417a9002e52e2b36b139074124 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Sep 2019 23:02:00 +0200 Subject: maint: Placate 'assert-no-store-file-names'. Reported by Vagrant Cascadian . * Makefile.am (assert-no-store-file-names): Exclude "binutils-boot-2.20.1a.patch" since it contains a store file name as a comment. * gnu/packages/commencement.scm (glibc-mesboot0): Use an ellipsis instead of an actual store file name in comment. --- Makefile.am | 1 + gnu/packages/commencement.scm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/Makefile.am b/Makefile.am index 955e2e8c47..eefce7a3ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -815,6 +815,7 @@ assert-no-store-file-names: --exclude=guix-manual.pot --exclude=guix-manual.*.po \ --exclude=guix-prettify.el \ --exclude=ChangeLog* \ + --exclude=binutils-boot-2.20*.patch \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7f67fa6441..fd98c80dc3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -753,7 +753,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) #t))) ;; glibc-2.2.5 needs a more classic invocation of configure - ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type + ;; configure: warning: CONFIG_SHELL=/gnu/store/…-bash-minimal-4.4.12/bin/bash: invalid host type (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) -- cgit v1.2.3 From b938892551816aedd01fd32b7eb1d5e061afce32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Sep 2019 23:45:36 +0200 Subject: gnu: go@1.12: Skip flaky GC test. Fixes . * gnu/packages/patches/go-skip-gc-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/golang.scm (go-1.12)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/golang.scm | 6 ++++-- gnu/packages/patches/go-skip-gc-test.patch | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/go-skip-gc-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 7f288b3e7c..ce4510ae4a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -911,6 +911,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ + %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpsbabel-minizip.patch \ %D%/packages/patches/gpsbabel-qstring.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b12fc4b4bd..128e62beef 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo -;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 Petter ;;; Copyright © 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2017 Sergei Trofimovich @@ -41,6 +41,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system go) + #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages gcc) #:use-module (gnu packages base) @@ -408,7 +409,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")))) + "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")) + (patches (search-patches "go-skip-gc-test.patch")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) diff --git a/gnu/packages/patches/go-skip-gc-test.patch b/gnu/packages/patches/go-skip-gc-test.patch new file mode 100644 index 0000000000..2baab97580 --- /dev/null +++ b/gnu/packages/patches/go-skip-gc-test.patch @@ -0,0 +1,17 @@ +Skip a GC test known to be flaky: + + https://issues.guix.gnu.org/issue/37425 + https://github.com/golang/go/issues/27636 + +--- go/src/runtime/gc_test.go 2019-09-16 23:10:18.200680387 +0200 ++++ go/src/runtime/gc_test.go 2019-09-16 23:11:50.324360646 +0200 +@@ -27,6 +27,9 @@ func TestGcSys(t *testing.T) { + if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" { + t.Skip("skipping test; GOOS=linux GOARCH=arm64 https://github.com/golang/go/issues/27636") + } ++ if runtime.GOOS == "linux" { ++ t.Skip("skipping test; GOOS=linux https://issues.guix.gnu.org/issue/37425") ++ } + got := runTestProg(t, "testprog", "GCSys") + want := "OK\n" + if got != want { -- cgit v1.2.3 From ae71bef532d6b1c9d1481a3ac65827f148b1e45b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Sep 2019 11:31:37 +0200 Subject: gnu: go@1.12: Apply patch from a build phase. This is a followup to b938892551816aedd01fd32b7eb1d5e061afce32. * gnu/packages/golang.scm (go-1.12)[source]: Remove 'patches'. [arguments]: In 'pre-build' phase, invoke "patch". [native-inputs]: Add "go-skip-gc-test.patch". --- gnu/packages/golang.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 128e62beef..51be20b066 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -409,8 +409,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")) - (patches (search-patches "go-skip-gc-test.patch")))) + "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -425,6 +424,12 @@ in the style of communicating sequential processes (@dfn{CSP}).") (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (output (assoc-ref outputs "out"))) + ;; Having the patch in the 'patches' field of breaks + ;; the 'TestServeContent' test due to the fact that + ;; timestamps are reset. Thus, apply it from here. + (invoke "patch" "-p2" "--force" "-i" + (assoc-ref inputs "go-skip-gc-test.patch")) + ;; A side effect of these test scripts is testing ;; cgo. Attempts at using cgo flags and directives with these ;; scripts as specified here (https://golang.org/cmd/cgo/) @@ -576,6 +581,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") #t))))))) (native-inputs `(("go" ,go-1.4) + ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch")) ,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") `(("gold" ,binutils-gold))) -- cgit v1.2.3 From 2c6ebeb72b3d571d180858407c664a6e80441cd5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 12:33:35 +0200 Subject: gnu: perl-glib: Update to 1.3291. * gnu/packages/glib.scm (perl-glib): Update to 1.3291. --- gnu/packages/glib.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3a50347f86..ad000ad838 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong @@ -699,7 +699,7 @@ useful for C++.") (define-public perl-glib (package (name "perl-glib") - (version "1.329") + (version "1.3291") (source (origin (method url-fetch) (uri (string-append @@ -707,7 +707,7 @@ useful for C++.") version ".tar.gz")) (sha256 (base32 - "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v")))) + "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr")))) (build-system perl-build-system) (native-inputs `(("perl-extutils-depends" ,perl-extutils-depends) -- cgit v1.2.3 From a747ae609b683f205c4c253ad033114c92d4d093 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 12:56:54 +0200 Subject: gnu: android-libutils: Build with GCC 5. * gnu/packages/android.scm (android-libutils)[native-inputs]: Add gcc-5. --- gnu/packages/android.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 3c7ef447f3..fd900aaf03 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docker) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages linux) #:use-module (gnu packages pcre) @@ -615,7 +616,8 @@ file system.") ("android-libcutils" ,android-libcutils))) (native-inputs `(("android-bionic-uapi" ,android-bionic-uapi) - ("android-liblog" ,android-liblog))) + ("android-liblog" ,android-liblog) + ("gcc" ,gcc-5))) ; XXX: fails to build with GCC 7 (home-page "https://developer.android.com/") (synopsis "Android utility library") (description "@code{android-libutils} provides utilities for Android NDK developers.") -- cgit v1.2.3 From 7670efefe4fb4aca12cb19ea5d89ff37c48e3ea6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Sep 2019 13:58:55 +0200 Subject: gnu: fontforge: Update to 20190801. * gnu/packages/fontutils.scm (fontforge): Update to 20190801. [source](patches): Remove. The patch served by github.com had been modified in place. --- gnu/packages/fontutils.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 041c1b3b6b..e355f7bb89 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -567,27 +567,14 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190413") + (version "20190801") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) - (patches (list (origin - ;; This patch is required to fix a segfault on i686: - ;; . - ;; It is a squashed version of these commits: - ;; . - (method url-fetch) - (uri (string-append - "https://github.com/fontforge/fontforge/commit/" - "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch")) - (file-name "fontforge-scripting-array-reference.patch") - (sha256 - (base32 - "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc"))))) (sha256 - (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) + (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 316fa45ea4ec54a2363a22ef92c5e412bb83115a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 14:31:41 +0200 Subject: gnu: gcc-arm-none-eabi-4.9: Build with GCC 5. * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[native-inputs]: Add gcc-5. --- gnu/packages/embedded.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index a65998c369..1e4c4a0da8 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Efraim Flashner @@ -85,6 +85,7 @@ (origin-patches (package-source xgcc)))))) (native-inputs `(("flex" ,flex) + ("gcc" ,gcc-5) ,@(package-native-inputs xgcc))) (arguments (substitute-keyword-arguments (package-arguments xgcc) -- cgit v1.2.3 From bed0c4c83d930880c96fba1139e8a8b7086b2cb5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 15:01:37 +0200 Subject: gnu: alsa-modular-synth: Build with GCC 5. * gnu/packages/audio.scm (alsa-modular-synth)[native-inputs]: Add gcc-5. --- gnu/packages/audio.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e1d7412bfe..1209e94e25 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -145,7 +145,8 @@ ("qtbase" ,qtbase) ("qttools" ,qttools))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("gcc" ,gcc-5))) (home-page "http://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") (description -- cgit v1.2.3 From 081f767e8c396949997c9c61adec0a7090c708d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 15:03:51 +0200 Subject: gnu: avr-gcc-4.9: Build with GCC 5. * gnu/packages/avr.scm (avr-gcc-4.9)[native-inputs]: Add gcc-5. --- gnu/packages/avr.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index eaa3c7d046..6eb0ad8dbf 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -67,7 +67,10 @@ (files '("avr/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") - (files '("avr/lib")))))))) + (files '("avr/lib"))))) + (native-inputs + `(("gcc" ,gcc-5) + ,@(package-native-inputs xgcc)))))) (define-public avr-gcc-5 (package -- cgit v1.2.3 From 923b2b5a48de6c986cab26ee45db1f0e9aaa7269 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 15:56:39 +0200 Subject: gnu: avr-libc: Unset CPATH to fix the build. * gnu/packages/avr.scm (avr-libc)[arguments]: Unset CPATH variable. --- gnu/packages/avr.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 6eb0ad8dbf..1f99f636e0 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -97,11 +97,12 @@ (modify-phases %standard-phases (add-before 'unpack 'fix-cpath (lambda _ - ;; C_INCLUDE_PATH poses issues for cross-building, leading to - ;; failures when building avr-libc on 64-bit systems. Simply - ;; unsetting it allows the build to succeed because it doesn't - ;; try to use any of the native system's headers. + ;; C_INCLUDE_PATH and CPATH pose issues for cross-building, + ;; leading to failures when building avr-libc on 64-bit systems. + ;; Simply unsetting them allows the build to succeed because it + ;; doesn't try to use any of the native system's headers. (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPATH") #t))))) (native-inputs `(("avr-binutils" ,avr-binutils) ("avr-gcc" ,avr-gcc))) -- cgit v1.2.3 From fb1d8d2baab907493367930e8069f937a5187b61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Sep 2019 16:04:44 +0200 Subject: gnu: klick: Fix build with GCC 7. * gnu/packages/music.scm (klick)[arguments]: Pass -fpermissive to compiler. --- gnu/packages/music.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2b30308861..b81c2cb782 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -777,6 +777,11 @@ audio and video).") #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases + (add-after 'unpack 'be-permissive + (lambda _ + (substitute* "SConstruct" + (("'-Wall'") "'-Wall', '-fpermissive'")) + #t)) (add-after 'unpack 'replace-removed-scons-syntax (lambda _ (substitute* "SConstruct" -- cgit v1.2.3 From 3a2efbc8670f72a524cc7290e11559cdb42852a4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Sep 2019 12:21:19 +0200 Subject: gnu: python-libxml2, itstool: Provide crash-free variants. Fixes . * gnu/packages/patches/python-libxml2-utf8.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/xml.scm (python-libxml2/fixed): New variable. * gnu/packages/glib.scm (itstool/fixed): New variable. * gnu/packages/gnome.scm (gnumeric)[native-inputs]: Use ITSTOOL/FIXED instead of ITSTOOL. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 11 +++++++ gnu/packages/gnome.scm | 2 +- gnu/packages/patches/python-libxml2-utf8.patch | 40 ++++++++++++++++++++++++++ gnu/packages/xml.scm | 15 +++++++++- 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-libxml2-utf8.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 63d55c5018..5705494090 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1252,6 +1252,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ + %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ad000ad838..a2f0f2fd8e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -65,6 +65,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (srfi srfi-1) ;; Export variables up-front to allow circular dependency with the 'xorg' ;; module. @@ -495,6 +496,16 @@ information in their documents, such as whether a particular element should be translated.") (license license:gpl3+))) +(define-public itstool/fixed + ;; This variant fixes a python-libxml2 crash when processing UTF-8 + ;; sequences: . Since the issue is quite rare, + ;; create this variant here to avoid a full rebuild. + (package/inherit + itstool + (inputs + `(("python-libxml2" ,python-libxml2/fixed) + ,@(alist-delete "python-libxml2" (package-inputs itstool)))))) + (define dbus-glib (package (name "dbus-glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 520d04d75f..03550b6fa8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2167,7 +2167,7 @@ Hints specification (EWMH).") `(("bison" ,bison) ("docbook-xml" ,docbook-xml) ("intltool" ,intltool) - ("itstool" ,itstool) + ("itstool" ,itstool/fixed) ;see ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://www.gnumeric.org") diff --git a/gnu/packages/patches/python-libxml2-utf8.patch b/gnu/packages/patches/python-libxml2-utf8.patch new file mode 100644 index 0000000000..e39672faa1 --- /dev/null +++ b/gnu/packages/patches/python-libxml2-utf8.patch @@ -0,0 +1,40 @@ +This patch fixes a crash in the libxml2 bindings for Python 3.x +that 'itstool' stumbles upon when processing UTF-8 data: + + https://issues.guix.gnu.org/issue/37468 + +Patch by Jan Matejek +from . + +--- libxml2-2.9.5.orig/python/libxml.c ++++ libxml2-2.9.5/python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 78b9b713e5..b8f3774039 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu @@ -164,6 +164,7 @@ project (but it is usable outside of the Gnome platform).") (license license:x11))) (define-public python-libxml2 + ;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle. (package/inherit libxml2 (name "python-libxml2") (build-system python-build-system) @@ -191,6 +192,18 @@ project (but it is usable outside of the Gnome platform).") (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) +(define-public python-libxml2/fixed + ;; This variant fixes a crash when processing UTF-8 sequences: + ;; + ;; TODO: Merge with 'python-libxml2' on the next rebuild cycle. + (package/inherit + python-libxml2 + (version (string-append (package-version python-libxml2) "-1")) + (source (origin + (inherit (package-source libxml2)) + (patches (cons (search-patch "python-libxml2-utf8.patch") + (origin-patches (package-source libxml2)))))))) + (define-public python2-libxml2 (package-with-python2 python-libxml2)) -- cgit v1.2.3 From 4b577961d736d53063022d58483f0200ef860b2d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Sep 2019 21:27:44 +0200 Subject: gnu: instantmusic: Fix build failure. This is a followup to 6bbb37a545912c6bb2513ee08587ee4fe39cc330. * gnu/packages/music.scm (instantmusic): Move 'fix-file-permissions' phase before 'install' rather than before 'check'. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b81c2cb782..1f6835f66c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018 nee ;;; Copyright © 2018 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Gabriel Hondet ;;; Copyright © 2019 Timotej Lazar @@ -2794,7 +2794,7 @@ websites such as Libre.fm.") (add-before 'build 'change-directory (lambda _ (chdir "instantmusic-0.1") #t)) - (add-before 'check 'fix-file-permissions + (add-before 'install 'fix-file-permissions (lambda _ ;; Fix some read-only files that would cause a build failure (for-each (cut chmod <> #o644) -- cgit v1.2.3 From 1f78a9996428fe0082eacd55767397f4f5a7758a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Sep 2019 23:49:57 +0200 Subject: gnu: perf: Really build without '-Werror'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until this change, it would fail to build with: In file included from /tmp/guix-build-perf-5.2.15.drv-0/linux-5.2.15/tools/include/uapi/linux/ethtool.h:19:0, from xsk.c:18: /gnu/store/…-linux-libre-headers-4.19.56/include/linux/if_ether.h:165:1: error: packed attribute is unnecessary for 'ethhdr' [-Werror=packed] * gnu/packages/linux.scm (perf)[arguments]: In 'configure' phase, remove "-Werror" from 'tools/lib/bpf/Makefile'. --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index be18788687..b65303ae6f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3082,6 +3082,10 @@ in a digital read-out.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs #:allow-other-keys) + ;; Don't build with '-Werror', really. + (substitute* "tools/lib/bpf/Makefile" + (("-Werror") "")) + (setenv "SHELL_PATH" (which "bash")) (chdir "tools/perf") #t))) -- cgit v1.2.3 From 27130ee8f7339d0eb84e87d620015dc493a566ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Sep 2019 00:11:13 +0200 Subject: gnu: libsmpeg: Fix build failure with GCC 7. * gnu/packages/video.scm (libsmpeg)[arguments]: New field. --- gnu/packages/video.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b6c32fabdb..11219589b6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2515,6 +2515,10 @@ Other features include a live preview and live streaming.") (base32 "18yfkr70lr1x1hc8snn2ldnbzdcc7b64xmkqrfk8w59gpg7sl1xn")))) (build-system gnu-build-system) + (arguments + ;; libsmpeg fails to build with -std=c++11, which is the default with + ;; GCC 7. Also, 'configure' does CXXFLAGS=$CFLAGS, hence this hack. + '(#:configure-flags '("CFLAGS=-O2 -g -std=c++03"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) -- cgit v1.2.3 From 624ed47d4179418f1018ec9470b6bc4db04496ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Sep 2019 11:40:08 +0200 Subject: gnu: perl-catalyst-runtime: Update to 5.90124. * gnu/packages/web.scm (perl-catalyst-runtime): Update to 5.90124. [propagated-inputs]: Add PERL-PERLIO-UTF8_STRICT. --- gnu/packages/web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f7730f3992..a269de9936 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1977,15 +1977,15 @@ MIME type directly to the browser, without being processed through Catalyst.") (define-public perl-catalyst-runtime (package (name "perl-catalyst-runtime") - (version "5.90119") + (version "5.90124") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" + (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/" "Catalyst-Runtime-" version ".tar.gz")) (sha256 (base32 - "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr")))) + "001yk1i0xwn4v308qx15nvnp6v9qfdigdlvz1rgw5zpnq7kwnq1a")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) @@ -2008,6 +2008,7 @@ MIME type directly to the browser, without being processed through Catalyst.") ("perl-moosex-methodattributes" ,perl-moosex-methodattributes) ("perl-namespace-clean" ,perl-namespace-clean) ("perl-path-class" ,perl-path-class) + ("perl-perlio-utf8-strict" ,perl-perlio-utf8_strict) ("perl-plack" ,perl-plack) ("perl-plack-middleware-fixmissingbodyinredirect" ,perl-plack-middleware-fixmissingbodyinredirect) -- cgit v1.2.3 From e5efdbce21a0afcbb3e73cc7b59111ccf62cb532 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Sep 2019 11:40:53 +0200 Subject: gnu: perl-catalyst-view-json: Update to 0.37. * gnu/packages/web.scm (perl-catalyst-view-json): Update to 0.37. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a269de9936..5b1f60cfdd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2097,15 +2097,15 @@ table based report in a variety of formats (CSV, HTML, etc.).") (define-public perl-catalyst-view-json (package (name "perl-catalyst-view-json") - (version "0.36") + (version "0.37") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/" + (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "Catalyst-View-JSON-" version ".tar.gz")) (sha256 (base32 - "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl")))) + "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) -- cgit v1.2.3 From f77993bb50ad2bb02664697d81d4b12f2a0923b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 24 Sep 2019 14:00:58 +0200 Subject: gnu: Add locale packages for glibc 2.28. * gnu/packages/base.scm (glibc-locales-2.28, glibc-utf8-locales-2.28): New variables. (glibc-locales-2.27, glibc-utf8-locales-2.27): Deprecate. --- gnu/packages/base.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index ebaa93f092..4e80a2fadb 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1126,12 +1126,19 @@ test environments.") (define-public glibc-utf8-locales (make-glibc-utf8-locales glibc)) -(define-public glibc-locales-2.27 - (package (inherit (make-glibc-locales glibc-2.27)) - (name "glibc-locales-2.27"))) +;; Packages provided to ease use of binaries linked against the previous libc. +(define-public glibc-locales-2.28 + (package (inherit (make-glibc-locales glibc-2.28)) + (name "glibc-locales-2.28"))) +(define-public glibc-utf8-locales-2.28 + (package (inherit (make-glibc-utf8-locales glibc-2.28)) + (name "glibc-utf8-locales-2.28"))) + +;; These should no longer be needed. (define-public glibc-utf8-locales-2.27 - (package (inherit (make-glibc-utf8-locales glibc-2.27)) - (name "glibc-utf8-locales-2.27"))) + (deprecated-package "glibc-utf8-locales-2.27" glibc-utf8-locales-2.28)) +(define-public glibc-locales-2.27 + (deprecated-package "glibc-locales-2.27" glibc-locales-2.28)) (define-public which (package -- cgit v1.2.3 From 8da3513fc8e303f038ae505908baea9e6d66b365 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 25 Sep 2019 11:45:39 +0200 Subject: gnu: Add ccls. * gnu/packages/cpp.scm (ccls): New variable. --- gnu/packages/cpp.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 9e95bacd65..4a28a394bf 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (gnu packages web)) (define-public libzen (package @@ -276,3 +278,34 @@ intuitive syntax and trivial integration.") (description "xtl is a C++ header-only template library providing basic tools (containers, algorithms) used by other QuantStack packages.") (license license:bsd-3))) + +(define-public ccls + (package + (name "ccls") + (version "0.20190823.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MaskRay/ccls") + (commit version))) + (sha256 + (base32 "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; no check target. + (inputs + `(("rapidjson" ,rapidjson))) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm))) + (home-page "https://github.com/MaskRay/ccls") + (synopsis "C/C++/Objective-C language server") + (description + "@code{ccls} is a server implementing the Language Server Protocol (LSP) +for C, C++ and Objective-C languages. It uses @code{clang} to perform static +code analysis and supports cross references, hierarchies, completion and +syntax highlighting. @code{ccls} is derived from @code{cquery} which is not +maintained anymore.") + (license license:asl2.0))) -- cgit v1.2.3 From 308eb5c11a885768f81fb6136fd4d30b4639fe04 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 24 Sep 2019 20:23:31 +0200 Subject: gnu: gcc: Fix mingw cross compiler. * gnu/packages/patches/gcc-7-cross-mingw.patch: New file. * gnu/packages/cross-base.scm (cross-gcc-patches): Add XGCC parameter; update caller. Use it for target mingw and gcc >= 7. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cross-base.scm | 13 ++++++++----- gnu/packages/patches/gcc-7-cross-mingw.patch | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gcc-7-cross-mingw.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2fcd2648ed..e37c24a7ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -853,6 +853,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-6-cross-environment-variables.patch \ %D%/packages/patches/gcc-6-source-date-epoch-1.patch \ %D%/packages/patches/gcc-6-source-date-epoch-2.patch \ + %D%/packages/patches/gcc-7-cross-mingw.patch \ %D%/packages/patches/gcc-8-cross-environment-variables.patch \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 78dae7431a..7108000f06 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Marius Bakke @@ -190,13 +190,16 @@ base compiler and using LIBC (which may be either a libc package or #f.)" '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) #t)))))))))) -(define (cross-gcc-patches target) - "Return GCC patches needed for TARGET." +(define (cross-gcc-patches xgcc target) + "Return GCC patches needed for XGCC and TARGET." (cond ((string-prefix? "xtensa-" target) ;; Patch by Qualcomm needed to build the ath9k-htc firmware. (search-patches "ath9k-htc-firmware-gcc.patch")) ((target-mingw? target) - (search-patches "gcc-4.9.3-mingw-gthr-default.patch")) + (append (search-patches "gcc-4.9.3-mingw-gthr-default.patch") + (if (version>=? (package-version xgcc) "7.0") + (search-patches "gcc-7-cross-mingw.patch") + '()))) (else '()))) (define (cross-gcc-snippet target) @@ -229,7 +232,7 @@ target that libc." ((version>=? (package-version xgcc) "8.0") (search-patch "gcc-8-cross-environment-variables.patch")) ((version>=? (package-version xgcc) "6.0") (search-patch "gcc-6-cross-environment-variables.patch")) (else (search-patch "gcc-cross-environment-variables.patch"))) - (cross-gcc-patches target)))) + (cross-gcc-patches xgcc target)))) (modules '((guix build utils))) (snippet (cross-gcc-snippet target)))) diff --git a/gnu/packages/patches/gcc-7-cross-mingw.patch b/gnu/packages/patches/gcc-7-cross-mingw.patch new file mode 100644 index 0000000000..eec6f88953 --- /dev/null +++ b/gnu/packages/patches/gcc-7-cross-mingw.patch @@ -0,0 +1,24 @@ +This fixes + +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc: In function ‘void* __gnu_cxx::aligned_alloc(std::size_t, std::size_t)’: +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: error: ‘memalign’ was not declared in this scope + return memalign (al, sz); + ^~~~~~~~ +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: note: suggested alternative: ‘max_align_t’ + return memalign (al, sz); + ^~~~~~~~ + max_align_t + +diff --git a/libstdc++-v3/libsupc++/new_opa.cc b/libstdc++-v3/libsupc++/new_opa.cc +index 94e79cadb0e..084900e0daf 100644 +--- a/libstdc++-v3/libsupc++/new_opa.cc ++++ b/libstdc++-v3/libsupc++/new_opa.cc +@@ -39,6 +39,8 @@ extern "C" void *memalign(std::size_t boundary, std::size_t size); + # endif + #endif + ++#define memalign _aligned_malloc ++ + using std::new_handler; + using std::bad_alloc; + -- cgit v1.2.3 From 772ca8e4f62d5b74286e39652b33afb817e17ca2 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 27 Sep 2019 10:46:06 +0200 Subject: gnu: supercollider: Fix build and update to 3.10.3. * gnu/packages/patches/supercollider-boost-1.70-build-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/audio.scm (supercollider): Update to 3.10.3 and apply the previous patch to fix build with boost-1.70. Remove outdated 'fix-build-with-boost-1.68 phase. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 13 ++++------ .../supercollider-boost-1.70-build-fix.patch | 28 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/supercollider-boost-1.70-build-fix.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index e37c24a7ca..bee5b7024a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1328,6 +1328,7 @@ dist_patch_DATA = \ %D%/packages/patches/strace-ipc-tests.patch \ %D%/packages/patches/streamlink-update-test.patch \ %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \ + %D%/packages/patches/supercollider-boost-1.70-build-fix.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 36fc434160..f1a45bc1ca 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -2177,16 +2178,18 @@ background file post-processing.") (define-public supercollider (package (name "supercollider") - (version "3.10.2") + (version "3.10.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/supercollider/supercollider" "/releases/download/Version-" version "/SuperCollider-" version "-Source-linux.tar.bz2")) + (patches + (search-patches "supercollider-boost-1.70-build-fix.patch")) (sha256 (base32 - "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq")))) + "0srm6wbazidkrd4ckjy4ypyhkdwcnx2i7k9msjyngalh0mrc9zz1")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" @@ -2198,12 +2201,6 @@ background file post-processing.") (ice-9 ftw)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-build-with-boost-1.68 - (lambda _ - (substitute* "server/supernova/utilities/time_tag.hpp" - (("(time_duration offset = .+ microseconds\\().*" _ m) - (string-append m "static_cast(get_nanoseconds()/1000));\n"))) - #t)) (add-after 'unpack 'rm-bundled-libs (lambda _ ;; The build system doesn't allow us to unbundle the following diff --git a/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch b/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch new file mode 100644 index 0000000000..073044fccb --- /dev/null +++ b/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch @@ -0,0 +1,28 @@ +Patches taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch?id=a420618dc766bba0654dbe0ef67008fdc5e901c6 to fix supercollider build with boost 1.70. + +diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp +index 5116a1be87..96e937ec25 100644 +--- a/server/supernova/sc/sc_osc_handler.cpp ++++ b/server/supernova/sc/sc_osc_handler.cpp +@@ -728,7 +728,8 @@ void sc_osc_handler::tcp_connection::handle_message() { + + + void sc_osc_handler::start_tcp_accept(void) { +- tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service()); ++ tcp_connection::pointer new_connection = ++ tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context()); + + tcp_acceptor_.async_accept( + new_connection->socket(), +diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp +index 35b8ab5ad..a7c191f2d 100644 +--- a/server/supernova/utilities/utils.hpp ++++ b/server/supernova/utilities/utils.hpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + #include + #include -- cgit v1.2.3 From 1fdab9d3b3e78b0c90b52567be5535a861a7273d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 27 Sep 2019 11:07:30 +0200 Subject: gnu: isync: Use openssl-1.0 to fix build. * gnu/packages/mail.scm (isync)[inputs]: Replace openssl by openssl-1.0 to fix the build. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3d5417bfb5..6fa2832b5c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1441,7 +1441,7 @@ hashing schemes plugin for @code{Dovecot}.") (inputs `(("bdb" ,bdb) ("cyrus-sasl" ,cyrus-sasl) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (home-page "http://isync.sourceforge.net/") (synopsis "Mailbox synchronization program") -- cgit v1.2.3 From e17f1c3dcccca583bc0b2d358c277d6988c51d90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Sep 2019 13:53:00 +0200 Subject: gnu: xfce4-pulseaudio-plugin: Adjust for GCC7 search path change. * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin)[arguments]: Gracefully handle a missing C_INCLUDE_PATH. --- gnu/packages/xfce.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c71285c7bd..1d8ba659b3 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -434,7 +434,7 @@ matching them against regular expressions.") "/include/dbus-1.0" ":" (assoc-ref inputs "dbus") "/include/dbus-1.0" ":" - (getenv "C_INCLUDE_PATH"))) + (or (getenv "C_INCLUDE_PATH") ""))) #t))))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 43124a54744b64dcdbdd8f92d2a037bf8e0dd215 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Sep 2019 13:08:01 +0200 Subject: gnu: gcc: Fix i686-linux cross compiler. This resurrects ./pre-inst-env guix build --target=i686-unknown-linux-gnu hello * gnu/packages/cross-base.scm (cross-gcc-arguments): Do not build libmpx; does not cross-configure. --- gnu/packages/cross-base.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 7108000f06..76d15f4c59 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -144,6 +144,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)" "--disable-libatomic" "--disable-libmudflap" "--disable-libgomp" + "--disable-libmpx" "--disable-libssp" "--disable-libquadmath" "--disable-decimal-float" ;would need libc -- cgit v1.2.3 From 4ecf790e70dd22c204edad269cb661d820864906 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Sep 2019 16:39:19 +0200 Subject: gnu: tlsdate: Build against OpenSSL@1.0. * gnu/packages/ntp.scm (tlsdate)[inputs]: Change from OPENSSL to OPENSSL-1.0. --- gnu/packages/ntp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 6942ecec2f..9429778776 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -169,7 +169,7 @@ minimalist than ntpd.") ;; received from servers. (setenv "COMPILE_DATE" (number->string 1530144000)) (invoke "sh" "autogen.sh")))))) - (inputs `(("openssl" ,openssl) + (inputs `(("openssl" ,openssl-1.0) ("libevent" ,libevent))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From 066cb9bab262ce2ed70b265477a91bbe2325254e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Sep 2019 10:36:46 +0200 Subject: bootstrap: mescc-tools: Use mescc-tools-0.5.2, mescc-tools. * gnu/packages/mes.scm (mescc-tools-0.5.2): New variable; rename from mescc-tools. (mescc-tools): Rename from mescc-tools-0.6.1. Fix build. * gnu/packages/make-bootstrap.scm (%mescc-tools-static): Inherit fixed mescc-tools-0.5.2. --- gnu/packages/make-bootstrap.scm | 25 +------------------------ gnu/packages/mes.scm | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 29 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4594e2fe36..8db551b3a7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -594,34 +594,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) -;; One package: build + remove store references -;; (define %mescc-tools-static-stripped -;; ;; A statically linked Mescc Tools with store references removed, for -;; ;; bootstrap. -;; (package -;; (inherit mescc-tools) -;; (name "mescc-tools-static-stripped") -;; (arguments -;; `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) -;; "CC=gcc -static") -;; #:test-target "test" -;; #:phases (modify-phases %standard-phases -;; (delete 'configure) -;; (add-after 'install 'strip-store-references -;; (lambda _ -;; (let* ((out (assoc-ref %outputs "out")) -;; (bin (string-append out "/bin"))) -;; (for-each (lambda (file) -;; (let ((target (string-append bin "/" file))) -;; (format #t "strippingg `~a'...~%" target) -;; (remove-store-references target))) -;; '( "M1" "blood-elf" "hex2")))))))))) - ;; Two packages: first build static, bare minimum content. (define %mescc-tools-static ;; A statically linked MesCC Tools. (package - (inherit mescc-tools) + (inherit mescc-tools-0.5.2) (name "mescc-tools-static") (arguments `(#:system "i686-linux" diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index e1cb736b82..e116ffc2c8 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -34,7 +34,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public nyacc-0.86 (package @@ -134,7 +135,8 @@ Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+))) -(define-public mescc-tools +(define-public mescc-tools-0.5.2 + ;; Mescc-tools used for bootstrap. (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") (revision "0") (version "0.5.2")) @@ -166,9 +168,9 @@ get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") (license gpl3+)))) -(define-public mescc-tools-0.6.1 +(define-public mescc-tools (package - (inherit mescc-tools) + (inherit mescc-tools-0.5.2) (name "mescc-tools") (version "0.6.1") (source (origin @@ -180,4 +182,9 @@ get_machine.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n")))))) + "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n")))) + (arguments + (substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) + ((#:make-flags _) + `(list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc")))))) -- cgit v1.2.3 From bffd8fcd31e5aa839c64d5e47943c5d8389a0def Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Sep 2019 10:39:40 +0200 Subject: bootstrap: mes: Add mes-0.19. * gnu/packages/mes.scm (mes-0.19): New variable. (mes): Inherit it. * gnu/packages/make-bootstrap.scm (%mes-minimal): Likewise. --- gnu/packages/make-bootstrap.scm | 35 +---------------------------------- gnu/packages/mes.scm | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 39 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 8db551b3a7..b1c4feb4f4 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -633,45 +633,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("mescc-tools" ,%mescc-tools-static))))) -;; (define-public %mes-minimal-stripped -;; ;; A minimal Mes without documentation dependencies, for bootstrap. -;; (let ((triplet "i686-unknown-linux-gnu")) -;; (package -;; (inherit mes) -;; (name "mes-minimal-stripped") -;; (native-inputs -;; `(("guile" ,guile-2.2))) -;; (arguments -;; `(#:system "i686-linux" -;; #:strip-binaries? #f -;; #:configure-flags '("--mes") -;; #:phases -;; (modify-phases %standard-phases -;; (delete 'patch-shebangs) -;; (add-after 'install 'strip-install -;; (lambda _ -;; (let* ((out (assoc-ref %outputs "out")) -;; (share (string-append out "/share"))) -;; (delete-file-recursively (string-append out "/lib/guile")) -;; (delete-file-recursively (string-append share "/guile")) -;; (delete-file-recursively (string-append share "/mes/scaffold")) - -;; (for-each delete-file -;; (find-files -;; (string-append share "/mes/lib") "\\.(h|c)")) - -;; (for-each (lambda (dir) -;; (for-each remove-store-references -;; (find-files (string-append out "/" dir) -;; ".*"))) -;; '("bin" "share/mes"))))))))))) - ;; Two packages: first build static, bare minimum content. (define-public %mes-minimal ;; A minimal Mes without documentation. (let ((triplet "i686-unknown-linux-gnu")) (package - (inherit mes) + (inherit mes-0.19) (name "mes-minimal") (native-inputs `(("guile" ,guile-2.2))) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index e116ffc2c8..1b5bb331f5 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -38,6 +38,7 @@ #:use-module (guix utils)) (define-public nyacc-0.86 + ;; Nyacc used for bootstrap. (package (name "nyacc") (version "0.86.0") @@ -91,22 +92,23 @@ extensive examples, including parsers for the Javascript and C99 languages.") (inputs `(("guile" ,guile-2.2))))) -(define-public mes +(define-public mes-0.19 + ;; Mes used for bootstrap. (package (name "mes") - (version "0.20") + (version "0.19") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) + "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs - `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc))) + `(("mescc-tools" ,mescc-tools-0.5.2) + ("nyacc" ,nyacc-0.86))) (native-inputs `(("guile" ,guile-2.2) ,@(let ((target-system (or (%current-target-system) @@ -135,6 +137,21 @@ Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+))) +(define-public mes + (package + (inherit mes-0.19) + (version "0.20") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) + (propagated-inputs + `(("mescc-tools" ,mescc-tools) + ("nyacc" ,nyacc))))) + (define-public mescc-tools-0.5.2 ;; Mescc-tools used for bootstrap. (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") -- cgit v1.2.3 From 737c83f0ff9977572516c65502bdde92abd18629 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Sep 2019 12:01:51 +0200 Subject: bootstrap: bash: Update for bash-5.0. * gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch: Remove. * gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch: New file. * gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): Update to use it. * gnu/local.mk (dist_patch_DATA): Likewise. --- gnu/local.mk | 4 +-- gnu/packages/make-bootstrap.scm | 2 +- .../patches/bash-4.4-linux-pgrp-pipe.patch | 30 ------------------- .../bash-reproducible-linux-pgrp-pipe.patch | 34 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch create mode 100644 gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9bd1e8882b..18a25e6bc7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -11,7 +11,7 @@ # Copyright © 2016 Ben Woodcroft # Copyright © 2016, 2017, 2018, 2019 Alex Vong # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -# Copyright © 2016, 2017 Jan Nieuwenhuizen +# Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice # Copyright © 2017, 2018 Clément Lassieur # Copyright © 2017 Mathieu Othacehe @@ -706,7 +706,7 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ - %D%/packages/patches/bash-4.4-linux-pgrp-pipe.patch \ + %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index b1c4feb4f4..3a664fd94f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -164,7 +164,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (source (origin (inherit (package-source static-bash)) (patches - (cons (search-patch "bash-4.4-linux-pgrp-pipe.patch") + (cons (search-patch "bash-reproducible-linux-pgrp-pipe.patch") (origin-patches (package-source static-bash)))))))) (define %static-inputs diff --git a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch deleted file mode 100644 index 0d03d7ce37..0000000000 --- a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch +++ /dev/null @@ -1,30 +0,0 @@ -Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of -the kernel version in use on the build machine. - ---- configure.ac.orig 1969-12-31 19:00:00.000000000 -0500 -+++ configure.ac 2019-08-11 22:28:26.038841961 -0400 -@@ -1092,9 +1092,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; -- esac ;; -+ AC_DEFINE(PGRP_PIPE) ;; - *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; - powerux*) LOCAL_LIBS="-lgen" ;; ---- configure.orig 1969-12-31 19:00:00.000000000 -0500 -+++ configure 2019-08-11 22:28:10.166763255 -0400 -@@ -16064,10 +16064,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h -- ;; -- esac ;; -+ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; - *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; - powerux*) LOCAL_LIBS="-lgen" ;; diff --git a/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch new file mode 100644 index 0000000000..8a03c4d982 --- /dev/null +++ b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch @@ -0,0 +1,34 @@ +Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of +the kernel version in use on the build machine. + +diff -purN bash-5.0-orig/configure bash-5.0/configure +--- configure 1970-01-01 01:00:00.000000000 +0100 ++++ configure 2019-09-29 11:51:42.664518665 +0200 +@@ -16312,11 +16312,7 @@ solaris2.10*) LOCAL_CFLAGS=-DSOLARIS ;; + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[0123]*) : ;; +- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; +diff -purN bash-5.0-orig/configure.ac bash-5.0/configure.ac +--- configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ configure.ac 2019-09-29 11:51:10.692026225 +0200 +@@ -1108,10 +1108,7 @@ solaris2.10*) LOCAL_CFLAGS=-DSOLARIS ;; + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[[0123]]*) : ;; +- *) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; -- cgit v1.2.3 From 8d564b8b81b98fec9aac2f5f2d3cb0d1f2ea1416 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Sep 2019 09:48:18 +0200 Subject: gnu: xyce: Use Bison 3.0. Xyce requires Bison 3.0 at the latest. * gnu/packages/bison.scm (bison-3.0): New variable. * gnu/packages/engineering.scm (xyce-serial)[native-inputs]: Use BISON-3.0 instead of BISON. --- gnu/packages/bison.scm | 15 ++++++++++++++- gnu/packages/engineering.scm | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 5ebc883d53..12f19b785e 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2015, 2019 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; @@ -63,3 +63,16 @@ deterministic or generalized LR parser from an annotated, context-free grammar. It is versatile enough to have many applications, from parsers for simple tools through complex programming languages.") (license gpl3+))) + +(define-public bison-3.0 + (package + (inherit bison) + (version "3.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/bison/bison-" + version ".tar.xz")) + (sha256 + (base32 + "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07")))))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bbd9151995..103cb19e83 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -1550,7 +1550,7 @@ unique design feature of Trilinos is its focus on packages.") (string-append "ARCHDIR=" (assoc-ref %build-inputs "trilinos"))))) (native-inputs - `(("bison" ,bison) + `(("bison" ,bison-3.0) ;'configure' fails with Bison 3.4 ("flex" ,flex) ("fortran" ,gfortran))) (inputs -- cgit v1.2.3 From 8400d097bd84e25a6fb36b2216ed0b8d7e50411f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 1 Oct 2019 15:47:34 +0200 Subject: gnu: guile: Add 2.2.4. * gnu/packages/guile.scm (guile-2.2.4): New variable. --- gnu/packages/guile.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b0dfa89ee5..49a6e964a3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -258,6 +258,17 @@ without requiring the source code to be rewritten.") (timeout . 72000) ;20 hours (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) +(define-public guile-2.2.4 + (package/inherit + guile-2.2 + (version "2.2.4") + (source (origin + (inherit (package-source guile-2.2)) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.xz")) + (sha256 + (base32 + "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. -- cgit v1.2.3 From ece22ac8ccb6744eaec0320f0c7c9b6680fffa46 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 30 Sep 2019 17:43:34 +0100 Subject: gnu: translate-shell: Update to 0.9.6.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dictionnaries.scm (translate-shell): Update to 0.9.6.11. Signed-off-by: Ludovic Courtès --- gnu/packages/dictionaries.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 37bd4aaf6b..96d496d439 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -245,7 +246,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.10") + (version "0.9.6.11") (source (origin (method git-fetch) @@ -254,7 +255,7 @@ and a Python library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y")))) + (base32 "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 86f2124b0f015e99416e5e6efc15f0ef790eb366 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 2 Oct 2019 12:03:03 +0200 Subject: gnu: dconf-editor: Fix build failure. Fixes . Reported by Jack Hill . * gnu/packages/gnome.scm (dconf-editor)[arguments]: New field. --- gnu/packages/gnome.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a5c0ffbf77..d8b73e25d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6548,6 +6548,17 @@ beautifying border effects.") (base32 "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia")))) (build-system meson-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-glib-minimum-version + (lambda _ + ;; Change the minimum required GLib version so that + ;; 'valac' is passed '--target-glib 2.60.0'; failing to + ;; do that, it complains that "55" is not an even + ;; number. See . + (substitute* "editor/meson.build" + (("2\\.55\\.1") "2.60.0")) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache -- cgit v1.2.3 From cbc8c658d6a6c0d2ff76644060145bafa4e72c89 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 27 Sep 2019 20:37:47 -0400 Subject: gnu: gnucash: Update to 3.7. * gnu/packages/gnucash.scm (gnucash): Update to 3.7. [arguments]: Remove "disable-stress-options-test" phase. (gnucash-docs): Update to 3.7. --- gnu/packages/gnucash.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 2ed1a890f7..de916a8829 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -54,7 +54,7 @@ ;; directory. (package (name "gnucash") - (version "3.5") + (version "3.7") (source (origin (method url-fetch) @@ -62,7 +62,7 @@ version "/gnucash-" version ".tar.bz2")) (sha256 (base32 - "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp")))) + "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb")))) (build-system cmake-build-system) (inputs `(("guile" ,guile-2.2) @@ -125,13 +125,6 @@ (substitute* "libgnucash/scm/price-quotes.scm" (("\"perl\" \"-w\" ") "")) #t)) - ;; The test-stress-options unit test is known to fail, so we disable - ;; it (see: https://bugs.gnucash.org/show_bug.cgi?id=796877). - (add-after 'unpack 'disable-stress-options-test - (lambda _ - (substitute* "gnucash/report/standard-reports/test/CMakeLists.txt" - (("test-stress-options.scm") "")) - #t)) ;; The qof test requires the en_US, en_GB, and fr_FR locales. (add-before 'check 'install-locales (lambda _ @@ -207,7 +200,7 @@ installed as well as Yelp, the Gnome help browser.") version "/gnucash-docs-" version revision ".tar.gz")) (sha256 (base32 - "0gjndyms413vilf5nqh39frs1691sxib8l7y9mbvcyirj1f8285k")))) + "1h4hm58ikffbhplx4gm8pzm9blfwqa1sz8yc2fqi21vs5v0ijf9r")))) (build-system gnu-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. -- cgit v1.2.3 From aace6f6dba3a0e7dd46146f5c7947b11e1076e5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 3 Oct 2019 19:28:56 +0300 Subject: gnu: mysql: Update to 5.7.27. * gnu/packages/databases.scm (mysql): Update to 5.7.27. [native-inputs]: Add pkg-config. [inputs]: Add libtirpc, rpcsvc-proto. --- gnu/packages/databases.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9cc424573c..7960b7087a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -84,6 +84,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages parallel) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -544,7 +545,7 @@ RDBMS systems (which are deep in functionality).") (define-public mysql (package (name "mysql") - (version "5.7.23") + (version "5.7.27") (source (origin (method url-fetch) (uri (list (string-append @@ -556,7 +557,7 @@ RDBMS systems (which are deep in functionality).") name "-" version ".tar.gz"))) (sha256 (base32 - "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07")))) + "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -593,12 +594,15 @@ RDBMS systems (which are deep in functionality).") #t)))))) (native-inputs `(("bison" ,bison) - ("perl" ,perl))) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost-for-mysql) ("libaio" ,libaio) + ("libtirpc" ,libtirpc) ("ncurses" ,ncurses) ("openssl" ,openssl) + ("rpcsvc-proto" ,rpcsvc-proto) ; rpcgen ("zlib" ,zlib))) (home-page "https://www.mysql.com/") (synopsis "Fast, easy to use, and popular database") -- cgit v1.2.3 From 5157edd8854c895dfb78f6cf49e906e49745ca8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Sep 2019 16:13:43 +0200 Subject: gnu: perf: Treat kernel headers as system headers. * gnu/packages/linux.scm (perf)[arguments]: Instead of disabling -Werror, set C_INCLUDE_PATH. --- gnu/packages/linux.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6664620c04..d7e3d7ef7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3091,15 +3091,16 @@ in a digital read-out.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs #:allow-other-keys) - ;; Don't build with '-Werror', really. - (substitute* "tools/lib/bpf/Makefile" - (("-Werror") "")) - (setenv "SHELL_PATH" (which "bash")) (chdir "tools/perf") #t))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) + ;; Make sure the kernel headers are treated as system + ;; headers to suppress warnings from those. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include") "WERROR=0" ;; By default, 'config/Makefile' uses lib64 on -- cgit v1.2.3 From dd6989711370c43676edc974f86c8586f21f80f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Oct 2019 22:22:08 +0200 Subject: gnu: linux-libre: Try to aggressively gather entropy during boot. Fixes . * gnu/packages/patches/linux-libre-active-entropy.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (linux-libre-5.2-source): Use it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 +- .../patches/linux-libre-active-entropy.patch | 86 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/linux-libre-active-entropy.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9f8ce842b6..b9b6ea3ae7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ + %D%/packages/patches/linux-libre-active-entropy.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7e3d7ef7f..2a6709c6fe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -420,7 +420,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.2-source (source-with-patches linux-libre-5.2-pristine-source - (list %boot-logo-patch + (list (search-patch "linux-libre-active-entropy.patch") + %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-4.19-source diff --git a/gnu/packages/patches/linux-libre-active-entropy.patch b/gnu/packages/patches/linux-libre-active-entropy.patch new file mode 100644 index 0000000000..8f081f4a19 --- /dev/null +++ b/gnu/packages/patches/linux-libre-active-entropy.patch @@ -0,0 +1,86 @@ +Try to actively add entropy instead of waiting forever. +Fixes . + +Taken from upstream: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=50ee7529ec4500c88f8664560770a7a1b65db72b + +diff --git a/drivers/char/random.c b/drivers/char/random.c +index 5d5ea4ce1442..2fda6166c1dd 100644 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c +@@ -1731,6 +1731,56 @@ void get_random_bytes(void *buf, int nbytes) + } + EXPORT_SYMBOL(get_random_bytes); + ++ ++/* ++ * Each time the timer fires, we expect that we got an unpredictable ++ * jump in the cycle counter. Even if the timer is running on another ++ * CPU, the timer activity will be touching the stack of the CPU that is ++ * generating entropy.. ++ * ++ * Note that we don't re-arm the timer in the timer itself - we are ++ * happy to be scheduled away, since that just makes the load more ++ * complex, but we do not want the timer to keep ticking unless the ++ * entropy loop is running. ++ * ++ * So the re-arming always happens in the entropy loop itself. ++ */ ++static void entropy_timer(struct timer_list *t) ++{ ++ credit_entropy_bits(&input_pool, 1); ++} ++ ++/* ++ * If we have an actual cycle counter, see if we can ++ * generate enough entropy with timing noise ++ */ ++static void try_to_generate_entropy(void) ++{ ++ struct { ++ unsigned long now; ++ struct timer_list timer; ++ } stack; ++ ++ stack.now = random_get_entropy(); ++ ++ /* Slow counter - or none. Don't even bother */ ++ if (stack.now == random_get_entropy()) ++ return; ++ ++ timer_setup_on_stack(&stack.timer, entropy_timer, 0); ++ while (!crng_ready()) { ++ if (!timer_pending(&stack.timer)) ++ mod_timer(&stack.timer, jiffies+1); ++ mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now)); ++ schedule(); ++ stack.now = random_get_entropy(); ++ } ++ ++ del_timer_sync(&stack.timer); ++ destroy_timer_on_stack(&stack.timer); ++ mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now)); ++} ++ + /* + * Wait for the urandom pool to be seeded and thus guaranteed to supply + * cryptographically secure random numbers. This applies to: the /dev/urandom +@@ -1745,7 +1795,17 @@ int wait_for_random_bytes(void) + { + if (likely(crng_ready())) + return 0; +- return wait_event_interruptible(crng_init_wait, crng_ready()); ++ ++ do { ++ int ret; ++ ret = wait_event_interruptible_timeout(crng_init_wait, crng_ready(), HZ); ++ if (ret) ++ return ret > 0 ? 0 : ret; ++ ++ try_to_generate_entropy(); ++ } while (!crng_ready()); ++ ++ return 0; + } + EXPORT_SYMBOL(wait_for_random_bytes); + -- cgit v1.2.3 From c5ceec4150f6a6cdc1b64781afa2d05547cf8542 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 4 Oct 2019 21:36:42 +0200 Subject: gnu: linux-libre: Remove glibc from CPATH before the build. Fixes . * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Drop "libc" from CPATH. --- gnu/packages/linux.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a6709c6fe..78de223947 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -663,6 +663,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) + (srfi srfi-26) (ice-9 match)) #:phases (modify-phases %standard-phases @@ -679,6 +680,18 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ,@(if (%current-target-system) '((unsetenv "CROSS_CPATH")) '()) + + ;; On AArch64 (at least), we need to remove glibc headers from CPATH + ;; (they are still available as "system headers"), so that the kernel + ;; can override uint64_t. See . + (setenv "CPATH" + (string-join + (remove (cut string-prefix? (assoc-ref inputs "libc") <>) + (string-split (getenv "CPATH") #\:)) + ":")) + (format #t "environment variable `CPATH' changed to `~a'~%" + (getenv "CPATH")) + ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) -- cgit v1.2.3 From 1714edc3d4e8d6da1b0cdef300ae882d0885f182 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 6 Oct 2019 14:24:04 +0200 Subject: gnu: WebKitGTK: Embed absolute file name of libWPEBackend-fdo-1.0.so. Fixes . Reported by Vagrant Cascadian . * gnu/packages/webkit.scm (webkitgtk)[arguments]: Add phase. --- gnu/packages/webkit.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 3169c7d15a..bda0fc6ba2 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -165,6 +165,13 @@ engine that uses Wayland for graphics output.") "/xml/dtd/docbook/docbookx.dtd")))) (find-files "Source" "\\.sgml$")) #t)) + (add-after 'unpack 'embed-absolute-wpebackend-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) + (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" + (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) + (string-append wpebackend-fdo "/lib/" all))) + #t))) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 10:16:04 +0200 Subject: gnu: mariadb: Build with GCC 5 on ARMv7. Fixes . * gnu/packages/databases.scm (mariadb)[native-inputs]: Add GCC-5 when the current system is ARMv7. --- gnu/packages/databases.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7960b7087a..bb7adf25a6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -72,6 +72,7 @@ #:use-module (gnu packages dbm) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) @@ -779,6 +780,10 @@ Language.") #t)))))) (native-inputs `(("bison" ,bison) + ;; XXX: On armhf, use GCC 5 to work around . + ,@(if (string-prefix? "armhf" (%current-system)) + `(("gcc", gcc-5)) + '()) ("perl" ,perl))) (inputs `(("jemalloc" ,jemalloc) -- cgit v1.2.3