From c336567dad48c5cdae0b442b58fae70a83b03e9b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 28 Jul 2018 17:38:38 +0200 Subject: [PATCH 001/250] gnu: postgresql: Fix finding extensions. * gnu/packages/patches/postgresql-disable-resolve_symlinks.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/databases.scm (postgresql)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 5 ++-- .../postgresql-disable-resolve_symlinks.patch | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/postgresql-disable-resolve_symlinks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60db25a60c..c3bc35a80a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1042,6 +1042,7 @@ dist_patch_DATA = \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ + %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ %D%/packages/patches/potrace-tests.patch \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dc8e52036c..02bfbda6b0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018 Marius Bakke -;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso @@ -814,7 +814,8 @@ as a drop-in replacement of MySQL.") version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) + "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")) + (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") diff --git a/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch b/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch new file mode 100644 index 0000000000..97ef6928fe --- /dev/null +++ b/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch @@ -0,0 +1,25 @@ +From 223c82d1d6ed1f29f26307249827ff679e09c780 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Sat, 28 Jul 2018 12:22:12 +0200 +Subject: [PATCH] disable resolve_symlink + +--- + src/common/exec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/exec.c b/src/common/exec.c +index 878fc29..6b3e283 100644 +--- a/src/common/exec.c ++++ b/src/common/exec.c +@@ -218,6 +218,8 @@ find_my_exec(const char *argv0, char *retpath) + static int + resolve_symlinks(char *path) + { ++ // On GuixSD we *want* stuff relative to symlinks. ++ return 0; + #ifdef HAVE_READLINK + struct stat buf; + char orig_wd[MAXPGPATH], +-- +2.18.0 + From 0d57a50af28056cbe4a3c215e1a3cc95d88bba1c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 14 Sep 2018 21:44:08 +0200 Subject: [PATCH 002/250] gnu: postgresql: Add extension-packages. * gnu/services/databases.scm (postgresql-configuration): Add extension-packages. (postgresql-shepherd-service): New key #:extension-packages. * doc/guix.texi (Database Services): Document it. --- doc/guix.texi | 38 ++++++++++++++++++++++- gnu/services/databases.scm | 63 ++++++++++++++++++++++++++++---------- 2 files changed, 84 insertions(+), 17 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d2d278df47..b5c2d4d954 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13383,13 +13383,49 @@ The @code{(gnu services databases)} module provides the following services. @deffn {Scheme Procedure} postgresql-service [#:postgresql postgresql] @ [#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ - [#:port 5432] [#:locale ``en_US.utf8''] + [#:port 5432] [#:locale ``en_US.utf8''] [#:extension-packages '()] Return a service that runs @var{postgresql}, the PostgreSQL database server. The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the default locale, stored in @var{data-directory}. It then listens on @var{port}. + +@cindex postgresql extension-packages +Additional extensions are loaded from packages listed in +@var{extension-packages}. Extensions are available at runtime. For instance, +to create a geographic database using the @code{postgis} extension, a user can +configure the postgresql-service as in this example: + +@cindex postgis +@example +(use-package-modules databases geo) + +(operating-system + ... + ;; postgresql is required to run `psql' but postgis is not required for + ;; proper operation. + (packages (cons* postgresql %base-packages)) + (services + (cons* + (postgresql-service #:extension-packages (list postgis)) + %base-services))) +@end example + +Then the extension becomes visible and you can initialise an empty geographic +database in this way: + +@example +psql -U postgres +> create database postgistest; +> \connect postgistest; +> create extension postgis; +> create extension postgis_topology; +@end example + +There is no need to add this field for contrib extensions such as hstore or +dblink as they are already loadable by postgresql. This field is only +required to add extensions provided by other packages. @end deffn @deffn {Scheme Procedure} mysql-service [#:config (mysql-configuration)] diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index aff78a0566..7113f1f2a1 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,10 @@ #:use-module (gnu system shadow) #:use-module (gnu packages admin) #:use-module (gnu packages databases) + #:use-module (guix build-system trivial) + #:use-module (guix build union) #:use-module (guix modules) + #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) #:use-module (srfi srfi-1) @@ -141,16 +145,18 @@ host all all ::1/128 trust")) (define-record-type* postgresql-configuration make-postgresql-configuration postgresql-configuration? - (postgresql postgresql-configuration-postgresql ; - (default postgresql)) - (port postgresql-configuration-port - (default 5432)) - (locale postgresql-configuration-locale - (default "en_US.utf8")) - (config-file postgresql-configuration-file - (default (postgresql-config-file))) - (data-directory postgresql-configuration-data-directory - (default "/var/lib/postgresql/data"))) + (postgresql postgresql-configuration-postgresql ; + (default postgresql)) + (port postgresql-configuration-port + (default 5432)) + (locale postgresql-configuration-locale + (default "en_US.utf8")) + (config-file postgresql-configuration-file + (default (postgresql-config-file))) + (data-directory postgresql-configuration-data-directory + (default "/var/lib/postgresql/data")) + (extension-packages postgresql-configuration-extension-packages + (default '()))) (define %postgresql-accounts (list (user-group (name "postgres") (system? #t)) @@ -162,15 +168,36 @@ host all all ::1/128 trust")) (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))) +(define (final-postgresql postgresql extension-packages) + (if (null? extension-packages) + postgresql + (package + (inherit postgresql) + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) (guix build union)) + #:builder + (begin + (use-modules (guix build utils) (guix build union) (srfi srfi-26)) + (union-build (assoc-ref %outputs "out") (map (lambda (input) (cdr input)) %build-inputs)) + #t))) + (inputs + `(("postgresql" ,postgresql) + ,@(map (lambda (extension) (list "extension" extension)) + extension-packages)))))) + (define postgresql-activation (match-lambda - (($ postgresql port locale config-file data-directory) + (($ postgresql port locale config-file data-directory + extension-packages) #~(begin (use-modules (guix build utils) (ice-9 match)) (let ((user (getpwnam "postgres")) - (initdb (string-append #$postgresql "/bin/initdb")) + (initdb (string-append #$(final-postgresql postgresql extension-packages) + "/bin/initdb")) (initdb-args (append (if #$locale @@ -202,7 +229,8 @@ host all all ::1/128 trust")) (define postgresql-shepherd-service (match-lambda - (($ postgresql port locale config-file data-directory) + (($ postgresql port locale config-file data-directory + extension-packages) (let* ((pg_ctl-wrapper ;; Wrapper script that switches to the 'postgres' user before ;; launching daemon. @@ -214,7 +242,8 @@ host all all ::1/128 trust")) (match (command-line) ((_ mode) (let ((user (getpwnam "postgres")) - (pg_ctl #$(file-append postgresql "/bin/pg_ctl")) + (pg_ctl #$(file-append (final-postgresql postgresql extension-packages) + "/bin/pg_ctl")) (options (format #f "--config-file=~a -p ~d" #$config-file #$port))) (setgid (passwd:gid user)) @@ -253,7 +282,8 @@ host all all ::1/128 trust")) (port 5432) (locale "en_US.utf8") (config-file (postgresql-config-file)) - (data-directory "/var/lib/postgresql/data")) + (data-directory "/var/lib/postgresql/data") + (extension-packages '())) "Return a service that runs @var{postgresql}, the PostgreSQL database server. The PostgreSQL daemon loads its runtime configuration from @var{config-file} @@ -264,7 +294,8 @@ and stores the database cluster in @var{data-directory}." (port port) (locale locale) (config-file config-file) - (data-directory data-directory)))) + (data-directory data-directory) + (extension-packages extension-packages)))) ;;; From 8e3f06c939347e1bc3311283e114fa05adb0ed20 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 4 Oct 2018 22:23:54 +0200 Subject: [PATCH 003/250] gnu: postgis: Update description. * gnu/packages/geo.scm (postgis)[description]: Explicitly state this is a postgresql extension. --- gnu/packages/geo.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ae6ba024e0..f845349b3c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -748,7 +748,8 @@ utilities for data translation and processing.") (synopsis "Spatial database extender for PostgreSQL") (description "PostGIS is a spatial database extender for PostgreSQL object-relational database. It adds support for geographic objects allowing -location queries to be run in SQL.") +location queries to be run in SQL. This package provides a PostgreSQL +extension.") (license (list ;; General license license:gpl2+ From aea3ec0f720c53b9897d87502a8fbdb6e6f10d11 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 5 Oct 2018 14:10:21 +0200 Subject: [PATCH 004/250] gnu: mesa: Update to 18.2.2. * gnu/packages/gl.scm (mesa): Update to 18.2.2. [inputs]: Add libxrandr. [arguments]: Remove "--enable-texture-float" argument (enabled by default now). --- gnu/packages/gl.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 5592e5fe67..c005a6fd24 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.5") + (version "18.2.2") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) + "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) @@ -256,6 +256,7 @@ also known as DXTn or DXTC) for Mesa.") ("libva" ,(force libva-without-mesa)) ("libxml2" ,libxml2) ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support + ("libxrandr" ,libxrandr) ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") @@ -293,9 +294,6 @@ also known as DXTn or DXTC) for Mesa.") "--enable-gles2" "--enable-gbm" "--enable-shared-glapi" - ;; Without floating point texture support, drivers such as Nouveau - ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+. - "--enable-texture-float" ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) From 93cae02fb78a140bf5d558acf1f38282ab67d516 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 12:13:05 +0100 Subject: [PATCH 005/250] gnu: ruby: Add ruby 2.5. * gnu/packages/ruby.scm (ruby)[version]: Update to 2.5.1. [source]: Remove the Ruby 2.4 patch, and update sha256. (ruby-2.4): New variable. --- gnu/packages/ruby.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 908dfd5751..45e4c354c8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -54,7 +54,7 @@ (define-public ruby (package (name "ruby") - (version "2.4.3") + (version "2.5.1") (source (origin (method url-fetch) @@ -63,8 +63,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3")) - (patches (search-patches "ruby-rubygems-276-for-ruby24.patch")) + "0kbm3gkv689d1mb8fh261z8s79d6hw07p0xyk735yfqyskpcasl8")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -106,6 +105,26 @@ a focus on simplicity and productivity.") (home-page "https://www.ruby-lang.org") (license license:ruby))) +(define-public ruby-2.4 + (package + (inherit ruby) + (version "2.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.xz")) + (sha256 + (base32 + "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3")) + (patches (search-patches "ruby-rubygems-276-for-ruby24.patch")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + #t)))))) + (define-public ruby-2.3 (package (inherit ruby) From 77ec9b983087900d85b8de704902ff2c1afcb6c0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Oct 2018 18:35:50 +0200 Subject: [PATCH 006/250] gnu: mesa: Update to 18.2.3. * gnu/packages/gl.scm (mesa): Update to 18.2.3. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c005a6fd24..0c64e05090 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.2") + (version "18.2.3") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3")) + "00rrg8i1ykwvrg94gcsvjy1l9ih8bqafkq9x122h3rkk5cvmnjcz")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) From 73c0ce80a43955437452ba2beabd06ad59b8750a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 24 Oct 2018 09:22:11 +0200 Subject: [PATCH 007/250] gnu: libdrm: Update to 2.4.96. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.96. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ffd9e252e8..b519ba78d0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -316,7 +316,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.93") + (version "2.4.96") (source (origin (method url-fetch) @@ -326,7 +326,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f")) + "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments From a5f0c7c13f3770eb75995b2b0eb21d52882428e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= Date: Fri, 23 Nov 2018 08:26:10 +0100 Subject: [PATCH 008/250] gnu: wayland: Update to 1.16. * gnu/packages/freedesktop.scm (wayland): Update to 1.16. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c8758f7a52..5352ea221b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -437,14 +437,14 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb")))) + "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) From 873eff41a8719cf2117d60e10ac46882b6a07267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= Date: Fri, 23 Nov 2018 08:27:41 +0100 Subject: [PATCH 009/250] gnu: wayland-protocols: Update to 1.16. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.16. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5352ea221b..5eae8242aa 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -473,7 +473,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (string-append @@ -481,7 +481,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1qlyf9cllr2p339xxplznh023qcwj5iisp02ikx7ps349dx75fys")))) + "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) From fd0627744845d55916e42b0eaf17ef9d5f585381 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 26 Nov 2018 20:55:29 +0100 Subject: [PATCH 010/250] gnu: vulkan-headers: Update to 1.1.92.0. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.92.0. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f256e21187..a5f75cdb79 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -163,7 +163,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.82.0") + (version "1.1.92.0") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "1rbra47f1dkw5bjzvm0k9s2f89c2x80j904ply4bxks7sl3xlwyz")))) + "06bgiz1dnp57597vd26r2smsadpcnr425n9gfdbp6xm4wba4l5l9")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -195,7 +195,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "032vfysb8mi19c2lx08vc6k9mbzxmiy17wp7a22vpgwwv69kxkc6")))) + "0vb35h05lyy1df0v6gq68h0scxizxpmjwbc90bjql6ixspmyb2im")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -251,7 +251,7 @@ and the ICD.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "175qhfg9lxxfm5zks6jxaybcxamwd9q5kvjq8ikf2dbmskgybr92")))) + "0yd9dgkyradlk9gx0ps65nans7b29jg5c67b4m34ghpmy933dwx6")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) From 3a6372e05c70338b3289a6efe05bfad605ccefd6 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 26 Nov 2018 21:29:04 +0100 Subject: [PATCH 011/250] gnu: wayland-protocols: Update to 1.17. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.17. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5eae8242aa..41c1e6bcb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -473,7 +473,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.16") + (version "1.17") (source (origin (method url-fetch) (uri (string-append @@ -481,7 +481,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b")))) + "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) From e9a8b603337802a77ff2d68f0d30dc0e67721e3a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 28 Nov 2018 17:13:01 +0100 Subject: [PATCH 012/250] gnu: vulkan-loader: Update to 1.1.92.1. * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.1.92.1. --- gnu/packages/vulkan.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a5f75cdb79..2fb245e85c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -186,7 +186,8 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version (package-version vulkan-headers)) + ;; TODO: Inherit from vulkan-headers when version numbers match again + (version "1.1.92.1") (source (origin (method url-fetch) @@ -195,7 +196,7 @@ interpretation of the specifications for these languages.") "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "0vb35h05lyy1df0v6gq68h0scxizxpmjwbc90bjql6ixspmyb2im")))) + "1kx07ypbwnmn6cxv9z0vbngq5l83f1sffzh7wmkzrl69y1cmazi0")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". From b07724a98b3fcdb28d5f870cd0a840f50d787dc2 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 4 Dec 2018 08:37:21 +0100 Subject: [PATCH 013/250] gnu: mesa: Update to 18.2.6. * gnu/packages/gl.scm (mesa): Update to 18.2.6. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9ae7e5613e..9c8ab180a4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -220,7 +220,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.3") + (version "18.2.6") (source (origin (method url-fetch) @@ -232,7 +232,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "00rrg8i1ykwvrg94gcsvjy1l9ih8bqafkq9x122h3rkk5cvmnjcz")) + "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) From dd9d9ae4b7b6983a208d31a7b9d63198a4fedaa6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:44:31 +0100 Subject: [PATCH 014/250] gnu: libinput: Update to 1.12.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.12.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d07edcdb72..11ab76bf74 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -146,14 +146,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.12.1") + (version "1.12.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p")))) + "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) From 54d860cc1732f46f893f1e788e95af4c4ea2d986 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:48:55 +0100 Subject: [PATCH 015/250] gnu: libepoxy: Update to 1.5.3. * gnu/packages/gl.scm (libepoxy): Update to 1.5.3. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Delete 'bootstrap' phase. --- gnu/packages/gl.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9c8ab180a4..3968e4379d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -53,6 +53,7 @@ #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -545,7 +546,7 @@ OpenGL graphics API.") (define-public libepoxy (package (name "libepoxy") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append @@ -553,10 +554,11 @@ OpenGL graphics API.") version "/libepoxy-" version ".tar.xz")) (sha256 (base32 - "1n57xj5i6giw4mp5s59w1m9bm33sd6gjg7r00dzzvcwya6326mm9")))) + "0ga3qjv50x37my6pw5xr14g5n6z78hy5s8s06kays8c3ab2mha80")))) (arguments `(#:phases (modify-phases %standard-phases + (delete 'bootstrap) (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -568,7 +570,7 @@ OpenGL graphics API.") (("libGL.so.1") (string-append mesa "/lib/libGL.so.1")) (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1"))) #t)))))) - (build-system gnu-build-system) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) From c3e61854cbcd046995d9ccbd8e307117ca58b9b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:55:17 +0100 Subject: [PATCH 016/250] gnu: tzdata: Update to 2018g. * gnu/packages/base.scm (tzdata): Update to 2018g. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 60f8051dc6..55a0290600 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1097,7 +1097,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2018e") + (version "2018g") (source (origin (method url-fetch) (uri (string-append @@ -1105,7 +1105,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b")))) + "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1155,7 +1155,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a")))))) + "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) From 87f0cf9f36c69dd163bff2e2c05b362e3df200eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:55:57 +0100 Subject: [PATCH 017/250] gnu: gtk+: Update to 3.24.1. * gnu/packages/gtk.scm (gtk+): Update to 3.24.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 08f92df96c..3b9a4145e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -688,7 +688,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.24.0") + (version "3.24.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -696,7 +696,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "1a1jbsh9fg5ykmwrcl3svy7xfvx0b87d314qsx9n483pj8w93s82")) + "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) From 4115e8ea3bd3d64e7e2c85c74a4ea12bf0a81241 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:57:41 +0100 Subject: [PATCH 018/250] gnu: json-glib: Update to 1.4.4. * gnu/packages/patches/json-glib-fix-tests-32bit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gnome.scm (json-glib): Update to 1.4.4. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 5 +- .../patches/json-glib-fix-tests-32bit.patch | 174 ------------------ 3 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 gnu/packages/patches/json-glib-fix-tests-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 108ccdceda..003b75961b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -847,7 +847,6 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ - %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b497b965bc..9652f32fb0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2292,16 +2292,15 @@ configuration storage systems.") (define-public json-glib (package (name "json-glib") - (version "1.4.2") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "json-glib-fix-tests-32bit.patch")) (sha256 (base32 - "1j3dd2xj1l9fi12m1gpmfgf5p4c1w0i970m6k62k3is98yj0jxrd")))) + "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/json-glib-fix-tests-32bit.patch b/gnu/packages/patches/json-glib-fix-tests-32bit.patch deleted file mode 100644 index 77ea134915..0000000000 --- a/gnu/packages/patches/json-glib-fix-tests-32bit.patch +++ /dev/null @@ -1,174 +0,0 @@ -Fix floating point issues on 32-bit platforms: - -https://gitlab.gnome.org/GNOME/json-glib/issues/27 - -This is an amalgamation of the following upstream commits: -https://gitlab.gnome.org/GNOME/json-glib/commit/70e2648e02232c1a439a7418388f18fee9afb3fe -https://gitlab.gnome.org/GNOME/json-glib/commit/675e27505776a1d77fa1ffd1974284890caec1f4 - -diff --git a/json-glib/tests/json-test-utils.h b/json-glib/tests/json-test-utils.h -new file mode 100644 -index 0000000..83a02c6 ---- /dev/null -+++ b/json-glib/tests/json-test-utils.h -@@ -0,0 +1,21 @@ -+#include -+#include -+#include -+#include -+#include -+ -+#define json_fuzzy_equals(n1,n2,epsilon) \ -+ (((n1) > (n2) ? ((n1) - (n2)) : ((n2) - (n1))) < (epsilon)) -+ -+#define json_assert_fuzzy_equals(n1,n2,epsilon) \ -+ G_STMT_START { \ -+ double __n1 = (n1), __n2 = (n2), __epsilon = (epsilon); \ -+ if (json_fuzzy_equals (__n1, __n2, __epsilon)) ; else { \ -+ g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ -+ #n1 " == " #n2 " (+/- " #epsilon ")", \ -+ __n1, "==", __n2, 'f'); \ -+ } \ -+ } G_STMT_END -+ -+#define json_assert_almost_equals(n1,n2) \ -+ json_assert_fuzzy_equals (n1, n2, DBL_EPSILON) -diff --git a/json-glib/tests/array.c b/json-glib/tests/array.c -index 98afeab..426cd72 100644 ---- a/json-glib/tests/array.c -+++ b/json-glib/tests/array.c -@@ -1,9 +1,4 @@ --#include --#include --#include -- --#include --#include -+#include "json-test-utils.h" - - static void - test_empty_array (void) -@@ -37,7 +32,7 @@ test_add_element (void) - - json_array_add_double_element (array, 3.14); - g_assert_cmpint (json_array_get_length (array), ==, 3); -- g_assert_cmpfloat (json_array_get_double_element (array, 2), ==, 3.14); -+ json_assert_fuzzy_equals (json_array_get_double_element (array, 2), 3.14, 0.001); - - json_array_add_boolean_element (array, TRUE); - g_assert_cmpint (json_array_get_length (array), ==, 4); -diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c -index 23bda63..80beb78 100644 ---- a/json-glib/tests/node.c -+++ b/json-glib/tests/node.c -@@ -1,6 +1,4 @@ --#include --#include --#include -+#include "json-test-utils.h" - - static void - test_init_int (void) -@@ -19,7 +17,7 @@ test_init_double (void) - JsonNode *node = json_node_new (JSON_NODE_VALUE); - - json_node_set_double (node, 3.14159); -- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14159); -+ json_assert_fuzzy_equals (json_node_get_double (node), 3.14159, 0.00001); - - json_node_free (node); - } -@@ -119,13 +117,13 @@ test_get_int (void) - - json_node_set_int (node, 0); - g_assert_cmpint (json_node_get_int (node), ==, 0); -- g_assert_cmpfloat (json_node_get_double (node), ==, 0.0); -+ json_assert_almost_equals (json_node_get_double (node), 0.0); - g_assert (!json_node_get_boolean (node)); - g_assert (!json_node_is_null (node)); - - json_node_set_int (node, 42); - g_assert_cmpint (json_node_get_int (node), ==, 42); -- g_assert_cmpfloat (json_node_get_double (node), ==, 42.0); -+ json_assert_almost_equals (json_node_get_double (node), 42.0); - g_assert (json_node_get_boolean (node)); - g_assert (!json_node_is_null (node)); - -@@ -138,7 +136,7 @@ test_get_double (void) - JsonNode *node = json_node_new (JSON_NODE_VALUE); - - json_node_set_double (node, 3.14); -- g_assert_cmpfloat (json_node_get_double (node), ==, 3.14); -+ json_assert_fuzzy_equals (json_node_get_double (node), 3.14, 0.001); - g_assert_cmpint (json_node_get_int (node), ==, 3); - g_assert (json_node_get_boolean (node)); - -@@ -232,9 +230,9 @@ test_gvalue_autopromotion (void) - g_print ("Expecting a gdouble, got a %s\n", g_type_name (G_VALUE_TYPE (&check))); - - g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_DOUBLE); -- g_assert_cmpfloat ((float) g_value_get_double (&check), ==, 3.14159f); -+ json_assert_fuzzy_equals (g_value_get_double (&check), 3.14159, 0.00001); - g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check)); -- g_assert_cmpfloat ((gdouble) g_value_get_float (&value), ==, g_value_get_double (&check)); -+ json_assert_almost_equals (g_value_get_float (&value), g_value_get_double (&check)); - - g_value_unset (&value); - g_value_unset (&check); -diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c -index f71584a..8c52a1d 100644 ---- a/json-glib/tests/parser.c -+++ b/json-glib/tests/parser.c -@@ -1,11 +1,5 @@ --#include "config.h" -- -+#include "json-test-utils.h" - #include --#include -- --#include -- --#include - - static const gchar *test_empty_string = ""; - static const gchar *test_empty_array_string = "[ ]"; -@@ -38,13 +32,13 @@ verify_string_value (JsonNode *node) - static void - verify_double_value (JsonNode *node) - { -- g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node)); -+ json_assert_fuzzy_equals (10.2e3, json_node_get_double (node), 0.1); - } - - static void - verify_negative_double_value (JsonNode *node) - { -- g_assert_cmpfloat (-3.14, ==, json_node_get_double (node)); -+ json_assert_fuzzy_equals (-3.14, json_node_get_double (node), 0.01); - } - - static const struct { -diff --git a/json-glib/tests/reader.c b/json-glib/tests/reader.c -index 43a6aac..9bab312 100644 ---- a/json-glib/tests/reader.c -+++ b/json-glib/tests/reader.c -@@ -1,9 +1,4 @@ --#include --#include -- --#include -- --#include -+#include "json-test-utils.h" - - static const gchar *test_base_array_data = - "[ 0, true, null, \"foo\", 3.14, [ false ], { \"bar\" : 42 } ]"; -@@ -78,7 +73,7 @@ test_base_object (void) - g_assert (json_reader_get_error (reader) == NULL); - - json_reader_read_member (reader, "double"); -- g_assert_cmpfloat (json_reader_get_double_value (reader), ==, 42.47); -+ json_assert_fuzzy_equals (json_reader_get_double_value (reader), 42.47, 0.01); - json_reader_end_element (reader); - - g_object_unref (reader); From c492e85b526d06aed90b8f3a7b4b99f602072c96 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:00:55 +0100 Subject: [PATCH 019/250] gnu: imagemagick: Update to 6.9.10-15. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-15. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index fe0923f479..a3a91fe10c 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-14") + (version "6.9.10-15") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0vcfjvdk9in92x808djvy94l5gylpgds4a7mlr8jrxsv9snx88yi")))) + "0li39qs9dic5rkcq455nv6mchyj6xy55qjnw5aa96s7qxq1c6ix9")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") From b38cfa1dfd05b66e223da158bff37199dd489059 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:06:28 +0100 Subject: [PATCH 020/250] gnu: lz4: Download sources from git. * gnu/packages/compression.scm (lz4)[source]: Change to GIT-FETCH. --- gnu/packages/compression.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 32b92a976c..c87ccda304 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -796,13 +796,13 @@ writing of compressed data created with the zlib and bzip2 libraries.") (version "1.8.1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lz4/lz4/archive/" - "v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url "https://github.com/lz4/lz4") + (commit (string-append "v" version)))) (sha256 (base32 - "1y93h6dyi3026gvpzdv310ldcylnnhwf32n75mdjf8x9fvkskwqj")) - (file-name (string-append name "-" version ".tar.gz")))) + "1jggv4lvfav53advnj0pwqgxzn868lrj8dc9zp73iwvqlj82mhmx")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("valgrind" ,valgrind))) ; for tests (arguments From f00148f13e45d8d0f51f9e684e3502e0a7cd1f2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:07:52 +0100 Subject: [PATCH 021/250] gnu: libsigc++: Update to 2.10.1. * gnu/packages/glib.scm (libsigc++): Update to 2.10.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 491f688c8e..0af7c6bf00 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,7 +486,7 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsigc++/" @@ -494,7 +494,7 @@ by GDBus included in Glib.") name "-" version ".tar.xz")) (sha256 (base32 - "10cd54l4zihss9qxfhd2iip2k7mr292k37i54r2cpgv0c8sdchzq")))) + "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("m4" ,m4))) From 16b940a0794446a3acc210008bac955213e4063f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:11:29 +0100 Subject: [PATCH 022/250] gnu: OpenBLAS: Update to 0.3.4. * gnu/packages/maths.scm (openblas): Update to 0.3.4. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f1b5bb0646..9f1db83f3e 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.3") + (version "0.3.4") (source (origin (method url-fetch) @@ -2982,7 +2982,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cvlixnpc3cdvvn3f30phfvsgnqljqix6wn72ps9rj7xdhvw06jg")))) + "1s56lgilyyw86dzmj3jkci9zsg24n60wq4d0zri1hrxlxb6ihimj")))) (build-system gnu-build-system) (arguments `(#:test-target "test" From d835652ac7ddc7f65fb2240d64ffaed36836cf37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:14:10 +0100 Subject: [PATCH 023/250] gnu: libva: Update to 2.3.0. * gnu/packages/video.scm (libva): Update to 2.3.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fc6caf3ff8..18fdffeb98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -624,7 +624,7 @@ libebml is a C++ library to read and write EBML files.") (define-public libva (package (name "libva") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) @@ -636,7 +636,7 @@ libebml is a C++ library to read and write EBML files.") (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "1wjfrs261fp9wkhgpmrlz5smnhxrmsk31way646x6i2mg16a0v3g")))) + (base32 "1r6wiw4k044cpb39rfqqdw6qmzw0268whpz124hywck9v980x130")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From bc148ba47ddc15d1cd7100fb2e67eddbbb7461ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:22:50 +0100 Subject: [PATCH 024/250] gnu: gstreamer: Update to 1.14.4. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.14.4. --- gnu/packages/gstreamer.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index f43a0fc2f5..755904231b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -102,7 +102,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0mh4755an4gk0z3ygqhjpdjk0r2cwswbpwfgl0x6qmnln4757bhk")))) + "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -150,7 +150,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) @@ -158,7 +158,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0lkr1fm3bz21nqq9vi5v74mlxw6dd6i7piw00fhc5zz0dg1ikczh")))) + "0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -209,7 +209,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) @@ -218,7 +218,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0pgzgfqbfp8lz2ns68797xfxdr0cr5rpi93wd1h2grhbmzkbq4ji")))) + "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -271,14 +271,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1mczcna91f3kkk3yv5fkfa8nmqdr9d93aq9z4d8sv18vkiflw8mj")))) + "1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -346,7 +346,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) @@ -354,7 +354,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "01i31g5rvw36rjlyi9w24n0g1xa6053d14vaiba6vqpas727z123")))) + "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -381,7 +381,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append @@ -389,7 +389,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "0xxnb80yhfa42x4wx1928zydaal35b2mcj0zdcdsv1apnjdm40wv")) + "1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz")) (modules '((guix build utils))) (snippet '(begin @@ -417,7 +417,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append @@ -425,7 +425,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "01w3mpimbm8drifhrkvpns79h15kd9h9v0dynr7yb12kjrnfghsg")))) + "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. From ee2d63db617277a9f6e6b8c511886967b6947272 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:26:02 +0100 Subject: [PATCH 025/250] gnu: eudev: Download using git. * gnu/packages/linux.scm (eudev)[source]: Change to GIT-FETCH. [arguments]: Add phase "make-source-writable". --- gnu/packages/linux.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9d61734f34..6e4fac78ba 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2040,18 +2040,24 @@ from the module-init-tools project.") (name "eudev") (version "3.2.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gentoo/eudev/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url "https://github.com/gentoo/eudev") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0dlkcgy7j4fdcksqrpc373zfybiif1bal3n6lpy1kfc5280j02c7")) + "0x23vxybvciskfbdgvp4ygkxdh2pjcglni29i36a09ii23lgs17l")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-source-writable + (lambda _ + ;; XXX: Git checkouts are read-only, but this package needs to + ;; modify some of its files. + (for-each make-file-writable (find-files ".")) + #t)) (add-before 'bootstrap 'patch-file-names (lambda* (#:key inputs #:allow-other-keys) (substitute* "man/make.sh" From cb40e53158164dc689f783f67672277db73daf20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:29:03 +0100 Subject: [PATCH 026/250] gnu: eudev: Update to 3.2.7. * gnu/packages/linux.scm (eudev): Update to 3.2.7. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6e4fac78ba..846edd7212 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2038,7 +2038,7 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.5") + (version "3.2.7") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -2046,7 +2046,7 @@ from the module-init-tools project.") (file-name (git-file-name name version)) (sha256 (base32 - "0x23vxybvciskfbdgvp4ygkxdh2pjcglni29i36a09ii23lgs17l")) + "1la7x7v7yqb84wnc7w0kj53sa0an0m9xp6wn01ypi8drh02wjjy2")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments From 730a4728cc38799f9683bde5a0711ab10d42a9f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 17:38:22 +0100 Subject: [PATCH 027/250] gnu: mesa: Build against the regular LLVM package. * gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-WITHOUT-RTTI to LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): Remove variable. --- gnu/packages/gl.scm | 3 +-- gnu/packages/llvm.scm | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3968e4379d..1bf53bcbb4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -257,8 +257,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 From e8de4b1f5fe4f7fdc0c16664e1e6c159755b99dc Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sat, 24 Nov 2018 00:22:15 -0600 Subject: [PATCH 028/250] gnu: meson: Update to 0.48.2 * gnu/packages/build-tools.scm (meson): Update to 0.48.2. Signed-off-by: Marius Bakke --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a34e7ebff4..d42d03cee9 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -158,7 +158,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.47.2") + (version "0.48.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -166,7 +166,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1swmycf6p9p0ag6yiywyyri42ffkxxj38r2ic7in24km47cszn4j")))) + "01jmm2wmnqhqk6f2gfhzhyzh0il6bjbyl8syy457p76ws2zxisir")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH From a7ff66998f6e0eeb5da485bab7f6e0b55a46651e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Dec 2018 16:39:28 -0500 Subject: [PATCH 029/250] gnu: Boost: Build with C++14. Some parts of Boost which are used by other Guix packages require C++14 support. Fixes . * gnu/packages/boost.scm (boost)[arguments]: Pass 'cxxflags=-std=c++14' to #:make-flags. --- gnu/packages/boost.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b772781f56..f5c2c58300 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -67,6 +67,7 @@ `(#: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=" From 35db2ba78c765a32402dad1e42f820c1cc5b7497 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 6 Dec 2018 08:03:57 +0000 Subject: [PATCH 030/250] gnu: ruby: Update to 2.5.3. * gnu/packages/ruby.scm (ruby): Update to 2.5.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f6693237f..b8fa5a3ad9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -55,7 +55,7 @@ (define-public ruby (package (name "ruby") - (version "2.5.1") + (version "2.5.3") (source (origin (method url-fetch) @@ -64,7 +64,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0kbm3gkv689d1mb8fh261z8s79d6hw07p0xyk735yfqyskpcasl8")) + "0vrhrw7kcz9mg0jkqnihkcxqy5k05v8k1j0y2735z8wfk8sx1j8w")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi From 8c62baa0959abf8b946558d4dbd5febaaba5cd9a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 20:25:49 +0100 Subject: [PATCH 031/250] gnu: nss, nss-certs: Update to 3.40.1. * gnu/packages/certs.scm (nss-certs): Update to 3.40.1. * gnu/packages/gnuzilla.scm (nss): Likewise. [arguments]: Adjust DOMSUF variable to upstream changes. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 6af6877423..bcca98fb1b 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.39") + (version "3.40.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")))) + "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d6b1f4c2d6..24b29394ba 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -364,7 +364,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.39") + (version "3.40.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -375,7 +375,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")) + "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) @@ -415,7 +415,7 @@ in the Mozilla clients.") (lambda _ ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for testing. ;; The later requires a working DNS or /etc/hosts. - (setenv "DOMSUF" "(none)") + (setenv "DOMSUF" "localdomain") (setenv "USE_IP" "TRUE") (setenv "IP_ADDRESS" "127.0.0.1") From 16735b0b632b5f05fc914836b8f345e3a9e601dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 23:03:53 +0100 Subject: [PATCH 032/250] gnu: CUPS: Update to 2.2.10 [fixes CVE-2018-4700]. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.10. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4343910d59..acc58a840e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -176,7 +176,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.8") + (version "2.2.10") (source (origin (method url-fetch) @@ -184,7 +184,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "1r7r7b3nqpzc1a9dczqpj2mr8rkcwf01676v11sp4j7w4qfzqs1r")))) + "1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p")))) (build-system gnu-build-system) (arguments `(#:configure-flags From 83a40cbfd6720306ea4ac87cb028ebfe70611365 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Dec 2018 12:20:24 +0200 Subject: [PATCH 033/250] gnu: gdk-pixbuf: Fix typo. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Really disable installing the tests. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3b9a4145e5..0f527e0e98 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -456,7 +456,7 @@ highlighting and other features typical of a source code editor.") "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dinstalled-tests=false") + `(#:configure-flags '("-Dinstalled_tests=false") #:phases (modify-phases %standard-phases (add-after From 56a88478b908110b513f8c9c767c32facf1b202d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Dec 2018 12:22:29 +0200 Subject: [PATCH 034/250] gnu: gdk-pixbuf: Only extend the test timeout on some architectures. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]: Remove substitution extending test timeout to 1800 seconds. Replace check on armhf-linux and aarch64-linux to use 'timeout-multiplier' on the test suite. --- gnu/packages/gtk.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0f527e0e98..9f51f0d54a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -76,7 +76,9 @@ #:use-module (gnu packages cups) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages xdisorg)) + #:use-module (gnu packages xdisorg) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public atk (package @@ -471,12 +473,15 @@ highlighting and other features typical of a source code editor.") ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; assertion failed (error == NULL): Data differ ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "") - ;; Extend the timeout of the test suite. - ;; TODO: Check upstreaming effort: - ;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/21 - (("300") "1800")) + ((".*'pixbuf-jpeg'.*") "")) #t)) + ;; The slow tests take longer than the specified timeout. + ,@(if (any (cute string=? <> (%current-system)) + '("armhf-linux" "aarch64-linux")) + '((replace 'check + (lambda _ + (invoke "meson" "test" "--timeout-multiplier" "5")))) + '()) (add-before 'configure 'aid-install-script (lambda* (#:key outputs #:allow-other-keys) ;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders` From 10b96d2955f1ce20b3916cdf235670eceb48d806 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:42:26 +0100 Subject: [PATCH 035/250] gnu: ALSA: Update to 1.1.7. * gnu/packages/linux.scm (alsa-lib), alsa-utils): Update to 1.1.7. (alsa-plugins): Likewise. [arguments]: Add #:configure-flags. Prevent default configuration from being installed. Don't copy the example PulseAudio configuration to pulseaudio output. --- gnu/packages/linux.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d88b74daf..24653dfbe2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -993,7 +993,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append @@ -1001,7 +1001,7 @@ intercept and print the system calls executed by the program.") version ".tar.bz2")) (sha256 (base32 - "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z")))) + "02fw7dw202mjid49w9ki3dsfcyvid5fj488561bdzcm3haw00q4x")))) (build-system gnu-build-system) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") @@ -1013,14 +1013,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m")))) + "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -1060,14 +1060,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg")))) + "0iys4zl1davzyg3mn9lvil1n3k1ifrg3v1caj3k4dqyrnrd40jx7")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. @@ -1076,7 +1076,12 @@ MIDI functionality to the Linux-based operating system.") ;; obsolete. (outputs '("out" "pulseaudio" "jack")) (arguments - `(#:phases + `(#:configure-flags '(;; Do not install a "local" configuration targeted + ;; for /etc/alsa. On GuixSD plugins are loaded from + ;; the ALSA service, and other distributions likely + ;; won't use these files. + "--with-alsalconfdir=/tmp/noop") + #:phases (modify-phases %standard-phases (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1085,27 +1090,17 @@ MIDI functionality to the Linux-based operating system.") (jack (assoc-ref outputs "jack")) (jacklib (string-append jack "/lib/alsa-lib")) (pua (assoc-ref outputs "pulseaudio")) - (pualib (string-append pua "/lib/alsa-lib")) - (puaconf (string-append pua "/share/alsa/alsa.conf.d"))) + (pualib (string-append pua "/lib/alsa-lib"))) ;; For jack. (mkdir-p jacklib) (for-each (lambda (file) (rename-file file (string-append jacklib "/" (basename file)))) (find-files out ".*jack\\.(la|so)")) - ;; For pluseaudio. - (mkdir-p puaconf) + ;; For pulseaudio. (mkdir-p pualib) - (chdir (string-append out "/share")) - (for-each (lambda (file) - (rename-file file (string-append puaconf "/" (basename file)))) - (find-files out "\\.(conf|example)")) (for-each (lambda (file) (rename-file file (string-append pualib "/" (basename file)))) (find-files out ".*pulse\\.(la|so)")) - (chdir "..") - ;; We have moved the files to output pulsaudio, the - ;; directory is now empty. - (delete-file-recursively (string-append out "/share")) #t)))))) (inputs `(("alsa-lib" ,alsa-lib) From 1146324199f47e3cddc1c278e4765e6a51e0ba12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:30:52 +0100 Subject: [PATCH 036/250] gnu: cups-filters: Update to 1.21.5. * gnu/packages/cups.scm (cups-filters): Update to 1.21.5. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index acc58a840e..5eb66feed5 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,7 +53,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.21.0") + (version "1.21.5") (source(origin (method url-fetch) (uri @@ -61,7 +61,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0fs90xx9i4h8gbpligf5kkh21llv4kf5g3bgfbx4z272xkm7bsfi")) + "0azq9j7kqy18g6vgmvrbw8i4mcqdp3cbgh7q79x1b8p92w4si6rq")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output From 92f19f13117cf333d6f43cd1683148ab168ef3e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:35:47 +0100 Subject: [PATCH 037/250] gnu: libjpeg-turbo: Update to 2.0.1. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 207faede91..92447c23e2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1297,14 +1297,14 @@ PNG, and performs PNG integrity checks and corrections.") (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0s48zz6awd493hmb200abmsizh68fh1jmz98r41n4c8dbl87d23p")))) + "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) From 127a14e0a638a264108fdba08e83db27716d66f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:38:27 +0100 Subject: [PATCH 038/250] gnu: harfbuzz: Update to 2.2.0. * gnu/packages/gtk.scm (harfbuzz): Update to 2.2.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9f51f0d54a..a047988845 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 "1.8.8") + (version "2.2.0") (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 - "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8")))) + "047q63jr513azf3g1y7f5xn60b4jdjs9zsmrx04sfw5rasyzrk5p")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo From 143fc1a591c552b0464674cfebf8de63bdde7461 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:40:05 +0100 Subject: [PATCH 039/250] gnu: poppler: Update to 0.72.0. * gnu/packages/patches/poppler-CVE-2018-19149.patch: Delete file. * gnu/packages/patches/inkscape-poppler-compat3.patch, gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch, gnu/packages/patches/texlive-bin-pdftex-poppler-compat.patch, gnu/packages/patches/texlive-bin-xetex-poppler-compat.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/pdf.scm (poppler): Update to 0.72.0. [replacement]: Remove field. (poppler/fixed): Remove variable. * gnu/packages/inkscape.scm (inkscape)[source](patches): Add 'inkscape-poppler-compat{3..5}.patch'. * gnu/packages/tex.scm (texlive-bin)[source](patches): Update 'texlive-poppler-compat.patch'. Add 'texlive-bin-{lua,pdf,xe}tex-poppler-compat.patch'. * gnu/packages/emacs.scm (emacs-pdf-tools)[source](modules, snippet): New fields. * gnu/packages/scribus.scm (scribus)[source](patches): Add upstream patch origins. [source](modules, snippet): New fields. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add three upstream origins. [source](snippet, modules): New field. --- gnu/local.mk | 5 +- gnu/packages/emacs.scm | 10 +- gnu/packages/inkscape.scm | 19 +- gnu/packages/libreoffice.scm | 42 +- .../patches/inkscape-poppler-compat3.patch | 499 ++++++++++++++++++ .../patches/poppler-CVE-2018-19149.patch | 80 --- .../texlive-bin-luatex-poppler-compat.patch | 318 +++++++++++ .../texlive-bin-pdftex-poppler-compat.patch | 188 +++++++ .../texlive-bin-xetex-poppler-compat.patch | 31 ++ gnu/packages/pdf.scm | 13 +- gnu/packages/scribus.scm | 54 +- gnu/packages/tex.scm | 10 +- 12 files changed, 1169 insertions(+), 100 deletions(-) create mode 100644 gnu/packages/patches/inkscape-poppler-compat3.patch delete mode 100644 gnu/packages/patches/poppler-CVE-2018-19149.patch create mode 100644 gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch create mode 100644 gnu/packages/patches/texlive-bin-pdftex-poppler-compat.patch create mode 100644 gnu/packages/patches/texlive-bin-xetex-poppler-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f19b3fe79..6541bcc8be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -832,6 +832,7 @@ dist_patch_DATA = \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ + %D%/packages/patches/inkscape-poppler-compat3.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 \ @@ -1061,7 +1062,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/podofo-cmake-3.12.patch \ - %D%/packages/patches/poppler-CVE-2018-19149.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ @@ -1186,6 +1186,9 @@ dist_patch_DATA = \ %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 \ + %D%/packages/patches/texlive-bin-xetex-poppler-compat.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d8a9ffeaed..24446bfc9e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1634,7 +1634,15 @@ filters, new key bindings and faces. It can be enabled by (sha256 (base32 "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s")) - (patches (search-patches "emacs-pdf-tools-poppler.patch")))) + (patches (search-patches "emacs-pdf-tools-poppler.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; In addition to the above patch, we need this additional + ;; provision for compatibility with Poppler 0.72: + (substitute* "server/poppler-hack.cc" + (("getCString") "c_str")) + #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1673cc602e..eae8ac962b 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -71,7 +71,24 @@ (file-name "inkscape-poppler-compat2.patch") (sha256 (base32 - "14k9yrfjz4nx3bz9dk91q74mc0i7rvl2qzkwhcy1br71yqjvngn5"))))))) + "14k9yrfjz4nx3bz9dk91q74mc0i7rvl2qzkwhcy1br71yqjvngn5"))) + (search-patch "inkscape-poppler-compat3.patch") + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "d047859d90cef3784e2d13e40887a70d8d517897.diff")) + (file-name "inkscape-poppler-compat4.patch") + (sha256 + (base32 + "0xdfg3q4g4m15z7wna4brjn5j4kr15qiqc2f25vcw2nnr6x54qcp"))) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "b3d59cc8106da3bf6020a6c47eeb3b8a7bbae1a9.diff")) + (file-name "inkscape-poppler-compat5.patch") + (sha256 + (base32 + "0haviy66q9szizmvb82msfj80bb3wgi1fnq3ml8fyfp8l90a1217"))))))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 45e2f63767..451adb0eff 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -984,9 +984,47 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (file-name "libreoffice-mdds.patch") (sha256 (base32 - "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))) + "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))) + ;; The Poppler API changed rapidly in the versions leading 0.72. + ;; Thus, we need several patches from upstream, each adapting to + ;; different Poppler changes since version 0.68. + (origin + (method url-fetch) + (uri (string-append "https://github.com/LibreOffice/core/commit/" + "1688a395d05125b83eac6cd5c43f0e3f2f66c491" + ".patch")) + (file-name "libreoffice-poppler-compat.patch") + (sha256 + (base32 + "0ia5avmj772mrgs6m4qqf01hs8hzpy3nafidj7w7gqx2zz2s5ih9"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/LibreOffice/core/commit/" + "5e8bdd9203dd642111c62a6668ee665a20d4ba19" + ".patch")) + (file-name "libreoffice-poppler-gbool.patch") + (sha256 + (base32 + "19kc74h5vnk48l2vny8zmm2lkxpwc7g8n9d3wwpg99748dvbmikd"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/LibreOffice/core/commit/" + "8ff41a26caf51544699863c89598d37d93dc1b21" + ".patch")) + (file-name "libreoffice-poppler-0.71.patch") + (sha256 + (base32 + "1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f")))) (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch"))))) + "libreoffice-glm.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + (for-each (lambda (file) + ;; Adjust to renamed function in Poppler 0.72. + (substitute* file (("getCString") "c_str"))) + (find-files "sdext/source/pdfimport/xpdfwrapper")) + #t)))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/patches/inkscape-poppler-compat3.patch b/gnu/packages/patches/inkscape-poppler-compat3.patch new file mode 100644 index 0000000000..eaaf7d93f1 --- /dev/null +++ b/gnu/packages/patches/inkscape-poppler-compat3.patch @@ -0,0 +1,499 @@ +Fix compatibility with Poppler >= 0.69. + +This is a combination of these upstream commits: +https://gitlab.com/inkscape/inkscape/commit/722e121361d0f784083d10e897155b7d4e44e515 +https://gitlab.com/inkscape/inkscape/commit/402c0274420fe39fd2f3393bc7d8d8879d436358 + +...with slight adjustments for the 0.92.3 release tarball. + +diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake +--- a/CMakeScripts/DefineDependsandFlags.cmake ++++ b/CMakeScripts/DefineDependsandFlags.cmake +@@ -116,18 +116,6 @@ if(ENABLE_POPPLER) + set(HAVE_POPPLER_GLIB ON) + endif() + endif() +- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.26.0") +- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) +- endif() +- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.29.0") +- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) +- endif() +- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.58.0") +- set(POPPLER_NEW_OBJECT_API ON) +- endif() + else() + set(ENABLE_POPPLER_CAIRO OFF) + endif() +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +--- a/src/extension/internal/pdfinput/pdf-input.cpp ++++ b/src/extension/internal/pdfinput/pdf-input.cpp +@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { + dlg->getImportSettings(prefs); + + // Apply crop settings +- PDFRectangle *clipToBox = NULL; ++ _POPPLER_CONST PDFRectangle *clipToBox = NULL; + double crop_setting; + sp_repr_get_double(prefs, "cropTo", &crop_setting); + +diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h +--- a/src/extension/internal/pdfinput/pdf-input.h ++++ b/src/extension/internal/pdfinput/pdf-input.h +@@ -15,6 +15,7 @@ + #endif + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + #include + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -36,6 +36,7 @@ extern "C" { + #include "pdf-parser.h" + #include "util/units.h" + ++#include "glib/poppler-features.h" + #include "goo/gmem.h" + #include "goo/GooString.h" + #include "GlobalParams.h" +@@ -294,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA, + int /*pageNum*/, + int rotate, + Dict *resDict, +- PDFRectangle *box, +- PDFRectangle *cropBox) : ++ _POPPLER_CONST PDFRectangle *box, ++ _POPPLER_CONST PDFRectangle *cropBox) : + xref(xrefA), + builder(builderA), + subPage(gFalse), +@@ -317,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA, + builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"), + Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px")); + +- double *ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double scaledCTM[6]; + for (int i = 0; i < 6; ++i) { + baseMatrix[i] = ctm[i]; +@@ -352,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA, + PdfParser::PdfParser(XRef *xrefA, + Inkscape::Extension::Internal::SvgBuilder *builderA, + Dict *resDict, +- PDFRectangle *box) : ++ _POPPLER_CONST PDFRectangle *box) : + xref(xrefA), + builder(builderA), + subPage(gTrue), +@@ -571,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) { + + void PdfParser::execOp(Object *cmd, Object args[], int numArgs) { + PdfOperator *op; +- char *name; ++ const char *name; + Object *argPtr; + int i; + +@@ -619,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) { + (this->*op->func)(argPtr, numArgs); + } + +-PdfOperator* PdfParser::findOp(char *name) { ++PdfOperator* PdfParser::findOp(const char *name) { + int a = -1; + int b = numOps; + int cmp = -1; +@@ -1751,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, + GBool stroke, GBool eoFill) { + GfxShading *shading; + GfxPath *savedPath; +- double *ctm, *btm, *ptm; ++ const double *ctm, *btm, *ptm; + double m[6], ictm[6], m1[6]; + double xMin, yMin, xMax, yMax; + double det; +@@ -1993,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading, + GfxColor color0M, color1M, colorM0, colorM1, colorMM; + GfxColor colors2[4]; + double functionColorDelta = colorDeltas[pdfFunctionShading-1]; +- double *matrix; ++ const double *matrix; + double xM, yM; + int nComps, i, j; + +@@ -2173,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) { + } + } + +-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { ++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) { + GfxPatch patch00 = blankPatch(); + GfxPatch patch01 = blankPatch(); + GfxPatch patch10 = blankPatch(); +@@ -2581,7 +2582,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) + } + } + ++#if POPPLER_CHECK_VERSION(0,64,0) + void PdfParser::doShowText(const GooString *s) { ++#else ++void PdfParser::doShowText(GooString *s) { ++#endif + GfxFont *font; + int wMode; + double riseX, riseY; +@@ -2590,11 +2595,15 @@ void PdfParser::doShowText(const GooString *s) { + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +- double *mat; ++ const double *mat; + Object charProc; + Dict *resDict; + Parser *oldParser; ++#if POPPLER_CHECK_VERSION(0,64,0) ++ const char *p; ++#else + char *p; ++#endif + int len, n, uLen; + + font = state->getFont(); +@@ -2630,7 +2639,7 @@ void PdfParser::doShowText(const GooString *s) { + double lineX = state->getLineX(); + double lineY = state->getLineY(); + oldParser = parser; +- p = g_strdup(s->getCString()); ++ p = s->getCString(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2685,7 +2694,7 @@ void PdfParser::doShowText(const GooString *s) { + + } else { + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); +- p = g_strdup(s->getCString()); ++ p = s->getCString(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2731,7 +2740,11 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) + { + Object obj1, obj2, obj3, refObj; + +- char *name = g_strdup(args[0].getName()); ++#if POPPLER_CHECK_VERSION(0,64,0) ++ const char *name = args[0].getName(); ++#else ++ char *name = args[0].getName(); ++#endif + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +@@ -3656,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/) + Stream *PdfParser::buildImageStream() { + Object dict; + Object obj; +- char *key; + Stream *str; + + // build dictionary +@@ -3674,26 +3686,17 @@ Stream *PdfParser::buildImageStream() { + obj.free(); + #endif + } else { +- key = copyString(obj.getName()); +-#if defined(POPPLER_NEW_OBJECT_API) +- obj = parser->getObj(); +-#else +- obj.free(); +- parser->getObj(&obj); +-#endif +- if (obj.isEOF() || obj.isError()) { +- gfree(key); ++ Object obj2; ++ _POPPLER_CALL(obj2, parser->getObj); ++ if (obj2.isEOF() || obj2.isError()) { ++ _POPPLER_FREE(obj); + break; + } +-#if defined(POPPLER_NEW_OBJECT_API) +- dict.dictAdd(key, std::move(obj)); +- } +- obj = parser->getObj(); +-#else +- dict.dictAdd(key, &obj); ++ _POPPLER_DICTADD(dict, obj.getName(), obj2); ++ _POPPLER_FREE(obj); ++ _POPPLER_FREE(obj2); + } +- parser->getObj(&obj); +-#endif ++ _POPPLER_CALL(obj, parser->getObj); + } + if (obj.isEOF()) { + error(errSyntaxError, getPos(), "End of file in inline image"); +diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h +--- a/src/extension/internal/pdfinput/pdf-parser.h ++++ b/src/extension/internal/pdfinput/pdf-parser.h +@@ -9,6 +9,7 @@ + #define PDF_PARSER_H + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + #ifdef USE_GCC_PRAGMAS + #pragma interface +@@ -25,6 +26,7 @@ namespace Inkscape { + // TODO clean up and remove using: + using Inkscape::Extension::Internal::SvgBuilder; + ++#include "glib/poppler-features.h" + #include "goo/gtypes.h" + #include "Object.h" + +@@ -127,11 +129,14 @@ public: + + // Constructor for regular output. + PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate, +- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox); ++ Dict *resDict, ++ _POPPLER_CONST PDFRectangle *box, ++ _POPPLER_CONST PDFRectangle *cropBox); + + // Constructor for a sub-page object. + PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, +- Dict *resDict, PDFRectangle *box); ++ Dict *resDict, ++ _POPPLER_CONST PDFRectangle *box); + + virtual ~PdfParser(); + +@@ -185,7 +190,7 @@ private: + + void go(GBool topLevel); + void execOp(Object *cmd, Object args[], int numArgs); +- PdfOperator *findOp(char *name); ++ PdfOperator *findOp(const char *name); + GBool checkArg(Object *arg, TchkType type); + int getPos(); + +@@ -256,7 +261,7 @@ private: + double x2, double y2, GfxColor *color2, + int nComps, int depth); + void doPatchMeshShFill(GfxPatchMeshShading *shading); +- void fillPatch(GfxPatch *patch, int nComps, int depth); ++ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth); + void doEndPath(); + + // path clipping operators +@@ -287,7 +292,12 @@ private: + void opMoveShowText(Object args[], int numArgs); + void opMoveSetShowText(Object args[], int numArgs); + void opShowSpaceText(Object args[], int numArgs); ++#if POPPLER_CHECK_VERSION(0,64,0) + void doShowText(const GooString *s); ++#else ++ void doShowText(GooString *s); ++#endif ++ + + // XObject operators + void opXObject(Object args[], int numArgs); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +new file mode 100644 +--- /dev/null ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -0,0 +1,39 @@ ++#ifndef SEEN_POPPLER_TRANSITION_API_H ++#define SEEN_POPPLER_TRANSITION_API_H ++ ++#include ++ ++#if POPPLER_CHECK_VERSION(0,70,0) ++#define _POPPLER_CONST const ++#else ++#define _POPPLER_CONST ++#endif ++ ++#if POPPLER_CHECK_VERSION(0,69,0) ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj)) ++#elif POPPLER_CHECK_VERSION(0,58,0) ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj)) ++#else ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj) ++#endif ++ ++#if POPPLER_CHECK_VERSION(0,58,0) ++#define POPPLER_NEW_OBJECT_API ++#define _POPPLER_FREE(obj) ++#define _POPPLER_CALL(ret, func) (ret = func()) ++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__)) ++#else ++#define _POPPLER_FREE(obj) (obj).free() ++#define _POPPLER_CALL(ret, func) (*func(&ret)) ++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret)) ++#endif ++ ++#if POPPLER_CHECK_VERSION(0, 29, 0) ++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++#endif ++ ++#if POPPLER_CHECK_VERSION(0, 25, 0) ++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API ++#endif ++ ++#endif +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_ + if ( pattern != NULL ) { + if ( pattern->getType() == 2 ) { // Shading pattern + GfxShadingPattern *shading_pattern = static_cast(pattern); +- double *ptm; ++ const double *ptm; + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + +@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, + + Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern"); + // Set pattern transform matrix +- double *p2u = tiling_pattern->getMatrix(); ++ const double *p2u = tiling_pattern->getMatrix(); + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908 +@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, + pattern_node->setAttribute("patternUnits", "userSpaceOnUse"); + // Set pattern tiling + // FIXME: don't ignore XStep and YStep +- double *bbox = tiling_pattern->getBBox(); ++ const double *bbox = tiling_pattern->getBBox(); + sp_repr_set_svg_double(pattern_node, "x", 0.0); + sp_repr_set_svg_double(pattern_node, "y", 0.0); + sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]); +@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern, + */ + gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) { + Inkscape::XML::Node *gradient; +- Function *func; ++ _POPPLER_CONST Function *func; + int num_funcs; + bool extend0, extend1; + +@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re + + #define INT_EPSILON 8 + bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func) { ++ _POPPLER_CONST Function *func) { + int type = func->getType(); + if ( type == 0 || type == 2 ) { // Sampled or exponential function + GfxRGB stop1, stop2; +@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + _addStopToGradient(gradient, 1.0, &stop2, 1.0); + } + } else if ( type == 3 ) { // Stitching +- StitchingFunction *stitchingFunc = static_cast(func); +- double *bounds = stitchingFunc->getBounds(); +- double *encode = stitchingFunc->getEncode(); ++ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); ++ const double *bounds = stitchingFunc->getBounds(); ++ const double *encode = stitchingFunc->getEncode(); + int num_funcs = stitchingFunc->getNumFuncs(); + + // Add stops from all the stitched functions +@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + svgGetShadingColorRGB(shading, bounds[i + 1], &color); + // Add stops + if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn +- double expE = (static_cast(stitchingFunc->getFunc(i)))->getE(); ++ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); + if (expE > 1.0) { + expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 + if (encode[2*i] == 0) { // normal sequence +@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) { + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = g_strdup(font->getName()->getCString()); ++ _font_specification = font->getName()->getCString(); + } else { +- _font_specification = (char*) "Arial"; ++ _font_specification = "Arial"; + } + + // Prune the font name to get the correct font family name +@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) { + char *font_family = NULL; + char *font_style = NULL; + char *font_style_lowercase = NULL; +- char *plus_sign = strstr(_font_specification, "+"); ++ const char *plus_sign = strstr(_font_specification, "+"); + if (plus_sign) { + font_family = g_strdup(plus_sign + 1); + _font_specification = plus_sign + 1; +@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) { + Inkscape::CSSOStringStream os_font_size; + double css_font_size = _font_scaling * state->getFontSize(); + if ( font->getType() == fontType3 ) { +- double *font_matrix = font->getFontMatrix(); ++ const double *font_matrix = font->getFontMatrix(); + if ( font_matrix[0] != 0.0 ) { + css_font_size *= font_matrix[3] / font_matrix[0]; + } +@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) { + void SvgBuilder::updateTextMatrix(GfxState *state) { + _flushText(); + // Update text matrix +- double *text_matrix = state->getTextMat(); ++ const double *text_matrix = state->getTextMat(); + double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] ); + double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] ); + double max_scale; +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -15,6 +15,7 @@ + #endif + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + class SPDocument; + namespace Inkscape { +@@ -80,7 +81,7 @@ struct SvgGlyph { + bool style_changed; // Set to true if style has to be reset + SPCSSAttr *style; + int render_mode; // Text render mode +- char *font_specification; // Pointer to current font specification ++ const char *font_specification; // Pointer to current font specification + }; + + /** +@@ -174,7 +175,7 @@ private: + void _addStopToGradient(Inkscape::XML::Node *gradient, double offset, + GfxRGB *color, double opacity); + bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func); ++ _POPPLER_CONST Function *func); + gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state, + bool is_stroke=false); + // Image/mask creation +@@ -202,7 +203,7 @@ private: + + SPCSSAttr *_font_style; // Current font style + GfxFont *_current_font; +- char *_font_specification; ++ const char *_font_specification; + double _font_scaling; + bool _need_font_update; + Geom::Affine _text_matrix; diff --git a/gnu/packages/patches/poppler-CVE-2018-19149.patch b/gnu/packages/patches/poppler-CVE-2018-19149.patch deleted file mode 100644 index 3641f5f078..0000000000 --- a/gnu/packages/patches/poppler-CVE-2018-19149.patch +++ /dev/null @@ -1,80 +0,0 @@ -Fix CVE-2018-19149: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-19149 -https://gitlab.freedesktop.org/poppler/poppler/issues/664 - -Patch copied from upstream source repository: - -https://gitlab.freedesktop.org/poppler/poppler/commit/f162ecdea0dda5dbbdb45503c1d55d9afaa41d44 - -From f162ecdea0dda5dbbdb45503c1d55d9afaa41d44 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Fri, 20 Apr 2018 11:38:13 +0200 -Subject: [PATCH] Fix crash on missing embedded file - -Check whether an embedded file is actually present in the PDF -and show warning in that case. - -https://bugs.freedesktop.org/show_bug.cgi?id=106137 -https://gitlab.freedesktop.org/poppler/poppler/issues/236 ---- - glib/poppler-attachment.cc | 26 +++++++++++++++++--------- - glib/poppler-document.cc | 3 ++- - 2 files changed, 19 insertions(+), 10 deletions(-) - -diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc -index c6502e9d..11ba5bb5 100644 ---- a/glib/poppler-attachment.cc -+++ b/glib/poppler-attachment.cc -@@ -111,17 +111,25 @@ _poppler_attachment_new (FileSpec *emb_file) - attachment->description = _poppler_goo_string_to_utf8 (emb_file->getDescription ()); - - embFile = emb_file->getEmbeddedFile(); -- attachment->size = embFile->size (); -+ if (embFile != NULL && embFile->streamObject()->isStream()) -+ { -+ attachment->size = embFile->size (); - -- if (embFile->createDate ()) -- _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime); -- if (embFile->modDate ()) -- _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime); -+ if (embFile->createDate ()) -+ _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime); -+ if (embFile->modDate ()) -+ _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime); - -- if (embFile->checksum () && embFile->checksum ()->getLength () > 0) -- attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (), -- embFile->checksum ()->getLength ()); -- priv->obj_stream = embFile->streamObject()->copy(); -+ if (embFile->checksum () && embFile->checksum ()->getLength () > 0) -+ attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (), -+ embFile->checksum ()->getLength ()); -+ priv->obj_stream = embFile->streamObject()->copy(); -+ } -+ else -+ { -+ g_warning ("Missing stream object for embedded file"); -+ g_clear_object (&attachment); -+ } - - return attachment; - } -diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc -index 83f6aea6..ea319344 100644 ---- a/glib/poppler-document.cc -+++ b/glib/poppler-document.cc -@@ -670,7 +670,8 @@ poppler_document_get_attachments (PopplerDocument *document) - attachment = _poppler_attachment_new (emb_file); - delete emb_file; - -- retval = g_list_prepend (retval, attachment); -+ if (attachment != NULL) -+ retval = g_list_prepend (retval, attachment); - } - return g_list_reverse (retval); - } --- -2.19.1 - diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch new file mode 100644 index 0000000000..d8b9bf172a --- /dev/null +++ b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch @@ -0,0 +1,318 @@ +Fix LuaTeX compatibility with Poppler 0.72. + +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 + +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) + + static void copyString(PDF pdf, GooString * string) + { +- char *p; ++ 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, ' '); +@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string) + pdf->cave = true; + } + +-static void copyName(PDF pdf, char *s) ++static void copyName(PDF pdf, const char *s) + { + 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: + copyString(pdf, (GooString *)obj->getString()); + break; + case objName: +- copyName(pdf, (char *)obj->getName()); ++ copyName(pdf, obj->getName()); + break; + case objNull: + pdf_add_null(pdf); +@@ -531,22 +531,22 @@ static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) + { + switch (pagebox_spec) { + case PDF_BOX_SPEC_MEDIA: +- return page->getMediaBox(); ++ return (PDFRectangle *) page->getMediaBox(); + break; + case PDF_BOX_SPEC_CROP: +- return page->getCropBox(); ++ return (PDFRectangle *) page->getCropBox(); + break; + case PDF_BOX_SPEC_BLEED: +- return page->getBleedBox(); ++ return (PDFRectangle *) page->getBleedBox(); + break; + case PDF_BOX_SPEC_TRIM: +- return page->getTrimBox(); ++ return (PDFRectangle *) page->getTrimBox(); + break; + case PDF_BOX_SPEC_ART: +- return page->getArtBox(); ++ return (PDFRectangle *) page->getArtBox(); + break; + default: +- return page->getMediaBox(); ++ return (PDFRectangle *) page->getMediaBox(); + 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; + } +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 +@@ -240,7 +240,7 @@ static int l_new_Attribute(lua_State * L) + if (uobj->pd != NULL && uobj->pd->pc != uobj->pc) + pdfdoc_changed_error(L); + uout = new_Attribute_userdata(L); +- uout->d = new Attribute(n, nlen, (Object *)uobj->d); ++ uout->d = new Attribute((GooString)n, (Object *)uobj->d); + 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; +@@ -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) \ + pdfdoc_changed_error(L); \ +- o = ((in *) uin->d)->function(); \ ++ o = (out *) ((in *) uin->d)->function(); \ + 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) + 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; +@@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength); + + static int m_Dict_add(lua_State * L) + { +- char *s; ++ const char *s; + udstruct *uin, *uobj; + uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- s = copyString(luaL_checkstring(L, 2)); ++ s = luaL_checkstring(L, 2); + 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) + 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); + 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; +@@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L) + pdfdoc_changed_error(L); + if (!((Object *) uin->d)->isDict()) + luaL_error(L, "Object is not a Dict"); +- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d))); ++ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -2470,9 +2470,9 @@ 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()); + else + lua_pushnil(L); + return 1; +@@ -2559,9 +2559,9 @@ 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()); + 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); + if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { +- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); ++ obj = (StructTreeRoot *) ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); + 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/patches/texlive-bin-pdftex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-pdftex-poppler-compat.patch new file mode 100644 index 0000000000..eba4733f32 --- /dev/null +++ b/gnu/packages/patches/texlive-bin-pdftex-poppler-compat.patch @@ -0,0 +1,188 @@ +Fix compatibility with Poppler 0.72. + +These files are taken from the upstream "poppler0.72.0.cc" variants and +diffed against the "newpoppler" files from the 20180414 distribution. + +See revision 49336: +https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/ + +--- a/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-12-09 21:14:58.479732695 +0100 +@@ -22,7 +22,7 @@ + https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk + by Arch Linux. A little modifications are made to avoid a crash for + some kind of pdf images, such as figure_missing.pdf in gnuplot. +-The poppler should be 0.59.0 or newer versions. ++The poppler should be 0.72.0 or newer versions. + POPPLER_VERSION should be defined. + */ + +@@ -120,7 +120,7 @@ + + static InObj *inObjList; + static UsedEncoding *encodingList; +-static GBool isInit = gFalse; ++static bool isInit = false; + + // -------------------------------------------------------------------- + // Maintain list of open embedded PDF files +@@ -317,7 +317,7 @@ + pdf_puts("<<\n"); + assert(r->type == objFont); // FontDescriptor is in fd_tree + for (i = 0, l = obj->dictGetLength(); i < l; ++i) { +- key = obj->dictGetKey(i); ++ key = (char *)obj->dictGetKey(i); + if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0 + || strncmp("BaseFont", key, strlen("BaseFont")) == 0 + || strncmp("Encoding", key, strlen("Encoding")) == 0) +@@ -427,7 +427,7 @@ + charset = fontdesc.dictLookup("CharSet"); + if (!charset.isNull() && + charset.isString() && is_subsetable(fontmap)) +- epdf_mark_glyphs(fd, (char *)charset.getString()->getCString()); ++ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str()); + else + embed_whole_font(fd); + addFontDesc(fontdescRef.getRef(), fd); +@@ -454,7 +454,7 @@ + for (i = 0, l = obj->dictGetLength(); i < l; ++i) { + fontRef = obj->dictGetValNF(i); + if (fontRef.isRef()) +- copyFont(obj->dictGetKey(i), &fontRef); ++ copyFont((char *)obj->dictGetKey(i), &fontRef); + else if (fontRef.isDict()) { // some programs generate pdf with embedded font object + copyName((char *)obj->dictGetKey(i)); + pdf_puts(" "); +@@ -566,7 +566,7 @@ + pdf_printf("%s", convertNumToPDF(obj->getNum())); + } else if (obj->isString()) { + s = (GooString *)obj->getString(); +- p = s->getCString(); ++ p = (char *)s->c_str(); + l = s->getLength(); + if (strlen(p) == (unsigned int) l) { + pdf_puts("("); +@@ -664,7 +664,7 @@ + ("PDF inclusion: CID fonts are not supported" + " (try to disable font replacement to fix this)"); + } +- if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0) ++ if ((s = (char *)((Gfx8BitFont *) r->font)->getCharName(i)) != 0) + glyphNames[i] = s; + else + glyphNames[i] = notdef; +@@ -683,7 +683,7 @@ + } + + // get the pagebox according to the pagebox_spec +-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) ++static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) + { + if (pagebox_spec == pdfboxspecmedia) + return page->getMediaBox(); +@@ -715,7 +715,7 @@ + { + PdfDocument *pdf_doc; + Page *page; +- PDFRectangle *pagebox; ++ const PDFRectangle *pagebox; + #ifdef POPPLER_VERSION + int pdf_major_version_found, pdf_minor_version_found; + #else +@@ -724,8 +724,8 @@ + // initialize + if (!isInit) { + globalParams = new GlobalParams(); +- globalParams->setErrQuiet(gFalse); +- isInit = gTrue; ++ globalParams->setErrQuiet(false); ++ isInit = true; + } + // open PDF file + pdf_doc = find_add_document(image_name); +@@ -849,7 +849,7 @@ + pageObj = xref->fetch(pageRef->num, pageRef->gen); + pageDict = pageObj.getDict(); + rotate = page->getRotate(); +- PDFRectangle *pagebox; ++ const PDFRectangle *pagebox; + // write the Page header + pdf_puts("/Type /XObject\n"); + pdf_puts("/Subtype /Form\n"); +@@ -977,7 +977,7 @@ + } + l = dic1.getLength(); + for (i = 0; i < l; i++) { +- groupDict.dictAdd(copyString(dic1.getKey(i)), ++ groupDict.dictAdd((const char *)copyString(dic1.getKey(i)), + dic1.getValNF(i)); + } + // end modification +@@ -1001,14 +1001,14 @@ + pdf_puts("/Resources <<\n"); + for (i = 0, l = obj1->dictGetLength(); i < l; ++i) { + obj2 = obj1->dictGetVal(i); +- key = obj1->dictGetKey(i); ++ key = (char *)obj1->dictGetKey(i); + if (strcmp("Font", key) == 0) + copyFontResources(&obj2); + else if (strcmp("ProcSet", key) == 0) + copyProcSet(&obj2); + else +- copyOtherResources(&obj2, key); ++ copyOtherResources(&obj2, (char *)key); + } + pdf_puts(">>\n"); + } + +--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2018-12-09 21:14:58.479732695 +0100 +@@ -20,7 +20,7 @@ + /* + This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at + https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk +-by Arch Linux. The poppler should be 0.59.0 or newer versions. ++by Arch Linux. The poppler should be 0.72.0 or newer versions. + POPPLER_VERSION should be defined. + */ + +@@ -109,7 +109,7 @@ + fprintf(stderr, "No SourceName found\n"); + exit(1); + } +- outname = (char *)srcName.getString()->getCString(); ++ outname = (char *)srcName.getString()->c_str(); + // We cannot free srcName, as objname shares its string. + // srcName.free(); + } else if (objnum > 0) { +@@ -118,7 +118,7 @@ + fprintf(stderr, "Not a Stream object\n"); + exit(1); + } +- sprintf(buf, "%s", fileName->getCString()); ++ sprintf(buf, "%s", fileName->c_str()); + if ((p = strrchr(buf, '.')) == 0) + p = strchr(buf, 0); + if (objgen == 0) +@@ -128,7 +128,7 @@ + outname = buf; + } else { // objnum < 0 means we are extracting the XRef table + extract_xref_table = true; +- sprintf(buf, "%s", fileName->getCString()); ++ sprintf(buf, "%s", fileName->c_str()); + if ((p = strrchr(buf, '.')) == 0) + p = strchr(buf, 0); + sprintf(p, ".xref"); +@@ -173,9 +173,9 @@ + + // parse the header: object numbers and offsets + objStr.streamReset(); +- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first); ++ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first); + lexer = new Lexer(xref, str); +- parser = new Parser(xref, lexer, gFalse); ++ parser = new Parser(xref, lexer, false); + for (n = 0; n < nObjects; ++n) { + obj1 = parser->getObj(); + obj2 = parser->getObj(); + diff --git a/gnu/packages/patches/texlive-bin-xetex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-xetex-poppler-compat.patch new file mode 100644 index 0000000000..cac716cc59 --- /dev/null +++ b/gnu/packages/patches/texlive-bin-xetex-poppler-compat.patch @@ -0,0 +1,31 @@ +Fix compatibility with Poppler 0.72. + +Patch taken from upstream: +https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp?r1=44964&r2=48969&diff_format=u + +--- a/texk/web2c/xetexdir/pdfimage.cpp 2017/08/06 07:12:02 44964 ++++ b/texk/web2c/xetexdir/pdfimage.cpp 2018/10/22 04:01:42 48969 +@@ -82,19 +82,19 @@ + switch (pdf_box) { + default: + case pdfbox_crop: +- r = page->getCropBox(); ++ r = (PDFRectangle *)page->getCropBox(); + break; + case pdfbox_media: +- r = page->getMediaBox(); ++ r = (PDFRectangle *)page->getMediaBox(); + break; + case pdfbox_bleed: +- r = page->getBleedBox(); ++ r = (PDFRectangle *)page->getBleedBox(); + break; + case pdfbox_trim: +- r = page->getTrimBox(); ++ r = (PDFRectangle *)page->getTrimBox(); + break; + case pdfbox_art: +- r = page->getArtBox(); ++ r = (PDFRectangle *)page->getArtBox(); + break; + } diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4170e4a0ae..d5e23f6c9e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -82,15 +82,14 @@ (define-public poppler (package (name "poppler") - (replacement poppler/fixed) - (version "0.68.0") + (version "0.72.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0n0f7mv24lzv9p3dlzakpdhqg7ygcvl6l40grcz95xldzgq083gr")))) + "0lfs1b1jfamxl13zbl5n448dqvl9n8frbv8180y7b7kfyaw7wx61")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no @@ -132,14 +131,6 @@ (license license:gpl2+) (home-page "https://poppler.freedesktop.org/"))) -(define poppler/fixed - (package - (inherit poppler) - (source (origin - (inherit (package-source poppler)) - (patches (append (origin-patches (package-source poppler)) - (search-patches "poppler-CVE-2018-19149.patch"))))))) - (define-public poppler-data (package (name "poppler-data") diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 615d7e23a2..20795da275 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -56,7 +56,59 @@ (sha256 (base32 "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034")) - (patches (search-patches "scribus-poppler.patch")))) + (patches (append + ;; Scribus relies heavily on Poppler internals, which have + ;; changed a lot since the latest Scribus release (2018-04). + ;; Thus, we require a bunch of patches to stay compatible. + (search-patches "scribus-poppler.patch") + (list (origin + (method url-fetch) + (uri (string-append + "https://github.com/scribusproject/scribus/commit/" + "7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch")) + (file-name "scribus-poppler-0.64.patch") + (sha256 + (base32 + "1kr27bfzkpabrh42nsrrvlqyycdg9isbavpaa5spgmrhidcg02xj"))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/scribusproject/scribus/commit/" + "76561c1a55cd07c268f8f2b2fea888532933700b.patch")) + (file-name "scribus-poppler-config.patch") + (sha256 + (base32 + "01k18xjj82c3ndzp89dlpfhhdccc8z0acf8b04r592jyr5y9rc19"))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/scribusproject/scribus/commit/" + "8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch")) + (file-name "scribus-poppler-0.69.patch") + (sha256 + (base32 + "1avdmsj5l543j0irq18nxgiw99n395jj56ih5dsal59fn0wbqk42"))) + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit/" + "community.git/plain/trunk/scribus-" + "poppler-0.70.patch?h=packages/scribus&id=" + "8ef43ee2fceb0753ed5a76bb0a11c84775898ffc")) + (file-name "scribus-poppler-0.70.patch") + (sha256 + (base32 + "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))))) + (modules '((guix build utils))) + (snippet + '(begin + (for-each (lambda (file) + (substitute* file + ;; These are required for compatibility with Poppler 0.71. + (("GBool") "bool") (("gTrue") "true") (("gFalse") "false") + ;; ...and this for Poppler 0.72. + (("getCString") "c_str"))) + (find-files "scribus/plugins/import/pdf")) + #t)))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 916aa54d58..d345e89430 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -102,15 +102,19 @@ (patches (list ;; This is required for compatibility with Poppler 0.64.0 and to fix a - ;; segmentation fault in dvipdfm-x from XeTeX. + ;; segmentation fault in dvipdfm-x from XeTeX, and also contains a fix + ;; for CVE-2018-17407. (origin (method url-fetch) (uri (string-append "http://www.linuxfromscratch.org/patches/blfs/" - "svn/texlive-" version "-source-upstream_fixes-1.patch")) + "svn/texlive-" version "-source-upstream_fixes-2.patch")) (file-name "texlive-poppler-compat.patch") (sha256 (base32 - "0f8vhyj167y4xj0jx47vkybrcacfpxw0wdn1b777yq3xmhlahhlg"))))))) + "04sxy1qv9y575mxwyg3y7rx7mh540pfjqx7yni7ncb5wjbq9pq1a"))) + (search-patch "texlive-bin-luatex-poppler-compat.patch") + (search-patch "texlive-bin-pdftex-poppler-compat.patch") + (search-patch "texlive-bin-xetex-poppler-compat.patch"))))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) From 7ede9a5e41dda956a36f404476d0576e2812060b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:42:04 +0100 Subject: [PATCH 040/250] gnu: D-Bus: Update to 1.12.12. * gnu/packages/glib.scm (dbus): Update to 1.12.12. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 61d8e84d54..39b0a5f9e6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -79,7 +79,7 @@ (define dbus (package (name "dbus") - (version "1.12.10") + (version "1.12.12") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ version ".tar.gz")) (sha256 (base32 - "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab")) + "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments From 7ba85f5380db741ecaec3b4013e80ab55efc9ed8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:44:31 +0100 Subject: [PATCH 041/250] gnu: glib: Remove obsolete variable. * gnu/packages/glib.scm (glib)[arguments]: Don't set DETERMINISTIC_BUILD. --- gnu/packages/glib.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 39b0a5f9e6..016fae11f1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -184,9 +184,6 @@ shared NFS home directories.") (modify-phases %standard-phases (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") From 51c40a06a3705a6e73974bf809c0b5232b7bb7b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:47:40 +0100 Subject: [PATCH 042/250] gnu: glib: Update to 2.56.3. * gnu/packages/glib.scm (glib): Update to 2.56.3. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 016fae11f1..dee349395d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -149,7 +149,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.2") + (version "2.56.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -157,7 +157,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "12d738n1wpvrn39zvy9xazg5h6vzyiwsw8z1qibcj09mh4bbsjnn")) + "1cjcqz77m62zrx7224vl3f2cxwqf28r5xpqb2jy7av0vr2scb959")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything From ef2a540ac4233f77bf9127395187c0b6e3199810 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:53:44 +0100 Subject: [PATCH 043/250] gnu: pixman: Update to 0.36.0. * gnu/packages/xdisorg.scm (pixman): Update to 0.36.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fdbe19c059..de4cac9e94 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -292,7 +292,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.34.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (string-append @@ -300,7 +300,7 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "13m842m9ffac3m9r0b4lvwjhwzg3w4353djkjpf00s0wnm4v5di1")) + "1blzrx50ssdv0pn56hcv2v0zw0vrjwj1sx22pkgjls1p9n6rr88w")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs From d1ee69a9e8b33cdf6463fbece0421bb1e937b4ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 00:56:58 +0100 Subject: [PATCH 044/250] gnu: cairo: Update to 1.16.0. * gnu/packages/patches/cairo-CVE-2016-9082.patch, gnu/packages/patches/cairo-setjmp-wrapper.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them/ * gnu/packages/gtk.scm (cairo): Update to 1.16.0. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/gtk.scm | 6 +- .../patches/cairo-CVE-2016-9082.patch | 122 ------------------ .../patches/cairo-setjmp-wrapper.patch | 78 ----------- 4 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 gnu/packages/patches/cairo-CVE-2016-9082.patch delete mode 100644 gnu/packages/patches/cairo-setjmp-wrapper.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6541bcc8be..aaab4c72ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -608,8 +608,6 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/borg-respect-storage-quota.patch \ %D%/packages/patches/byobu-writable-status.patch \ - %D%/packages/patches/cairo-CVE-2016-9082.patch \ - %D%/packages/patches/cairo-setjmp-wrapper.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a047988845..7992a978c8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -115,16 +115,14 @@ tools have full access to view and control running applications.") (define-public cairo (package (name "cairo") - (version "1.14.12") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) (sha256 (base32 - "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c")) - (patches (search-patches "cairo-CVE-2016-9082.patch" - "cairo-setjmp-wrapper.patch")))) + "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) (build-system gnu-build-system) (propagated-inputs `(("fontconfig" ,fontconfig) diff --git a/gnu/packages/patches/cairo-CVE-2016-9082.patch b/gnu/packages/patches/cairo-CVE-2016-9082.patch deleted file mode 100644 index ad83404194..0000000000 --- a/gnu/packages/patches/cairo-CVE-2016-9082.patch +++ /dev/null @@ -1,122 +0,0 @@ -From: Adrian Johnson -Date: Thu, 20 Oct 2016 21:12:30 +1030 -Subject: [PATCH] image: prevent invalid ptr access for > 4GB images - -Image data is often accessed using: - - image->data + y * image->stride - -On 64-bit achitectures if the image data is > 4GB, this computation -will overflow since both y and stride are 32-bit types. - -bug report: https://bugs.freedesktop.org/show_bug.cgi?id=98165 -patch: https://bugs.freedesktop.org/attachment.cgi?id=127421 ---- - boilerplate/cairo-boilerplate.c | 4 +++- - src/cairo-image-compositor.c | 4 ++-- - src/cairo-image-surface-private.h | 2 +- - src/cairo-mesh-pattern-rasterizer.c | 2 +- - src/cairo-png.c | 2 +- - src/cairo-script-surface.c | 3 ++- - 6 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c -index 7fdbf79..4804dea 100644 ---- a/boilerplate/cairo-boilerplate.c -+++ b/boilerplate/cairo-boilerplate.c -@@ -42,6 +42,7 @@ - #undef CAIRO_VERSION_H - #include "../cairo-version.h" - -+#include - #include - #include - #include -@@ -976,7 +977,8 @@ cairo_surface_t * - cairo_boilerplate_image_surface_create_from_ppm_stream (FILE *file) - { - char format; -- int width, height, stride; -+ int width, height; -+ ptrdiff_t stride; - int x, y; - unsigned char *data; - cairo_surface_t *image = NULL; -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index 48072f8..3ca0006 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -1575,7 +1575,7 @@ typedef struct _cairo_image_span_renderer { - pixman_image_t *src, *mask; - union { - struct fill { -- int stride; -+ ptrdiff_t stride; - uint8_t *data; - uint32_t pixel; - } fill; -@@ -1594,7 +1594,7 @@ typedef struct _cairo_image_span_renderer { - struct finish { - cairo_rectangle_int_t extents; - int src_x, src_y; -- int stride; -+ ptrdiff_t stride; - uint8_t *data; - } mask; - } u; -diff --git a/src/cairo-image-surface-private.h b/src/cairo-image-surface-private.h -index 8ca694c..7e78d61 100644 ---- a/src/cairo-image-surface-private.h -+++ b/src/cairo-image-surface-private.h -@@ -71,7 +71,7 @@ struct _cairo_image_surface { - - int width; - int height; -- int stride; -+ ptrdiff_t stride; - int depth; - - unsigned owns_data : 1; -diff --git a/src/cairo-mesh-pattern-rasterizer.c b/src/cairo-mesh-pattern-rasterizer.c -index 1b63ca8..e7f0db6 100644 ---- a/src/cairo-mesh-pattern-rasterizer.c -+++ b/src/cairo-mesh-pattern-rasterizer.c -@@ -470,7 +470,7 @@ draw_pixel (unsigned char *data, int width, int height, int stride, - tg += tg >> 16; - tb += tb >> 16; - -- *((uint32_t*) (data + y*stride + 4*x)) = ((ta << 16) & 0xff000000) | -+ *((uint32_t*) (data + y*(ptrdiff_t)stride + 4*x)) = ((ta << 16) & 0xff000000) | - ((tr >> 8) & 0xff0000) | ((tg >> 16) & 0xff00) | (tb >> 24); - } - } -diff --git a/src/cairo-png.c b/src/cairo-png.c -index 562b743..aa8c227 100644 ---- a/src/cairo-png.c -+++ b/src/cairo-png.c -@@ -673,7 +673,7 @@ read_png (struct png_read_closure_t *png_closure) - } - - for (i = 0; i < png_height; i++) -- row_pointers[i] = &data[i * stride]; -+ row_pointers[i] = &data[i * (ptrdiff_t)stride]; - - png_read_image (png, row_pointers); - png_read_end (png, info); -diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c -index ea0117d..91e4baa 100644 ---- a/src/cairo-script-surface.c -+++ b/src/cairo-script-surface.c -@@ -1202,7 +1202,8 @@ static cairo_status_t - _write_image_surface (cairo_output_stream_t *output, - const cairo_image_surface_t *image) - { -- int stride, row, width; -+ int row, width; -+ ptrdiff_t stride; - uint8_t row_stack[CAIRO_STACK_BUFFER_SIZE]; - uint8_t *rowdata; - uint8_t *data; --- -2.1.4 - diff --git a/gnu/packages/patches/cairo-setjmp-wrapper.patch b/gnu/packages/patches/cairo-setjmp-wrapper.patch deleted file mode 100644 index bffac6e041..0000000000 --- a/gnu/packages/patches/cairo-setjmp-wrapper.patch +++ /dev/null @@ -1,78 +0,0 @@ -Revert faulty commit to avoid undefined behaviour: -https://bugs.freedesktop.org/show_bug.cgi?id=104325 - -Taken from this upstream commit: -https://cgit.freedesktop.org/cairo/commit/?h=1.14&id=2acc4382c54bd8239361ceed14423412a343d311 - -diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c -index cb2e30c..5541bdc 100644 ---- a/src/cairo-bentley-ottmann-rectangular.c -+++ b/src/cairo-bentley-ottmann-rectangular.c -@@ -593,12 +593,6 @@ sweep_line_insert (sweep_line_t *sweep, rectangle_t *rectangle) - pqueue_push (sweep, rectangle); - } - --static int --sweep_line_setjmp (sweep_line_t *sweep_line) --{ -- return setjmp (sweep_line->unwind); --} -- - static cairo_status_t - _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, - int num_rectangles, -@@ -615,7 +609,7 @@ _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, - rectangles, num_rectangles, - fill_rule, - do_traps, container); -- if ((status = sweep_line_setjmp (&sweep_line))) -+ if ((status = setjmp (sweep_line.unwind))) - return status; - - rectangle = rectangle_pop_start (&sweep_line); -diff --git a/src/cairo-png.c b/src/cairo-png.c -index e64b14a..068617d 100644 ---- a/src/cairo-png.c -+++ b/src/cairo-png.c -@@ -158,14 +158,6 @@ png_simple_warning_callback (png_structp png, - */ - } - --static int --png_setjmp (png_struct *png) --{ --#ifdef PNG_SETJMP_SUPPORTED -- return setjmp (png_jmpbuf (png)); --#endif -- return 0; --} - - /* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn. - * Otherwise, we will segfault if we are writing to a stream. */ -@@ -237,8 +229,10 @@ write_png (cairo_surface_t *surface, - goto BAIL4; - } - -- if (png_setjmp (png)) -+#ifdef PNG_SETJMP_SUPPORTED -+ if (setjmp (png_jmpbuf (png))) - goto BAIL4; -+#endif - - png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn); - -@@ -577,11 +571,12 @@ read_png (struct png_read_closure_t *png_closure) - png_set_read_fn (png, png_closure, stream_read_func); - - status = CAIRO_STATUS_SUCCESS; -- -- if (png_setjmp (png)) { -+#ifdef PNG_SETJMP_SUPPORTED -+ if (setjmp (png_jmpbuf (png))) { - surface = _cairo_surface_create_in_error (status); - goto BAIL; - } -+#endif - - png_read_info (png, info); - From ad1c07eb6d344dd86c3205f9b4f5126e84e747d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Dec 2018 19:31:09 +0100 Subject: [PATCH 045/250] gnu: libqmi: Update to 1.20.2. * gnu/packages/freedesktop.scm (libqmi): Update to 1.20.2. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f8e97acf51..536895cba8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -763,7 +763,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.20.0") + (version "1.20.2") (source (origin (method url-fetch) (uri (string-append @@ -771,7 +771,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") name "-" version ".tar.xz")) (sha256 (base32 - "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1")))) + "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) From 30eb854a5714600405f2817a4965663c7d6e0d7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 00:59:01 +0100 Subject: [PATCH 046/250] gnu: curl: Remove replacement for 7.62.0. * gnu/packages/curl.scm (curl): Update to 7.62.0. [replacement]: Remove field. (curl-7.62.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 61313af7d2..9430ece467 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.61.1") - (replacement curl-7.62.0) + (version "7.62.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))) + "1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs")))) (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.62.0 - (package - (inherit curl) - (version "7.62.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs")))))) - (define-public kurly (package (name "kurly") From 87f29c1e5d00050ffb7bef0ee26cb6a4cad49d0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 01:10:00 +0100 Subject: [PATCH 047/250] gnu: ghostscript: Update to 9.26. * gnu/packages/patches/ghostscript-bug-699708.patch, gnu/packages/patches/ghostscript-CVE-2018-16509.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.26. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - gnu/packages/ghostscript.scm | 8 +- .../patches/ghostscript-CVE-2018-16509.patch | 193 ------------------ .../patches/ghostscript-bug-699708.patch | 160 --------------- 4 files changed, 3 insertions(+), 360 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2018-16509.patch delete mode 100644 gnu/packages/patches/ghostscript-bug-699708.patch diff --git a/gnu/local.mk b/gnu/local.mk index aaab4c72ec..45d8effc11 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -738,8 +738,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghc-haddock-library-unbundle.patch \ - %D%/packages/patches/ghostscript-CVE-2018-16509.patch \ - %D%/packages/patches/ghostscript-bug-699708.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index b46451d94e..d8c0050513 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -135,7 +135,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.24") + (version "9.26") (source (origin (method url-fetch) @@ -145,10 +145,8 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) - (patches (search-patches "ghostscript-CVE-2018-16509.patch" - "ghostscript-bug-699708.patch" - "ghostscript-no-header-creationdate.patch" + "1645f47all5w27bfhiq15vycdm954lmr6agqkrp68ksq6xglgvch")) + (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/ghostscript-CVE-2018-16509.patch b/gnu/packages/patches/ghostscript-CVE-2018-16509.patch deleted file mode 100644 index 50ffa3cb98..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2018-16509.patch +++ /dev/null @@ -1,193 +0,0 @@ -Ghostscript 9.24 was released with an incomplete fix for CVE-2018-16509: -https://nvd.nist.gov/vuln/detail/CVE-2018-16509 -https://bugs.chromium.org/p/project-zero/issues/detail?id=1640#c19 -https://bugs.ghostscript.com/show_bug.cgi?id=699718 - -The reproducers no longer work after applying these commits: - -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5812b1b78fc4d36fdc293b7859de69241140d590 -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=e914f1da46e33decc534486598dc3eadf69e6efb -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=3e5d316b72e3965b7968bb1d96baa137cd063ac6 -https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=643b24dbd002fb9c131313253c307cf3951b3d47 - -This patch is a "squashed" version of those. - -diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps -index bba3c8c0e..8fa7c51df 100644 ---- a/Resource/Init/gs_setpd.ps -+++ b/Resource/Init/gs_setpd.ps -@@ -95,27 +95,41 @@ level2dict begin - { % Since setpagedevice doesn't create new device objects, - % we must (carefully) reinstall the old parameters in - % the same device. -- .currentpagedevice pop //null currentdevice //null .trysetparams -+ .currentpagedevice pop //null currentdevice //null -+ { .trysetparams } .internalstopped -+ { -+ //null -+ } if - dup type /booleantype eq - { pop pop } -- { % This should never happen! -+ { - SETPDDEBUG { (Error in .trysetparams!) = pstack flush } if -- cleartomark pop pop pop -+ {cleartomark pop pop pop} .internalstopped pop -+ % if resetting the entire device state failed, at least put back the -+ % security related key -+ currentdevice //null //false mark /.LockSafetyParams -+ currentpagedevice /.LockSafetyParams .knownget not -+ {systemdict /SAFER .knownget not {//false} } if -+ .putdeviceparamsonly - /.installpagedevice cvx /rangecheck signalerror - } - ifelse pop pop - % A careful reading of the Red Book reveals that an erasepage - % should occur, but *not* an initgraphics. - erasepage .beginpage -- } bind def -+ } bind executeonly def - - /.uninstallpagedevice -- { 2 .endpage { .currentnumcopies //false .outputpage } if -+ { -+ {2 .endpage { .currentnumcopies //false .outputpage } if} .internalstopped pop - nulldevice - } bind def - - (%grestorepagedevice) cvn -- { .uninstallpagedevice grestore .installpagedevice -+ { -+ .uninstallpagedevice -+ grestore -+ .installpagedevice - } bind def - - (%grestoreallpagedevice) cvn -diff --git a/psi/zdevice2.c b/psi/zdevice2.c -index 0c7080d57..159a0c0d9 100644 ---- a/psi/zdevice2.c -+++ b/psi/zdevice2.c -@@ -251,8 +251,8 @@ z2currentgstate(i_ctx_t *i_ctx_p) - /* ------ Wrappers for operators that reset the graphics state. ------ */ - - /* Check whether we need to call out to restore the page device. */ --static bool --restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) -+static int -+restore_page_device(i_ctx_t *i_ctx_p, const gs_gstate * pgs_old, const gs_gstate * pgs_new) - { - gx_device *dev_old = gs_currentdevice(pgs_old); - gx_device *dev_new; -@@ -260,9 +260,10 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) - gx_device *dev_t2; - bool samepagedevice = obj_eq(dev_old->memory, &gs_int_gstate(pgs_old)->pagedevice, - &gs_int_gstate(pgs_new)->pagedevice); -+ bool LockSafetyParams = dev_old->LockSafetyParams; - - if ((dev_t1 = (*dev_proc(dev_old, get_page_device)) (dev_old)) == 0) -- return false; -+ return 0; - /* If we are going to putdeviceparams in a callout, we need to */ - /* unlock temporarily. The device will be re-locked as needed */ - /* by putdeviceparams from the pgs_old->pagedevice dict state. */ -@@ -271,23 +272,51 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) - dev_new = gs_currentdevice(pgs_new); - if (dev_old != dev_new) { - if ((dev_t2 = (*dev_proc(dev_new, get_page_device)) (dev_new)) == 0) -- return false; -- if (dev_t1 != dev_t2) -- return true; -+ samepagedevice = true; -+ else if (dev_t1 != dev_t2) -+ samepagedevice = false; -+ } -+ -+ if (LockSafetyParams && !samepagedevice) { -+ const int required_ops = 512; -+ const int required_es = 32; -+ -+ /* The %grestorepagedevice must complete: the biggest danger -+ is operand stack overflow. As we use get/putdeviceparams -+ that means pushing all the device params onto the stack, -+ pdfwrite having by far the largest number of parameters -+ at (currently) 212 key/value pairs - thus needing (currently) -+ 424 entries on the op stack. Allowing for working stack -+ space, and safety margin..... -+ */ -+ if (required_ops + ref_stack_count(&o_stack) >= ref_stack_max_count(&o_stack)) { -+ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; -+ return_error(gs_error_stackoverflow); -+ } -+ /* We also want enough exec stack space - 32 is an overestimate of -+ what we need to complete the Postscript call out. -+ */ -+ if (required_es + ref_stack_count(&e_stack) >= ref_stack_max_count(&e_stack)) { -+ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; -+ return_error(gs_error_execstackoverflow); -+ } - } - /* - * The current implementation of setpagedevice just sets new - * parameters in the same device object, so we have to check - * whether the page device dictionaries are the same. - */ -- return !samepagedevice; -+ return samepagedevice ? 0 : 1; - } - - /* - grestore - */ - static int - z2grestore(i_ctx_t *i_ctx_p) - { -- if (!restore_page_device(igs, gs_gstate_saved(igs))) -+ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); -+ if (code < 0) return code; -+ -+ if (code == 0) - return gs_grestore(igs); - return push_callout(i_ctx_p, "%grestorepagedevice"); - } -@@ -297,7 +326,9 @@ static int - z2grestoreall(i_ctx_t *i_ctx_p) - { - for (;;) { -- if (!restore_page_device(igs, gs_gstate_saved(igs))) { -+ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); -+ if (code < 0) return code; -+ if (code == 0) { - bool done = !gs_gstate_saved(gs_gstate_saved(igs)); - - gs_grestore(igs); -@@ -328,11 +359,15 @@ z2restore(i_ctx_t *i_ctx_p) - if (code < 0) return code; - - while (gs_gstate_saved(gs_gstate_saved(igs))) { -- if (restore_page_device(igs, gs_gstate_saved(igs))) -+ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); -+ if (code < 0) return code; -+ if (code > 0) - return push_callout(i_ctx_p, "%restore1pagedevice"); - gs_grestore(igs); - } -- if (restore_page_device(igs, gs_gstate_saved(igs))) -+ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); -+ if (code < 0) return code; -+ if (code > 0) - return push_callout(i_ctx_p, "%restorepagedevice"); - - code = dorestore(i_ctx_p, asave); -@@ -355,9 +390,12 @@ static int - z2setgstate(i_ctx_t *i_ctx_p) - { - os_ptr op = osp; -+ int code; - - check_stype(*op, st_igstate_obj); -- if (!restore_page_device(igs, igstate_ptr(op))) -+ code = restore_page_device(i_ctx_p, igs, igstate_ptr(op)); -+ if (code < 0) return code; -+ if (code == 0) - return zsetgstate(i_ctx_p); - return push_callout(i_ctx_p, "%setgstatepagedevice"); - } diff --git a/gnu/packages/patches/ghostscript-bug-699708.patch b/gnu/packages/patches/ghostscript-bug-699708.patch deleted file mode 100644 index 1567be1c6f..0000000000 --- a/gnu/packages/patches/ghostscript-bug-699708.patch +++ /dev/null @@ -1,160 +0,0 @@ -Additional security fix that missed 9.24. - -Taken from upstream: -http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=fb713b3818b52d8a6cf62c951eba2e1795ff9624 - -From fb713b3818b52d8a6cf62c951eba2e1795ff9624 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Thu, 6 Sep 2018 09:16:22 +0100 -Subject: [PATCH] Bug 699708 (part 1): 'Hide' non-replaceable error handlers - for SAFER - -We already had a 'private' dictionary for non-standard errors: gserrordict. - -This now includes all the default error handlers, the dictionary is made -noaccess and all the prodedures are bound and executeonly. - -When running with -dSAFER, in the event of a Postscript error, instead of -pulling the handler from errordict, we'll pull it from gserrordict - thus -malicious input cannot trigger problems by the use of custom error handlers. - -errordict remains open and writeable, so files such as the Quality Logic tests -that install their own handlers will still 'work', with the exception that the -custom error handlers will not be called. - -This is a 'first pass', 'sledgehammer' approach: a nice addition would to allow -an integrator to specify a list of errors that are not to be replaced (for -example, embedded applications would probably want to ensure that VMerror is -always handled as they intend). ---- - Resource/Init/gs_init.ps | 29 ++++++++++++++++++----------- - psi/interp.c | 30 +++++++++++++++++++++--------- - 2 files changed, 39 insertions(+), 20 deletions(-) - -diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps -index 071c39205..bc8b7951c 100644 ---- a/Resource/Init/gs_init.ps -+++ b/Resource/Init/gs_init.ps -@@ -881,7 +881,7 @@ userdict /.currentresourcefile //null put - { not exch pop exit } { pop } ifelse - } - for exch pop .quit -- } bind def -+ } bind executeonly def - /.errorhandler % .errorhandler - - { % Detect an internal 'stopped'. - 1 .instopped { //null eq { pop pop stop } if } if -@@ -926,7 +926,7 @@ userdict /.currentresourcefile //null put - $error /globalmode get $error /.nosetlocal get and .setglobal - $error /.inerror //false put - stop -- } bind def -+ } bind executeonly def - % Define the standard handleerror. We break out the printing procedure - % (.printerror) so that it can be extended for binary output - % if the Level 2 facilities are present. -@@ -976,7 +976,7 @@ userdict /.currentresourcefile //null put - ifelse % newerror - end - flush -- } bind def -+ } bind executeonly def - /.printerror_long % long error printout, - % $error is on the dict stack - { % Push the (anonymous) stack printing procedure. -@@ -1053,14 +1053,14 @@ userdict /.currentresourcefile //null put - { (Current file position is ) print position = } - if - -- } bind def -+ } bind executeonly def - % Define a procedure for clearing the error indication. - /.clearerror - { $error /newerror //false put - $error /errorname //null put - $error /errorinfo //null put - 0 .setoserrno -- } bind def -+ } bind executeonly def - - % Define $error. This must be in local VM. - .currentglobal //false .setglobal -@@ -1086,11 +1086,15 @@ end - /errordict ErrorNames length 3 add dict - .forcedef % errordict is local, systemdict is global - .setglobal % back to global VM --% For greater Adobe compatibility, we put all non-standard errors in a --% separate dictionary, gserrordict. It does not need to be in local VM, --% because PostScript programs do not access it. -+% gserrordict contains all the default error handling methods, but unlike -+% errordict it is noaccess after creation (also it is in global VM). -+% When running 'SAFER', we'll ignore the contents of errordict, which -+% may have been tampered with by the running job, and always use gserrordict -+% gserrordict also contains any non-standard errors, for better compatibility -+% with Adobe. -+% - % NOTE: the name gserrordict is known to the interpreter. --/gserrordict 5 dict def -+/gserrordict ErrorNames length 3 add dict def - % Register an error in errordict. We make this a procedure because we only - % register the Level 1 errors here: the rest are registered by "feature" - % files. However, ErrorNames contains all of the error names regardless of -@@ -1119,8 +1123,11 @@ errordict begin - } bind def - end % errordict - --% Put non-standard errors in gserrordict. --gserrordict /unknownerror errordict /unknownerror get put -+% Put all the default handlers in gserrordict -+gserrordict -+errordict {2 index 3 1 roll put} forall -+noaccess pop -+% remove the non-standard errors from errordict - errordict /unknownerror .undef - % Define a stable private copy of handleerror that we will always use under - % JOBSERVER mode. -diff --git a/psi/interp.c b/psi/interp.c -index c27b70dca..d41a9d3f5 100644 ---- a/psi/interp.c -+++ b/psi/interp.c -@@ -661,16 +661,28 @@ again: - return code; - if (gs_errorname(i_ctx_p, code, &error_name) < 0) - return code; /* out-of-range error code! */ -- /* -- * For greater Adobe compatibility, only the standard PostScript errors -- * are defined in errordict; the rest are in gserrordict. -+ -+ /* If LockFilePermissions is true, we only refer to gserrordict, which -+ * is not accessible to Postcript jobs - */ -- if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || -- (dict_find(perrordict, &error_name, &epref) <= 0 && -- (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -- dict_find(perrordict, &error_name, &epref) <= 0)) -- ) -- return code; /* error name not in errordict??? */ -+ if (i_ctx_p->LockFilePermissions) { -+ if (((dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -+ dict_find(perrordict, &error_name, &epref) <= 0)) -+ ) -+ return code; /* error name not in errordict??? */ -+ } -+ else { -+ /* -+ * For greater Adobe compatibility, only the standard PostScript errors -+ * are defined in errordict; the rest are in gserrordict. -+ */ -+ if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || -+ (dict_find(perrordict, &error_name, &epref) <= 0 && -+ (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || -+ dict_find(perrordict, &error_name, &epref) <= 0)) -+ ) -+ return code; /* error name not in errordict??? */ -+ } - doref = *epref; - epref = &doref; - /* Push the error object on the operand stack if appropriate. */ --- -2.18.0 - From c3c7e0941ebdb476b534224e38474e47b2d38d9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 01:17:00 +0100 Subject: [PATCH 048/250] gnu: icu4c: Update to 63.1. * gnu/packages/icu4c.scm (icu4c): Update to 63.1. --- gnu/packages/icu4c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 2d28107e81..6e93d6aed9 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -32,7 +32,7 @@ (define-public icu4c (package (name "icu4c") - (version "62.1") + (version "63.1") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "18ssgnwzzpm1g1fvbm9h1fvryiwxvvn5wc3fdakdsl33cs6qdn9x")))) + (base32 "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) From 62c75d6d089040daf18c891089e4ff367e924679 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 01:18:55 +0100 Subject: [PATCH 049/250] gnu: tzdata-for-tests: Update to 2018g. * gnu/packages/base.scm (tzdata-for-tests): Inherit TZDATA. --- gnu/packages/base.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 55a0290600..932416a60d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1173,23 +1173,7 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata) - (version "2018d") - (source (origin - (method url-fetch) - (uri (string-append "https://www.iana.org/time-zones/repository" - "/releases/tzdata" version ".tar.gz")) - (sha256 - (base32 - "0m6020dnk9r40z7k36jp13fa06xip3hn0fdx3nly66jzxgffs1ji")))) - (inputs `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "http://www.iana.org/time-zones/repository/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "1nd882yhsazmcfqmcqyfig3axycryl30gmizgqhqsx5dpa2lxr3x"))))))))) + (inherit tzdata)))) (define-public libiconv (package From 6a4d56346cadfc5fab829a8e78fbbd5024729a11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 01:26:05 +0100 Subject: [PATCH 050/250] gnu: nghttp2: Update to 1.35.1. * gnu/packages/web.scm (nghttp2): Update to 1.35.1. [native-inputs]: Add GCC-7. [arguments]: Add workaround for . --- gnu/packages/web.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index caf56e4119..17deb5c222 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -79,6 +79,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages kerberos) + #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -6696,7 +6697,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.32.0") + (version "1.35.1") (source (origin (method url-fetch) @@ -6705,12 +6706,13 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh")))) + "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 (native-inputs `(("pkg-config" ,pkg-config) + ("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later ;; Required by tests. ("cunit" ,cunit) @@ -6742,6 +6744,9 @@ 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") From 2a60f9eb3e2b75c4ae6b79d859f7303c2f06b682 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 01:33:25 +0100 Subject: [PATCH 051/250] gnu: nettle: Update to 3.4.1. * gnu/packages/nettle.scm (nettle): Update to 3.4.1. --- gnu/packages/nettle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 1212f32812..1f91b74d8b 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") + (version "3.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" version ".tar.gz")) (sha256 (base32 - "150y8655h629wn946dvzasq16qxsc1m9nf58mifvhl350bgl4ymf")))) + "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr")))) (arguments (substitute-keyword-arguments (package-arguments nettle-2) ((#:configure-flags flags) From 56ba3771c0f35e2825559e536860e1659d683a64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 19:17:44 +0100 Subject: [PATCH 052/250] gnu: mit-krb5: Update to 1.16.2. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.16.2. --- gnu/packages/kerberos.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 508f9c4bd2..ad19f60ec1 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -48,7 +48,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (list @@ -60,7 +60,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "05qis9l93hhxaknbp0a2v5cr24fsy52fqx20aqqcgl1s9qwzwkr1")))) + "09zhhzj19bmjjxsvxdrysabql8n72kjivis08wbikhlkwlgiwwlz")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) From af0162bcc1057aeda9bcadd40dee5a884106f49f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 02:34:08 +0100 Subject: [PATCH 053/250] gnu: cyrus-sasl: Update to 2.1.27. * gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/cyrus-sasl.scm (cyrus-sasl): Update to 2.1.27. [source](patches): Remove. [inputs]: Move MIT-KRB5 from here ... [propagated-inputs]: ... to here. New field. * gnu/packages/openldap.scm (openldap)[arguments]: Adjust 'patch-sasl-path' phase (which was defunct, possibly since b148506df74) to add krb5 linker flags. --- gnu/local.mk | 1 - gnu/packages/cyrus-sasl.scm | 9 +- gnu/packages/openldap.scm | 10 +- .../patches/cyrus-sasl-CVE-2013-4122.patch | 130 ------------------ 4 files changed, 12 insertions(+), 138 deletions(-) delete mode 100644 gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch diff --git a/gnu/local.mk b/gnu/local.mk index 45d8effc11..0d279e55eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -649,7 +649,6 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ - %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ %D%/packages/patches/datamash-arm-tests.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 60c1e0ef94..0a5e464719 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -31,7 +31,7 @@ (define-public cyrus-sasl (package (name "cyrus-sasl") - (version "2.1.26") + (version "2.1.27") (source (origin (method url-fetch) (uri (list (string-append @@ -40,13 +40,14 @@ (string-append "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" version ".tar.gz"))) - (patches (search-patches "cyrus-sasl-CVE-2013-4122.patch")) (sha256 (base32 - "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g")))) + "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")))) (build-system gnu-build-system) (inputs `(("gdbm" ,gdbm) - ("mit-krb5" ,mit-krb5) ("openssl" ,openssl))) + (propagated-inputs + `(;; cyrus-sasl.pc refers to -lkrb5, so propagate it. + ("mit-krb5" ,mit-krb5))) (arguments '(#:configure-flags (list (string-append "--with-plugindir=" (assoc-ref %outputs "out") diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 850223cd4c..3cba8142bf 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -91,11 +91,15 @@ ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (sasl (assoc-ref inputs "cyrus-sasl"))) + (krb5 (assoc-ref inputs "mit-krb5"))) ;propagated from cyrus-sasl + + ;; The ancient Libtool bundled with OpenLDAP copies the linker flags + ;; from Cyrus-SASL and embeds them into its own .la files. Add an + ;; absolute reference to Kerberos so it does not have to be propagated. (substitute* (map (lambda (f) (string-append out "/" f)) '("lib/libldap.la" "lib/libldap_r.la")) - (("-lsasl2" lib) - (string-append "-L" sasl "/lib " lib))) + (("-lkrb5" lib) + (string-append "-L" krb5 "/lib " lib))) #t)))))) (synopsis "Implementation of the Lightweight Directory Access Protocol") (description diff --git a/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch b/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch deleted file mode 100644 index fc72e42e03..0000000000 --- a/gnu/packages/patches/cyrus-sasl-CVE-2013-4122.patch +++ /dev/null @@ -1,130 +0,0 @@ -Fix CVE-2013-4122. - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4122 - -Patch copied from upstream source repository: -https://github.com/cyrusimap/cyrus-sasl/commit/dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d - -From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001 -From: mancha -Date: Thu, 11 Jul 2013 10:08:07 +0100 -Subject: Handle NULL returns from glibc 2.17+ crypt() - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -When using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. - -Patch by mancha1@hush.com. ---- - pwcheck/pwcheck_getpwnam.c | 3 ++- - pwcheck/pwcheck_getspnam.c | 4 +++- - saslauthd/auth_getpwent.c | 4 +++- - saslauthd/auth_shadow.c | 8 +++----- - 4 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c -index 4b34222..400289c 100644 ---- a/pwcheck/pwcheck_getpwnam.c -+++ b/pwcheck/pwcheck_getpwnam.c -@@ -32,6 +32,7 @@ char *userid; - char *password; - { - char* r; -+ char* crpt_passwd; - struct passwd *pwd; - - pwd = getpwnam(userid); -@@ -41,7 +42,7 @@ char *password; - else if (pwd->pw_passwd[0] == '*') { - r = "Account disabled"; - } -- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { -+ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { - r = "Incorrect password"; - } - else { -diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c -index 2b11286..6d607bb 100644 ---- a/pwcheck/pwcheck_getspnam.c -+++ b/pwcheck/pwcheck_getspnam.c -@@ -32,13 +32,15 @@ char *userid; - char *password; - { - struct spwd *pwd; -+ char *crpt_passwd; - - pwd = getspnam(userid); - if (!pwd) { - return "Userid not found"; - } - -- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { -+ crpt_passwd = crypt(password, pwd->sp_pwdp); -+ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { - return "Incorrect password"; - } - else { -diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c -index fc8029d..d4ebe54 100644 ---- a/saslauthd/auth_getpwent.c -+++ b/saslauthd/auth_getpwent.c -@@ -77,6 +77,7 @@ auth_getpwent ( - { - /* VARIABLES */ - struct passwd *pw; /* pointer to passwd file entry */ -+ char *crpt_passwd; /* encrypted password */ - int errnum; - /* END VARIABLES */ - -@@ -105,7 +106,8 @@ auth_getpwent ( - } - } - -- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { -+ crpt_passwd = crypt(password, pw->pw_passwd); -+ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); - } -diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c -index 677131b..1988afd 100644 ---- a/saslauthd/auth_shadow.c -+++ b/saslauthd/auth_shadow.c -@@ -210,8 +210,8 @@ auth_shadow ( - RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); - } - -- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); -- if (strcmp(sp->sp_pwdp, cpw)) { -+ cpw = crypt(password, sp->sp_pwdp); -+ if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) { - if (flags & VERBOSE) { - /* - * This _should_ reveal the SHADOW_PW_LOCKED prefix to an -@@ -221,10 +221,8 @@ auth_shadow ( - syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", - sp->sp_pwdp, cpw); - } -- free(cpw); - RETURN("NO Incorrect password"); - } -- free(cpw); - - /* - * The following fields will be set to -1 if: -@@ -286,7 +284,7 @@ auth_shadow ( - RETURN("NO Invalid username"); - } - -- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { -+ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", - password, upw->upw_passwd); --- -cgit v0.12 - From a556679ef422f8ed7b4bc0606457568399cdad6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 02:36:44 +0100 Subject: [PATCH 054/250] gnu: jansson: Update to 2.12. * gnu/packages/web.scm (jansson): Update to 2.12. [source](uri): Use bzip2 compressed tarball. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 17deb5c222..f8315d4379 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -510,15 +510,15 @@ libraries for working with JNLP applets.") (define-public jansson (package (name "jansson") - (version "2.11") + (version "2.12") (source (origin (method url-fetch) (uri (string-append "http://www.digip.org/jansson/releases/jansson-" - version ".tar.gz")) + version ".tar.bz2")) (sha256 (base32 - "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf")))) + "1lp1mv8pjp5yziws66cy0dhpcam4bbjqhffk13v4vgdybp674pb4")))) (build-system gnu-build-system) (home-page "http://www.digip.org/jansson/") (synopsis "JSON C library") From cc2e0566be1c2fa632fc3cc4e6cf705c665aa0d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 11:43:17 +0100 Subject: [PATCH 055/250] gnu: jansson: Don't build libjansson.a. * gnu/packages/web.scm (jansson)[arguments]: New field. --- gnu/packages/web.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f8315d4379..9b85bb4309 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -520,6 +520,8 @@ libraries for working with JNLP applets.") (base32 "1lp1mv8pjp5yziws66cy0dhpcam4bbjqhffk13v4vgdybp674pb4")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (home-page "http://www.digip.org/jansson/") (synopsis "JSON C library") (description From 06f5bc4e12a78883c6f4a543711311bd66e6832b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 02:38:32 +0100 Subject: [PATCH 056/250] gnu: GnuTLS: Update to 3.6.5. * gnu/packages/patches/gnutls-skip-pkgconfig-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/tls.scm (gnutls): Update to 3.6.5. [source](patches): Remove obsolete. [source](snippet): Add Guile detection fix. * gnu/packages/gnome.scm (libsoup)[arguments]: Adjust 'certtool' invokation to cope with the new API. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 3 ++- .../patches/gnutls-skip-pkgconfig-test.patch | 24 ------------------- gnu/packages/tls.scm | 17 +++++++++---- 4 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/gnutls-skip-pkgconfig-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0d279e55eb..3f2ca7a845 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -772,7 +772,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ - %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9d8e4a8d33..cea9445191 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2556,7 +2556,8 @@ libxml to ease remote use of the RESTful API.") "" ;URI of subject "127.0.0.1" ;IP address of subject "" ;signing? - "" ;encryption? + "" ;encryption (RSA)? + "" ;data encryption? "" ;sign OCSP requests? "" ;sign code? "" ;time stamping? diff --git a/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch b/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch deleted file mode 100644 index 1fad7c14e3..0000000000 --- a/gnu/packages/patches/gnutls-skip-pkgconfig-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -FIXME: The static test fails with an error such as: - -/tmp/guix-build-gnutls-3.5.13.drv-0/ccOnGPmc.o: In function `main': -c.29617.tmp.c:(.text+0x5): undefined reference to `gnutls_global_init' -collect2: error: ld returned 1 exit status -FAIL pkgconfig.sh (exit status: 1) - -diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh -index 6bd4e62f9..05aab8278 100755 ---- a/tests/pkgconfig.sh -+++ b/tests/pkgconfig.sh -@@ -57,11 +57,7 @@ echo "Trying dynamic linking with:" - echo " * flags: $(${PKGCONFIG} --libs gnutls)" - echo " * common: ${COMMON}" - echo " * lib: ${CFLAGS}" --cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -- --echo "" --echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)" --cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -+gcc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} - - rm -f ${TMPFILE} ${TMPFILE_O} - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d9971441c6..73be90d0d3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -162,7 +162,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.5.18") + (version "3.6.5") (source (origin (method url-fetch) (uri @@ -171,12 +171,19 @@ living in the same process.") (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) "/gnutls-" version ".tar.xz")) - (patches - (search-patches "gnutls-skip-trust-store-test.patch" - "gnutls-skip-pkgconfig-test.patch")) + (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0d02x28fwkkx7xzn7807nww6idchizzq3plx8sfcyiw7wzclh8mf")))) + "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)))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. From f9960e2558bec9d3d3eae3e32dbd22e745751dde Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 03:11:56 +0100 Subject: [PATCH 057/250] gnu: libuv: Update to 1.24.0. * gnu/packages/libevent.scm (libuv): Update to 1.24.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 2de29707ca..c9ed941202 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -122,14 +122,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.23.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "09yf7c71n8b80nbsv4lsmq5nqmb0rylhpx3z9jgkv5za9lr6sx6i")))) + "01pg0zsfr8mxlpipkbpw0dpsl26x5s966f5br7dx9ac29abk419q")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. From 036653918e9daa371cf174712a4895b55565a8b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 03:12:14 +0100 Subject: [PATCH 058/250] gnu: CMake: Update to 3.13.1. * gnu/packages/cmake.scm (cmake): Update to 3.13.1. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 5abf087557..7186cf98df 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.12.2") + (version "3.13.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "19410mxgcyvk5q42phaclb1hz6rl08z4yj8iriq706p5k5bli5qg")) + "04123d7fgnn1fs5p0nwyq397ss89r0y4wkg9a09qiwkjsvk1rzmy")) (modules '((guix build utils))) (snippet '(begin From f06fdbae8d6318fdabf9c1eb686e2bfa2b9ff18a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 03:30:16 +0100 Subject: [PATCH 059/250] gnu: meson: Update to 0.49.0. * gnu/packages/build-tools.scm (meson): Update to 0.49.0. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index d42d03cee9..628b36fff5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -158,7 +158,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.48.2") + (version "0.49.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -166,7 +166,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "01jmm2wmnqhqk6f2gfhzhyzh0il6bjbyl8syy457p76ws2zxisir")))) + "0l8m1v7cl5ybm7psfqmmdqbvmnsbb1qhb8ni3hwap3i0mk29a0zv")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH From 6521155212990e22a903ea7a89da676cb2a09499 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Dec 2018 07:39:52 +0100 Subject: [PATCH 060/250] gnu: glib-networking: Update to 2.58.0. * gnu/packages/gnome.scm (glib-networking): Update to 2.58.0. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Explicitly disable libproxy; add phase to appease tests. (libgdata, libsoup)[arguments]: Remove phase that sets SSL_CERT_FILE. * gnu/packages/spice.scm (spice)[arguments]: Likewise. * gnu/packages/web.scm (uhttpmock)[arguments]: Likewise. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 43 +++++-------------- .../glib-networking-ssl-cert-file.patch | 29 ------------- gnu/packages/spice.scm | 6 +-- gnu/packages/web.scm | 9 ---- 5 files changed, 12 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-ssl-cert-file.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f2ca7a845..03627b98c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -741,7 +741,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-networking-ssl-cert-file.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/gnome.scm b/gnu/packages/gnome.scm index cea9445191..95bfcaf564 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -360,12 +360,6 @@ formats like PNG, SVG, PDF and EPS.") (arguments '(#:phases (modify-phases %standard-phases - (add-before 'check 'use-empty-ssl-cert-file - (lambda _ - ;; The ca-certificates.crt is not available in the build - ;; environment. - (setenv "SSL_CERT_FILE" "/dev/null") - #t)) (add-before 'check 'disable-failing-tests (lambda _ ;; The PicasaWeb API tests fail with gnome-online-accounts@3.24.2. @@ -2396,7 +2390,7 @@ library.") (define-public glib-networking (package (name "glib-networking") - (version "2.54.1") + (version "2.58.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -2404,29 +2398,17 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za")) - (patches - (search-patches "glib-networking-ssl-cert-file.patch")))) - (build-system gnu-build-system) + "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-giomoduledir - ;; Install GIO modules into $out/lib/gio/modules. - (lambda _ - (substitute* "configure" - (("GIO_MODULE_DIR=.*") - (string-append "GIO_MODULE_DIR=" %output - "/lib/gio/modules\n"))) - #t)) - (add-before 'check 'use-empty-ssl-cert-file - (lambda _ - ;; The ca-certificates.crt is not available in the build - ;; environment. - (setenv "SSL_CERT_FILE" "/dev/null") - #t))))) + `(#: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))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -2516,9 +2498,6 @@ libxml to ease remote use of the RESTful API.") ;; The 'check-local' target runs 'env LANG=C sort -u', ;; unset 'LC_ALL' to make 'LANG' working. (unsetenv "LC_ALL") - ;; The ca-certificates.crt is not available in the build - ;; environment. - (setenv "SSL_CERT_FILE" "/dev/null") ;; HTTPD in Guix uses mod_event and does not build prefork. (substitute* "tests/httpd.conf" (("^LoadModule mpm_prefork_module.*$") "\n")) diff --git a/gnu/packages/patches/glib-networking-ssl-cert-file.patch b/gnu/packages/patches/glib-networking-ssl-cert-file.patch deleted file mode 100644 index 32bdd0790f..0000000000 --- a/gnu/packages/patches/glib-networking-ssl-cert-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b010e41346d418220582c20ab8d7f3971e4fb78a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= -Date: Fri, 14 Aug 2015 17:28:36 +0800 -Subject: [PATCH] gnutls: Allow overriding the anchor file location by - 'SSL_CERT_FILE' - ---- - tls/gnutls/gtlsbackend-gnutls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c -index 55ec1a5..217d3c8 100644 ---- a/tls/gnutls/gtlsbackend-gnutls.c -+++ b/tls/gnutls/gtlsbackend-gnutls.c -@@ -101,8 +101,10 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls *self, - GError **error) - { - const gchar *anchor_file = NULL; -+ anchor_file = g_getenv ("SSL_CERT_FILE"); - #ifdef GTLS_SYSTEM_CA_FILE -- anchor_file = GTLS_SYSTEM_CA_FILE; -+ if (!anchor_file) -+ anchor_file = GTLS_SYSTEM_CA_FILE; - #endif - return g_tls_file_database_new (anchor_file, error); - } --- -2.4.3 - diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 94e6aa8438..8ab5a335c8 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -213,11 +213,7 @@ which allows users to view a desktop computing environment.") "--enable-automated-tests") ;; Several tests appear to be opening the same sockets concurrently. - #:parallel-tests? #f - - #:phases (modify-phases %standard-phases - (add-before 'check 'use-empty-ssl-cert-file - (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t))))) + #:parallel-tests? #f)) (synopsis "Server implementation of the SPICE protocol") (description "SPICE is a remote display system built for virtual environments which allows you to view a computing 'desktop' environment diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9b85bb4309..0aa0b321ff 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4243,15 +4243,6 @@ you'd expect.") (base32 "163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6")))) (build-system glib-or-gtk-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'use-empty-ssl-cert-file - (lambda _ - ;; Search for ca-certificates.crt files - ;; during the check phase. - (setenv "SSL_CERT_FILE" "/dev/null") - #t))))) (native-inputs `(("gobject-introspection" ,gobject-introspection) ;; For check phase. From e15454771230bf93fa4b7a82cacebfb616824a58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:32:14 +0100 Subject: [PATCH 061/250] gnu: ImageMagick: Update to 6.9.9-16. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.9-16. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a3a91fe10c..dafe8c76ed 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-15") + (version "6.9.10-16") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0li39qs9dic5rkcq455nv6mchyj6xy55qjnw5aa96s7qxq1c6ix9")))) + "1ylbv69r8l3d4za4i8q41cs6lq06mnhiq4qm03rvs3vp3gyp1m9x")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") From 4cb9b726339876693a70b81682e387b5f3400c4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 10:17:51 +0100 Subject: [PATCH 062/250] gnu: Remove special Boost C++14 variant. This is no longer needed since commit a7ff66998f6e0eeb5da485bab7f6e0b55a46651e. * gnu/packages/boost.scm (boost-cxx11): Remove variable. * gnu/packages/audio.scm (supercollider)[inputs]: Change BOOST-CXX11 to BOOST. * gnu/packages/compression.scm (innoextract)[inputs]: Likewise. * gnu/packages/mpd.scm (ncmpcpp)[inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Likewise. --- gnu/packages/audio.scm | 2 +- gnu/packages/boost.scm | 10 ---------- gnu/packages/compression.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/storage.scm | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 678bbcf55f..b732f7c608 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2274,7 +2274,7 @@ external_libraries/yaml-cpp/include)")) ("eudev" ,eudev) ;for user interactions with devices ("avahi" ,avahi) ;zeroconf service discovery support ("icu4c" ,icu4c) - ("boost" ,boost-cxx14) + ("boost" ,boost) ("boost-sync" ,boost-sync) ("yaml-cpp" ,yaml-cpp))) (home-page "https://github.com/supercollider/supercollider") diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index f1ff1712e6..f5c2c58300 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -123,16 +123,6 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) -;; Some programs need Boost to be built with C++14 support. -(define-public boost-cxx14 - (package (inherit boost) - (arguments - (substitute-keyword-arguments (package-arguments boost) - ((#:make-flags flags) - `(append ,flags - '("cxxflags=-std=c++14"))))) - (properties '((hidden? . #t))))) - (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c33d7ef093..c87ccda304 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2263,7 +2263,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ;; No tests available. - (inputs `(("boost" ,boost-cxx14) + (inputs `(("boost" ,boost) ("libiconv" ,libiconv) ("xz" ,xz))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0a81a3b8b8..fe8610ab94 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -244,7 +244,7 @@ terminal using ncurses.") "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5")))) (build-system gnu-build-system) (inputs `(("libmpdclient" ,libmpdclient) - ("boost" ,boost-cxx14) + ("boost" ,boost) ("readline" ,readline) ("ncurses" ,ncurses) ("taglib" ,taglib) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 4eae37815e..5051ccd986 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -321,7 +321,7 @@ ("python2-testtools" ,python2-testtools) ("python2-tox" ,python2-tox))) (inputs - `(("boost" ,boost-cxx14) + `(("boost" ,boost) ("curl" ,curl) ("cryptsetup" ,cryptsetup) ("expat" ,expat) From b8e43e61a3aef8236985b7602bce6eb67bc7fa7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 10:20:10 +0100 Subject: [PATCH 063/250] gnu: boost: Update to 1.69.0. * gnu/packages/boost.scm (boost): Update to 1.69.0. [source](uri): Add mirror. --- gnu/packages/boost.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index f5c2c58300..2fab703ed2 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -45,16 +45,19 @@ (define-public boost (package (name "boost") - (version "1.68.0") + (version "1.69.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/boost/boost/" version "/boost_" - (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) - ".tar.bz2")) + (uri (let ((version-with-underscores + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))) + (list (string-append "mirror://sourceforge/boost/boost/" version + "/boost_" version-with-underscores ".tar.bz2") + (string-append "https://dl.bintray.com/boostorg/release/" + version "/source/boost_" + version-with-underscores ".tar.bz2")))) (sha256 (base32 - "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")) + "01j4n142dz20lcgqji8d8hspp04p1nv7m8i6dz8w5lchfdhx8clg")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) From 3ce60c2247a6b737db3d0f158464f60e77f67900 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 10:20:54 +0100 Subject: [PATCH 064/250] gnu: nss, nss-certs: Update to 3.41. * gnu/packages/certs.scm (nss-certs): Update to 3.41. * gnu/packages/gnuzilla.scm (nss): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index bcca98fb1b..bb66d27026 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.40.1") + (version "3.41") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy")))) + "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 24b29394ba..93e470b70d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -364,7 +364,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.40.1") + (version "3.41") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -375,7 +375,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy")) + "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) @@ -423,7 +423,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2018-09-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2018-12-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From 4aef33b12e891f33e0e4a7b9567a5bd3d165b553 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 20:28:48 +0100 Subject: [PATCH 065/250] gnu: curl: Update to 7.63.0. * gnu/packages/curl.scm (curl): Update to 7.63.0. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9430ece467..24180e0073 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.62.0") + (version "7.63.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs")))) + "1i38v49233jirzlfqd8fy6jyf80assa953hk7w6qmysbg562604n")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages From b35c9a165f0cf01d63daede5388f3ebc20edae45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 20:29:55 +0100 Subject: [PATCH 066/250] gnu: gtk+: Update to 3.24.2. * gnu/packages/gtk.scm (gtk+): Update to 3.24.2. [source](modules, snippet): New fields. --- gnu/packages/gtk.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7992a978c8..1776d91f33 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -691,7 +691,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -699,9 +699,18 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38")) + "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" - "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Version 3.24.2 was released with a typo that broke the build. + ;; See upstream commit 2905fc861acda3d134a198e56ef2f6c962ad3061 + ;; at + (substitute* "docs/tools/shooter.c" + (("gdk_screen_get_dfeault") "gdk_screen_get_default")) + #t)))) (outputs '("out" "bin" "doc")) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) From 3f2848a5f91bf7bb9c5643776be13196f587f952 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 20:36:46 +0100 Subject: [PATCH 067/250] gnu: libtiff: Update to 4.0.10. * gnu/packages/patches/libtiff-CVE-2017-18013.patch, gnu/packages/patches/libtiff-CVE-2017-9935.patch, gnu/packages/patches/libtiff-CVE-2018-10963.patch, gnu/packages/patches/libtiff-CVE-2018-8905.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/image.scm (libtiff): Update to 4.0.10. [source](patches): Remove. --- gnu/local.mk | 4 - gnu/packages/image.scm | 8 +- .../patches/libtiff-CVE-2017-18013.patch | 45 ----- .../patches/libtiff-CVE-2017-9935.patch | 162 ------------------ .../patches/libtiff-CVE-2018-10963.patch | 40 ----- .../patches/libtiff-CVE-2018-8905.patch | 61 ------- 6 files changed, 2 insertions(+), 318 deletions(-) delete mode 100644 gnu/packages/patches/libtiff-CVE-2017-18013.patch delete mode 100644 gnu/packages/patches/libtiff-CVE-2017-9935.patch delete mode 100644 gnu/packages/patches/libtiff-CVE-2018-10963.patch delete mode 100644 gnu/packages/patches/libtiff-CVE-2018-8905.patch diff --git a/gnu/local.mk b/gnu/local.mk index 03627b98c1..fe5224c7de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -909,10 +909,6 @@ dist_patch_DATA = \ %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/libtiff-CVE-2017-9935.patch \ - %D%/packages/patches/libtiff-CVE-2017-18013.patch \ - %D%/packages/patches/libtiff-CVE-2018-8905.patch \ - %D%/packages/patches/libtiff-CVE-2018-10963.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 92447c23e2..1a6b8fe1c9 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -461,7 +461,7 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (version "4.0.9") + (version "4.0.10") (source (origin (method url-fetch) @@ -469,11 +469,7 @@ extracting icontainer icon files.") version ".tar.gz")) (sha256 (base32 - "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf")) - (patches (search-patches "libtiff-CVE-2017-9935.patch" - "libtiff-CVE-2017-18013.patch" - "libtiff-CVE-2018-8905.patch" - "libtiff-CVE-2018-10963.patch")))) + "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation diff --git a/gnu/packages/patches/libtiff-CVE-2017-18013.patch b/gnu/packages/patches/libtiff-CVE-2017-18013.patch deleted file mode 100644 index ba03c83847..0000000000 --- a/gnu/packages/patches/libtiff-CVE-2017-18013.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2017-18013: - -http://bugzilla.maptools.org/show_bug.cgi?id=2770 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-18013 - -Patch copied from upstream source repository: - -https://gitlab.com/libtiff/libtiff/commit/c6f41df7b581402dfba3c19a1e3df4454c551a01 - -From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sun, 31 Dec 2017 15:09:41 +0100 -Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer - dereference on corrupted file. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2770 - ---- - libtiff/tif_print.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c -index 9959d353..8deceb2b 100644 ---- a/libtiff/tif_print.c -+++ b/libtiff/tif_print.c -@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", - (unsigned long) s, -- (unsigned __int64) td->td_stripoffset[s], -- (unsigned __int64) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); - #else - fprintf(fd, " %3lu: [%8llu, %8llu]\n", - (unsigned long) s, -- (unsigned long long) td->td_stripoffset[s], -- (unsigned long long) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); - #endif - } - } --- -2.16.1 - diff --git a/gnu/packages/patches/libtiff-CVE-2017-9935.patch b/gnu/packages/patches/libtiff-CVE-2017-9935.patch deleted file mode 100644 index 5685d81f68..0000000000 --- a/gnu/packages/patches/libtiff-CVE-2017-9935.patch +++ /dev/null @@ -1,162 +0,0 @@ -Fix CVE-2017-9935 - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9935 -http://bugzilla.maptools.org/show_bug.cgi?id=2704 - -Patch copied from upstream source repository: - -https://gitlab.com/libtiff/libtiff/commit/3dd8f6a357981a4090f126ab9025056c938b6940 - -From 3dd8f6a357981a4090f126ab9025056c938b6940 Mon Sep 17 00:00:00 2001 -From: Brian May -Date: Thu, 7 Dec 2017 07:46:47 +1100 -Subject: [PATCH] tiff2pdf: Fix CVE-2017-9935 - -Fix for http://bugzilla.maptools.org/show_bug.cgi?id=2704 - -This vulnerability - at least for the supplied test case - is because we -assume that a tiff will only have one transfer function that is the same -for all pages. This is not required by the TIFF standards. - -We than read the transfer function for every page. Depending on the -transfer function, we allocate either 2 or 4 bytes to the XREF buffer. -We allocate this memory after we read in the transfer function for the -page. - -For the first exploit - POC1, this file has 3 pages. For the first page -we allocate 2 extra extra XREF entries. Then for the next page 2 more -entries. Then for the last page the transfer function changes and we -allocate 4 more entries. - -When we read the file into memory, we assume we have 4 bytes extra for -each and every page (as per the last transfer function we read). Which -is not correct, we only have 2 bytes extra for the first 2 pages. As a -result, we end up writing past the end of the buffer. - -There are also some related issues that this also fixes. For example, -TIFFGetField can return uninitalized pointer values, and the logic to -detect a N=3 vs N=1 transfer function seemed rather strange. - -It is also strange that we declare the transfer functions to be of type -float, when the standard says they are unsigned 16 bit values. This is -fixed in another patch. - -This patch will check to ensure that the N value for every transfer -function is the same for every page. If this changes, we abort with an -error. In theory, we should perhaps check that the transfer function -itself is identical for every page, however we don't do that due to the -confusion of the type of the data in the transfer function. ---- - libtiff/tif_dir.c | 3 +++ - tools/tiff2pdf.c | 65 +++++++++++++++++++++++++++++++++++++------------------ - 2 files changed, 47 insertions(+), 21 deletions(-) - -diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c -index 2ccaf448..cbf2b693 100644 ---- a/libtiff/tif_dir.c -+++ b/libtiff/tif_dir.c -@@ -1065,6 +1065,9 @@ _TIFFVGetField(TIFF* tif, uint32 tag, va_list ap) - if (td->td_samplesperpixel - td->td_extrasamples > 1) { - *va_arg(ap, uint16**) = td->td_transferfunction[1]; - *va_arg(ap, uint16**) = td->td_transferfunction[2]; -+ } else { -+ *va_arg(ap, uint16**) = NULL; -+ *va_arg(ap, uint16**) = NULL; - } - break; - case TIFFTAG_REFERENCEBLACKWHITE: -diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c -index d1a9b095..c3ec0746 100644 ---- a/tools/tiff2pdf.c -+++ b/tools/tiff2pdf.c -@@ -1047,6 +1047,8 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){ - uint16 pagen=0; - uint16 paged=0; - uint16 xuint16=0; -+ uint16 tiff_transferfunctioncount=0; -+ float* tiff_transferfunction[3]; - - directorycount=TIFFNumberOfDirectories(input); - t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(TIFFSafeMultiply(tmsize_t,directorycount,sizeof(T2P_PAGE))); -@@ -1147,26 +1149,48 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){ - } - #endif - if (TIFFGetField(input, TIFFTAG_TRANSFERFUNCTION, -- &(t2p->tiff_transferfunction[0]), -- &(t2p->tiff_transferfunction[1]), -- &(t2p->tiff_transferfunction[2]))) { -- if((t2p->tiff_transferfunction[1] != (float*) NULL) && -- (t2p->tiff_transferfunction[2] != (float*) NULL) && -- (t2p->tiff_transferfunction[1] != -- t2p->tiff_transferfunction[0])) { -- t2p->tiff_transferfunctioncount = 3; -- t2p->tiff_pages[i].page_extra += 4; -- t2p->pdf_xrefcount += 4; -- } else { -- t2p->tiff_transferfunctioncount = 1; -- t2p->tiff_pages[i].page_extra += 2; -- t2p->pdf_xrefcount += 2; -- } -- if(t2p->pdf_minorversion < 2) -- t2p->pdf_minorversion = 2; -+ &(tiff_transferfunction[0]), -+ &(tiff_transferfunction[1]), -+ &(tiff_transferfunction[2]))) { -+ -+ if((tiff_transferfunction[1] != (float*) NULL) && -+ (tiff_transferfunction[2] != (float*) NULL) -+ ) { -+ tiff_transferfunctioncount=3; -+ } else { -+ tiff_transferfunctioncount=1; -+ } - } else { -- t2p->tiff_transferfunctioncount=0; -+ tiff_transferfunctioncount=0; - } -+ -+ if (i > 0){ -+ if (tiff_transferfunctioncount != t2p->tiff_transferfunctioncount){ -+ TIFFError( -+ TIFF2PDF_MODULE, -+ "Different transfer function on page %d", -+ i); -+ t2p->t2p_error = T2P_ERR_ERROR; -+ return; -+ } -+ } -+ -+ t2p->tiff_transferfunctioncount = tiff_transferfunctioncount; -+ t2p->tiff_transferfunction[0] = tiff_transferfunction[0]; -+ t2p->tiff_transferfunction[1] = tiff_transferfunction[1]; -+ t2p->tiff_transferfunction[2] = tiff_transferfunction[2]; -+ if(tiff_transferfunctioncount == 3){ -+ t2p->tiff_pages[i].page_extra += 4; -+ t2p->pdf_xrefcount += 4; -+ if(t2p->pdf_minorversion < 2) -+ t2p->pdf_minorversion = 2; -+ } else if (tiff_transferfunctioncount == 1){ -+ t2p->tiff_pages[i].page_extra += 2; -+ t2p->pdf_xrefcount += 2; -+ if(t2p->pdf_minorversion < 2) -+ t2p->pdf_minorversion = 2; -+ } -+ - if( TIFFGetField( - input, - TIFFTAG_ICCPROFILE, -@@ -1828,9 +1852,8 @@ void t2p_read_tiff_data(T2P* t2p, TIFF* input){ - &(t2p->tiff_transferfunction[1]), - &(t2p->tiff_transferfunction[2]))) { - if((t2p->tiff_transferfunction[1] != (float*) NULL) && -- (t2p->tiff_transferfunction[2] != (float*) NULL) && -- (t2p->tiff_transferfunction[1] != -- t2p->tiff_transferfunction[0])) { -+ (t2p->tiff_transferfunction[2] != (float*) NULL) -+ ) { - t2p->tiff_transferfunctioncount=3; - } else { - t2p->tiff_transferfunctioncount=1; --- -2.16.1 - diff --git a/gnu/packages/patches/libtiff-CVE-2018-10963.patch b/gnu/packages/patches/libtiff-CVE-2018-10963.patch deleted file mode 100644 index d31c12399d..0000000000 --- a/gnu/packages/patches/libtiff-CVE-2018-10963.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix CVE-2018-10963: - -http://bugzilla.maptools.org/show_bug.cgi?id=2795 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10963 - -Patch copied from upstream source repository: - -https://gitlab.com/libtiff/libtiff/commit/de144fd228e4be8aa484c3caf3d814b6fa88c6d9 - -From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 12 May 2018 14:24:15 +0200 -Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2795. CVE-2018-10963 - ---- - libtiff/tif_dirwrite.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c -index 2430de6d..c15a28db 100644 ---- a/libtiff/tif_dirwrite.c -+++ b/libtiff/tif_dirwrite.c -@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) - } - break; - default: -- assert(0); /* we should never get here */ -- break; -+ TIFFErrorExt(tif->tif_clientdata,module, -+ "Cannot write tag %d (%s)", -+ TIFFFieldTag(o), -+ o->field_name ? o->field_name : "unknown"); -+ goto bad; - } - } - } --- -2.17.0 - diff --git a/gnu/packages/patches/libtiff-CVE-2018-8905.patch b/gnu/packages/patches/libtiff-CVE-2018-8905.patch deleted file mode 100644 index f49815789e..0000000000 --- a/gnu/packages/patches/libtiff-CVE-2018-8905.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix CVE-2018-8095: - -http://bugzilla.maptools.org/show_bug.cgi?id=2780 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-8905 - -Patch copied from upstream source repository: - -https://gitlab.com/libtiff/libtiff/commit/58a898cb4459055bb488ca815c23b880c242a27d - -From 58a898cb4459055bb488ca815c23b880c242a27d Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 12 May 2018 15:32:31 +0200 -Subject: [PATCH] LZWDecodeCompat(): fix potential index-out-of-bounds write. - Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2780 / CVE-2018-8905 - -The fix consists in using the similar code LZWDecode() to validate we -don't write outside of the output buffer. ---- - libtiff/tif_lzw.c | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c -index 4ccb443c..94d85e38 100644 ---- a/libtiff/tif_lzw.c -+++ b/libtiff/tif_lzw.c -@@ -602,6 +602,7 @@ LZWDecodeCompat(TIFF* tif, uint8* op0, tmsize_t occ0, uint16 s) - char *tp; - unsigned char *bp; - int code, nbits; -+ int len; - long nextbits, nextdata, nbitsmask; - code_t *codep, *free_entp, *maxcodep, *oldcodep; - -@@ -753,13 +754,18 @@ LZWDecodeCompat(TIFF* tif, uint8* op0, tmsize_t occ0, uint16 s) - } while (--occ); - break; - } -- assert(occ >= codep->length); -- op += codep->length; -- occ -= codep->length; -- tp = op; -+ len = codep->length; -+ tp = op + len; - do { -- *--tp = codep->value; -- } while( (codep = codep->next) != NULL ); -+ int t; -+ --tp; -+ t = codep->value; -+ codep = codep->next; -+ *tp = (char)t; -+ } while (codep && tp > op); -+ assert(occ >= len); -+ op += len; -+ occ -= len; - } else { - *op++ = (char)code; - occ--; --- -2.17.0 - From 17c3e0d85d9c1a6b4c09d09dd9238297b6165a2f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 12 Dec 2018 08:42:55 +0100 Subject: [PATCH 068/250] gnu: mesa: Update to 18.3.1. * gnu/packages/gl.scm (mesa): Update to 18.3.1. [native-inputs]: Use python instead of python-2. Use python-mako instead of python2-mako. Signed-off-by: Marius Bakke --- gnu/packages/gl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1bf53bcbb4..1c2632b9aa 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.6") + (version "18.3.1") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly")) + "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) @@ -265,8 +265,8 @@ also known as DXTn or DXTC) for Mesa.") ("wayland-protocols" ,wayland-protocols))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2) - ("python2-mako" ,python2-mako) + ("python" ,python) + ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:configure-flags From 34f1838f04c7c359da8dbba86817499630ce7f01 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 19 Dec 2018 11:06:34 +0100 Subject: [PATCH 069/250] gnu: vulkan-headers: Update to 1.1.96. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.96. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. --- gnu/packages/vulkan.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3608196e5d..f346d155dc 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -163,16 +163,16 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.92.0") + (version "1.1.96") (source (origin (method url-fetch) (uri (string-append "https://github.com/KhronosGroup/Vulkan-Headers/" - "archive/sdk-" version ".tar.gz")) + "archive/v" version ".tar.gz")) (sha256 (base32 - "06bgiz1dnp57597vd26r2smsadpcnr425n9gfdbp6xm4wba4l5l9")))) + "1mr15v7d7lxi7qjkgwyvy2s3a5k2xd7y8x40dd2al3a3c4chl2y2")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -186,17 +186,16 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - ;; TODO: Inherit from vulkan-headers when version numbers match again - (version "1.1.92.1") + (version (package-version vulkan-headers)) (source (origin (method url-fetch) (uri (string-append "https://github.com/KhronosGroup/Vulkan-Loader/" - "archive/sdk-" version ".tar.gz")) + "archive/v" version ".tar.gz")) (sha256 (base32 - "1kx07ypbwnmn6cxv9z0vbngq5l83f1sffzh7wmkzrl69y1cmazi0")))) + "11jg678sj8yykr3n1km0638l6737iyhsl4x4q1zwbwyiifm0w89z")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -249,10 +248,10 @@ and the ICD.") (method url-fetch) (uri (string-append "https://github.com/KhronosGroup/Vulkan-Tools/" - "archive/sdk-" version ".tar.gz")) + "archive/v" version ".tar.gz")) (sha256 (base32 - "0yd9dgkyradlk9gx0ps65nans7b29jg5c67b4m34ghpmy933dwx6")))) + "066v0vfhcqcwzlijvvs3jrbldp5kdqgwydkn7k2wrbcgynr77h8q")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) From 0e7e042d82f2e7975cbe331c5eb098fb7a308655 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 16:11:36 +0200 Subject: [PATCH 070/250] gnu: libdrm: Enable etnaviv api for armhf and aarch64. * gnu/packages/xdisorg.scm (libdrm)[arguments]: Add configure-flag for armhf-linux and aarch64-linux to enable etnaviv api. --- gnu/packages/xdisorg.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 86a1d58185..d287ad9bc1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -340,14 +340,12 @@ rasterisation.") ("armhf-linux" '("--enable-exynos-experimental-api" "--enable-omap-experimental-api" - ;; XXX: This fails a symbol check on a build machine: - ;; - ;; TODO: Update the list of symbols. - ;;"--enable-etnaviv-experimental-api" + "--enable-etnaviv-experimental-api" "--enable-tegra-experimental-api" "--enable-freedreno-kgsl")) ("aarch64-linux" '("--enable-tegra-experimental-api" + "--enable-etnaviv-experimental-api" "--enable-freedreno-kgsl")) (_ '()))))) (inputs From cd9f99f1077a97194d5737c17264b7521723f9ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 16:30:29 +0200 Subject: [PATCH 071/250] gnu: mesa: Enable more gallium drivers for armhf and aarch64. * gnu/packages/gl.scm (mesa)[arguments]: Enable more etnaviv-based drivers on armhf-linux and aarch64-linux. --- gnu/packages/gl.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1c2632b9aa..719c185482 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -271,12 +271,9 @@ also known as DXTn or DXTC) for Mesa.") (arguments `(#:configure-flags '(,@(match (%current-system) - ("armhf-linux" - ;; TODO: Add etnaviv,imx when libdrm supports etnaviv. - '("--with-gallium-drivers=freedreno,nouveau,r300,r600,swrast,tegra,vc4,virgl")) - ("aarch64-linux" + ((or "armhf-linux" "aarch64-linux") ;; TODO: Fix svga driver for aarch64 and armhf. - '("--with-gallium-drivers=freedreno,nouveau,pl111,r300,r600,swrast,tegra,vc4,virgl")) + '("--with-gallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl")) (_ '("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, From ca0757c6072db1b6cce3dd6d8e008989832a3aba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 20:11:18 +0200 Subject: [PATCH 072/250] gnu: librime: Update to 1.3.2. * gnu/packages/ibus.scm (librime): Update to 1.3.2. --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index a2687ac8c3..f68eaf35f8 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng ;;; @@ -292,7 +292,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -301,7 +301,7 @@ Japanese language input in most graphical applications.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6")))) + (base32 "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) From 6556c00afa9057df2022df6c4b30d10312ef83ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 20:36:27 +0200 Subject: [PATCH 073/250] gnu: librime: Remove bundled sources. * gnu/packages/ibus.scm (librime)[source]: Add snippet to remove bundled sources. [arguments]: Add custom phase to not search bundled headers. [native-inputs]: Add googletest, xorgproto. --- gnu/packages/ibus.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f68eaf35f8..b994beb560 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) @@ -301,8 +302,25 @@ Japanese language input in most graphical applications.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")))) + (base32 + "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "thirdparty/src") + (delete-file-recursively "thirdparty/bin") + (delete-file-recursively "thirdparty/include/X11") + #t)))) (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("include_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/include\\)") "") + (("link_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/lib\\)") "")) + #t))))) (inputs `(("boost" ,boost) ("glog" ,glog) @@ -310,6 +328,9 @@ Japanese language input in most graphical applications.") ("marisa" ,marisa) ("opencc" ,opencc) ("yaml-cpp" ,yaml-cpp))) + (native-inputs + `(("googletest" ,googletest) + ("xorgproto" ,xorgproto))) ; keysym.h (home-page "https://rime.im/") (synopsis "The core library of Rime Input Method Engine") (description "@dfn{librime} is the core library of Rime Input Method From 472c36bd36696cfe744e8a7b8f4d4ac5800e0f68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 21:40:58 +0200 Subject: [PATCH 074/250] gnu: pingus: Fix building. * gnu/packages/games.scm (pingus)[source]: Use 'git-fetch'. Add patch to update used boost headers. * gnu/packages/patches/pingus-boost-headers.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 14 +- .../patches/pingus-boost-headers.patch | 379 ++++++++++++++++++ 3 files changed, 388 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/pingus-boost-headers.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1a873ed0a..3e205a8f0a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1045,6 +1045,7 @@ dist_patch_DATA = \ %D%/packages/patches/pinball-src-deps.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ %D%/packages/patches/pinentry-efl.patch \ + %D%/packages/patches/pingus-boost-headers.patch \ %D%/packages/patches/pingus-sdl-libs-config.patch \ %D%/packages/patches/pius.patch \ %D%/packages/patches/pixman-CVE-2016-5296.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7b8d2f1bae..2ef93d6247 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1283,14 +1283,16 @@ fight Morgoth, the Lord of Darkness.") (version "0.7.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Pingus/pingus/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Pingus/pingus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0r9v6as5vi7skvvy7b0fcaimhdlzmik64pyy68plgljhsghqkkf4")) - (patches (search-patches "pingus-sdl-libs-config.patch")))) + "0wp06kcmknsnxz7bjnsndb8x062z7r23fb3yrnbfnj68qhz18y74")) + (patches (search-patches "pingus-boost-headers.patch" + "pingus-sdl-libs-config.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("scons-python2" ,scons-python2))) diff --git a/gnu/packages/patches/pingus-boost-headers.patch b/gnu/packages/patches/pingus-boost-headers.patch new file mode 100644 index 0000000000..f820f5851c --- /dev/null +++ b/gnu/packages/patches/pingus-boost-headers.patch @@ -0,0 +1,379 @@ +https://github.com/Pingus/pingus/commit/fef8cf6512fa4aa09e87643c22ef66de9ec7bb41.patch + +From fef8cf6512fa4aa09e87643c22ef66de9ec7bb41 Mon Sep 17 00:00:00 2001 +From: Ingo Ruhnke +Date: Sat, 26 Jul 2014 20:49:11 +0200 +Subject: [PATCH] Switched to boost::signals2 + +--- + SConscript | 5 ++--- + src/editor/button.hpp | 4 ++-- + src/editor/checkbox.hpp | 4 ++-- + src/editor/combobox.hpp | 4 ++-- + src/editor/file_list.hpp | 4 ++-- + src/editor/inputbox.hpp | 6 +++--- + src/editor/message_box.hpp | 2 +- + src/editor/object_selector.cpp | 4 ++-- + src/editor/viewport.hpp | 4 ++-- + src/pingus/components/check_box.hpp | 4 ++-- + src/pingus/components/choice_box.hpp | 4 ++-- + src/pingus/components/slider_box.hpp | 4 ++-- + src/pingus/config_manager.hpp | 28 ++++++++++++++-------------- + src/pingus/screens/option_menu.hpp | 4 ++-- + 14 files changed, 40 insertions(+), 41 deletions(-) + +diff --git a/SConscript b/SConscript +index 758567f51..c4d25a8a9 100644 +--- a/SConscript ++++ b/SConscript +@@ -187,9 +187,8 @@ class Project: + 'src/engine/input/xinput/xinput_device.cpp']) + + def configure_boost(self): +- if not self.conf.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'): +- if not self.conf.CheckLibWithHeader('boost_signals-mt', 'boost/signals.hpp', 'c++'): +- self.fatal_error += " * library 'boost_signals' not found\n" ++ if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'): ++ self.fatal_error += " * library 'boost_signals2' not found\n" + + def configure_png(self): + if self.conf.CheckMyProgram('pkg-config'): +diff --git a/src/editor/button.hpp b/src/editor/button.hpp +index c85d7da9e..d89dfe669 100644 +--- a/src/editor/button.hpp ++++ b/src/editor/button.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP + #define HEADER_PINGUS_EDITOR_BUTTON_HPP + +-#include ++#include + + #include "engine/gui/rect_component.hpp" + +@@ -48,7 +48,7 @@ class Button : public GUI::RectComponent + void enable() { enabled = true; } + void disable() { enabled = false; } + +- boost::signal on_click; ++ boost::signals2::signal on_click; + + private: + Button (const Button&); +diff --git a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp +index 7c3bc835f..66382d79b 100644 +--- a/src/editor/checkbox.hpp ++++ b/src/editor/checkbox.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP + #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP + +-#include ++#include + + #include "engine/gui/rect_component.hpp" + +@@ -40,7 +40,7 @@ class Checkbox : public GUI::RectComponent + bool is_checked() const { return checked; } + void on_primary_button_press(int x, int y); + +- boost::signal on_change; ++ boost::signals2::signal on_change; + + private: + Checkbox (const Checkbox&); +diff --git a/src/editor/combobox.hpp b/src/editor/combobox.hpp +index 0ca742593..603556bd9 100644 +--- a/src/editor/combobox.hpp ++++ b/src/editor/combobox.hpp +@@ -18,7 +18,7 @@ + #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP + #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP + +-#include ++#include + + #include "engine/display/sprite.hpp" + #include "engine/gui/rect_component.hpp" +@@ -88,7 +88,7 @@ class Combobox : public GUI::RectComponent + + void update_layout() {} + +- boost::signal on_select; ++ boost::signals2::signal on_select; + + private: + Combobox(); +diff --git a/src/editor/file_list.hpp b/src/editor/file_list.hpp +index cc4bba2de..85efe6aa0 100644 +--- a/src/editor/file_list.hpp ++++ b/src/editor/file_list.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP + #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP + +-#include ++#include + + #include "engine/display/sprite.hpp" + #include "engine/gui/rect_component.hpp" +@@ -61,7 +61,7 @@ class FileList : public GUI::RectComponent + bool has_more_next_pages(); + bool has_more_prev_pages(); + +- boost::signal on_click; ++ boost::signals2::signal on_click; + + private: + int items_per_page(); +diff --git a/src/editor/inputbox.hpp b/src/editor/inputbox.hpp +index cad9663ec..87321dbba 100644 +--- a/src/editor/inputbox.hpp ++++ b/src/editor/inputbox.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP + #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP + +-#include ++#include + + #include "engine/gui/rect_component.hpp" + +@@ -40,8 +40,8 @@ class Inputbox : public GUI::RectComponent + + void update_layout() {} + +- boost::signal on_change; +- boost::signal on_enter; ++ boost::signals2::signal on_change; ++ boost::signals2::signal on_enter; + + private: + Inputbox (const Inputbox&); +diff --git a/src/editor/message_box.hpp b/src/editor/message_box.hpp +index 385387a61..d885767cf 100644 +--- a/src/editor/message_box.hpp ++++ b/src/editor/message_box.hpp +@@ -45,7 +45,7 @@ class MessageBox : public GUI::GroupComponent + void on_cancel_button(); + + public: +- boost::signal on_ok; ++ boost::signals2::signal on_ok; + + private: + MessageBox(const MessageBox&); +diff --git a/src/editor/object_selector.cpp b/src/editor/object_selector.cpp +index 28e306826..f3a36b5e8 100644 +--- a/src/editor/object_selector.cpp ++++ b/src/editor/object_selector.cpp +@@ -16,7 +16,7 @@ + + #include "editor/object_selector.hpp" + +-#include ++#include + + #include "editor/generic_level_obj.hpp" + #include "editor/gui_style.hpp" +@@ -47,7 +47,7 @@ class ObjectSelectorButton : public GUI::RectComponent + std::string tooltip; + + public: +- boost::signal on_click; ++ boost::signals2::signal on_click; + + public: + ObjectSelectorButton(ObjectSelectorList* object_list_, +diff --git a/src/editor/viewport.hpp b/src/editor/viewport.hpp +index 1ae9eff7c..18868254d 100644 +--- a/src/editor/viewport.hpp ++++ b/src/editor/viewport.hpp +@@ -18,7 +18,7 @@ + #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP + #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP + +-#include ++#include + #include + + #include "editor/selection.hpp" +@@ -148,7 +148,7 @@ class Viewport : public GUI::RectComponent + + void clear_selection(); + +- boost::signal selection_changed; ++ boost::signals2::signal selection_changed; + private: + Viewport(); + Viewport (const Viewport&); +diff --git a/src/pingus/components/check_box.hpp b/src/pingus/components/check_box.hpp +index 00e23b764..5bef50f6b 100644 +--- a/src/pingus/components/check_box.hpp ++++ b/src/pingus/components/check_box.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP + #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP + +-#include ++#include + + #include "engine/display/sprite.hpp" + #include "engine/gui/rect_component.hpp" +@@ -39,7 +39,7 @@ class CheckBox : public GUI::RectComponent + + void set_state(bool v, bool send_signal); + +- boost::signal on_change; ++ boost::signals2::signal on_change; + + private: + CheckBox (const CheckBox&); +diff --git a/src/pingus/components/choice_box.hpp b/src/pingus/components/choice_box.hpp +index 49d6e1948..ef51b6dd2 100644 +--- a/src/pingus/components/choice_box.hpp ++++ b/src/pingus/components/choice_box.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP + #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP + +-#include ++#include + + #include "engine/gui/rect_component.hpp" + +@@ -36,7 +36,7 @@ class ChoiceBox : public GUI::RectComponent + void add_choice(const std::string& str); + void set_current_choice(int choice); + +- boost::signal on_change; ++ boost::signals2::signal on_change; + + private: + ChoiceBox (const ChoiceBox&); +diff --git a/src/pingus/components/slider_box.hpp b/src/pingus/components/slider_box.hpp +index ae4d92406..75118eac2 100644 +--- a/src/pingus/components/slider_box.hpp ++++ b/src/pingus/components/slider_box.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP + #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP + +-#include ++#include + + #include "engine/gui/rect_component.hpp" + +@@ -39,7 +39,7 @@ class SliderBox : public GUI::RectComponent + + void set_value(int v); + +- boost::signal on_change; ++ boost::signals2::signal on_change; + + private: + SliderBox (const SliderBox&); +diff --git a/src/pingus/config_manager.hpp b/src/pingus/config_manager.hpp +index b07b83e65..4cf08e046 100644 +--- a/src/pingus/config_manager.hpp ++++ b/src/pingus/config_manager.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP + #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP + +-#include ++#include + + #include "math/size.hpp" + #include "pingus/options.hpp" +@@ -39,55 +39,55 @@ class ConfigManager + + void set_master_volume(int); + int get_master_volume() const; +- boost::signal on_master_volume_change; ++ boost::signals2::signal on_master_volume_change; + + void set_sound_volume(int); + int get_sound_volume() const; +- boost::signal on_sound_volume_change; ++ boost::signals2::signal on_sound_volume_change; + + void set_music_volume(int); + int get_music_volume() const; +- boost::signal on_music_volume_change; ++ boost::signals2::signal on_music_volume_change; + + void set_fullscreen_resolution(const Size& size); + Size get_fullscreen_resolution() const; +- boost::signal on_fullscreen_resolution_change; ++ boost::signals2::signal on_fullscreen_resolution_change; + + void set_fullscreen(bool); + bool get_fullscreen() const; +- boost::signal on_fullscreen_change; ++ boost::signals2::signal on_fullscreen_change; + + void set_renderer(FramebufferType type); + FramebufferType get_renderer() const; +- boost::signal on_renderer_change; ++ boost::signals2::signal on_renderer_change; + + void set_resizable(bool); + bool get_resizable() const; +- boost::signal on_resizable_change; ++ boost::signals2::signal on_resizable_change; + + void set_mouse_grab(bool); + bool get_mouse_grab() const; +- boost::signal on_mouse_grab_change; ++ boost::signals2::signal on_mouse_grab_change; + + void set_print_fps(bool); + bool get_print_fps() const; +- boost::signal on_print_fps_change; ++ boost::signals2::signal on_print_fps_change; + + void set_language(const tinygettext::Language&); + tinygettext::Language get_language() const; +- boost::signal on_language_change; ++ boost::signals2::signal on_language_change; + + void set_software_cursor(bool); + bool get_software_cursor() const; +- boost::signal on_software_cursor_change; ++ boost::signals2::signal on_software_cursor_change; + + void set_auto_scrolling(bool); + bool get_auto_scrolling() const; +- boost::signal on_auto_scrolling_change; ++ boost::signals2::signal on_auto_scrolling_change; + + void set_drag_drop_scrolling(bool); + bool get_drag_drop_scrolling() const; +- boost::signal on_drag_drop_scrolling_change; ++ boost::signals2::signal on_drag_drop_scrolling_change; + + private: + ConfigManager (const ConfigManager&); +diff --git a/src/pingus/screens/option_menu.hpp b/src/pingus/screens/option_menu.hpp +index 60b1578d2..154ef0f69 100644 +--- a/src/pingus/screens/option_menu.hpp ++++ b/src/pingus/screens/option_menu.hpp +@@ -17,7 +17,7 @@ + #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP + #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP + +-#include ++#include + #include + #include + +@@ -66,7 +66,7 @@ class OptionMenu : public GUIScreen + //Label* defaults_label; + //CheckBox* defaults_box; + +- typedef std::vector Connections; ++ typedef std::vector Connections; + Connections connections; + + tinygettext::Language m_language; From e59a9cf7f0f1f3f597b1fbcd41a05ea081dea2f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Dec 2018 22:38:29 +0100 Subject: [PATCH 075/250] gnu: girara: Update to 0.3.2. * gnu/packages/gtk.scm (girara): Update to 0.3.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1776d91f33..0b719f1ffa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1357,7 +1357,7 @@ and routines to assist in editing internationalized text.") (define-public girara (package (name "girara") - (version "0.2.9") + (version "0.3.2") (source (origin (method url-fetch) (uri @@ -1365,7 +1365,7 @@ and routines to assist in editing internationalized text.") version ".tar.xz")) (sha256 (base32 - "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8")))) + "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p")))) (native-inputs `(("pkg-config" ,pkg-config) ("check" ,check) ("gettext" ,gettext-minimal) From 6bd8ba619db8bf206038463b2dbe6226d2a9b57b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Dec 2018 22:39:27 +0100 Subject: [PATCH 076/250] gnu: zathura: Update to 0.4.3. * gnu/packages/patches/zathura-plugindir-environment-variable.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/pdf.scm (zathura): Update to 0.4.3. [source](patches): Remove. [native-search-paths]: Adjust for upstreamed patch. --- gnu/local.mk | 3 +- ...thura-plugindir-environment-variable.patch | 32 ------------------- gnu/packages/pdf.scm | 8 ++--- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/zathura-plugindir-environment-variable.patch diff --git a/gnu/local.mk b/gnu/local.mk index 713050be72..3f59ee046f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1264,8 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ - %D%/packages/patches/xmodmap-asprintf.patch \ - %D%/packages/patches/zathura-plugindir-environment-variable.patch + %D%/packages/patches/xmodmap-asprintf.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch b/gnu/packages/patches/zathura-plugindir-environment-variable.patch deleted file mode 100644 index a8ffff965a..0000000000 --- a/gnu/packages/patches/zathura-plugindir-environment-variable.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ae8e4cc9ab57ff25d2ba6c4b369e8531ce43a6d2 Mon Sep 17 00:00:00 2001 -From: Paul van der Walt -Date: Mon, 2 Mar 2015 22:15:39 +0100 -Subject: [PATCH] Search path environment variable for Zathura. - -Adds a search path environment variable for zathura plugins (for reading -different file formats) called ZATHURA_PLUGIN_PATH. Command line option --p still takes precedence. - -Patch by Paul van der Walt -Adjusted for Zathura 0.3.9 by Tobias Geerinckx-Rice ---- - zathura/zathura.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/zathura/zathura.c b/zathura/zathura.c ---- a/zathura/zathura.c -+++ b/zathura/zathura.c -@@ -597,6 +597,13 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir) - g_return_if_fail(zathura != NULL); - g_return_if_fail(zathura->plugins.manager != NULL); - -+ /* Added for Guix: check if environment variable -+ * is set to specify location of zathura plugins. -+ */ -+ -+ if (dir == NULL) -+ dir = g_getenv("ZATHURA_PLUGIN_PATH"); -+ - if (dir != NULL) { - set_plugin_dir(zathura, dir); - #ifdef ZATHURA_PLUGINDIR diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a53e22f8b3..bec119cf36 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -496,7 +496,7 @@ by using the poppler rendering engine.") (define-public zathura (package (name "zathura") - (version "0.4.0") + (version "0.4.3") (source (origin (method url-fetch) (uri @@ -504,9 +504,7 @@ by using the poppler rendering engine.") version ".tar.xz")) (sha256 (base32 - "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma")) - (patches (search-patches - "zathura-plugindir-environment-variable.patch")))) + "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky")))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") @@ -523,7 +521,7 @@ by using the poppler rendering engine.") ("girara" ,girara))) (native-search-paths (list (search-path-specification - (variable "ZATHURA_PLUGIN_PATH") + (variable "ZATHURA_PLUGINS_PATH") (files '("lib/zathura"))))) (build-system meson-build-system) (arguments From bbc94a08f3d752b1d6221f610260912760264efb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 10:28:36 +0200 Subject: [PATCH 077/250] gnu: glew: Update to 2.1.0. * gnu/packages/gl.scm (glew): Update to 2.1.0. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 719c185482..2c64b0bc9c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -452,14 +452,14 @@ glxgears, glxheads, and glxinfo.") (define-public glew (package (name "glew") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/glew/glew/" version "/glew-" version ".tgz")) (sha256 (base32 - "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5")) + "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4")) (modules '((guix build utils))) (snippet '(begin From 215a51e4412f6e0051ce2f3abced8d26125d99ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 10:29:41 +0200 Subject: [PATCH 078/250] gnu: supertuxkart: Fix building with mesa@18.3. * gnu/packages/games.scm (supertuxkart)[arguments]: Add custom phase to add newer '#define' to source. --- gnu/packages/games.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4ab0af2e77..7896c9c3f4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2053,6 +2053,13 @@ This game is based on the GPL version of the famous game TuxRacer.") "-DCMAKE_C_FLAGS=-fpermissive") #:phases (modify-phases %standard-phases + ;; see https://github.com/supertuxkart/stk-code/issues/3557 + (add-after 'unpack 'patch-for-mesa-18.3 + (lambda _ + (substitute* "src/graphics/gl_headers.hpp" + (("#if !defined\\(USE_GLES2\\)") + "#if !defined(USE_GLES2)\n# define __gl_glext_h_")) + #t)) (add-after 'unpack 'unbundle (lambda* (#:key inputs #:allow-other-keys) (substitute* "CMakeLists.txt" From 33eb63da646706380f74ac710740f12a0f0a7a8c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Dec 2018 12:25:29 +0100 Subject: [PATCH 079/250] gnu: sssd: Fix build with cURL >= 7.62.0. * gnu/packages/patches/sssd-curl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/sssd.scm (sssd)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/patches/sssd-curl-compat.patch | 18 ++++++++++++++++++ gnu/packages/sssd.scm | 1 + 3 files changed, 20 insertions(+) create mode 100644 gnu/packages/patches/sssd-curl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f59ee046f..a4507f5e99 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1156,6 +1156,7 @@ dist_patch_DATA = \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ + %D%/packages/patches/sssd-curl-compat.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/swig-guile-gc.patch \ diff --git a/gnu/packages/patches/sssd-curl-compat.patch b/gnu/packages/patches/sssd-curl-compat.patch new file mode 100644 index 0000000000..ecab737153 --- /dev/null +++ b/gnu/packages/patches/sssd-curl-compat.patch @@ -0,0 +1,18 @@ +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 0ff94cdd24..75ce7c854b 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -86,6 +86,7 @@ fundamental object types for C.") (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")))) From e99d036828bd7d01bfd108f3d5a2f7de61fab32d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Dec 2018 12:26:42 +0100 Subject: [PATCH 080/250] gnu: efl: Fix build on 32-bit architectures. * gnu/packages/patches/efl-mesa-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/enlightenment.scm (efl)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/enlightenment.scm | 1 + gnu/packages/patches/efl-mesa-compat.patch | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 gnu/packages/patches/efl-mesa-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index a4507f5e99..62407351a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -659,6 +659,7 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/efl-mesa-compat.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 9989e2f5a8..d0ad44271e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -70,6 +70,7 @@ (uri (string-append "https://download.enlightenment.org/rel/libs/efl/efl-" version ".tar.xz")) + (patches (search-patches "efl-mesa-compat.patch")) (sha256 (base32 "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4")))) diff --git a/gnu/packages/patches/efl-mesa-compat.patch b/gnu/packages/patches/efl-mesa-compat.patch new file mode 100644 index 0000000000..6fe7b38428 --- /dev/null +++ b/gnu/packages/patches/efl-mesa-compat.patch @@ -0,0 +1,21 @@ +Fix build on 32-bit architectures with Mesa 18.3. Patch taken from upstream: + +https://git.enlightenment.org/core/efl.git/commit/?id=0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 + +diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h +index b6b642400f..4f67b1695f 100644 +--- a/src/lib/evas/Evas_GL.h ++++ b/src/lib/evas/Evas_GL.h +@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t + + #ifndef GL_ES_VERSION_2_0 + /* GL types for handling large vertex buffer objects */ +-#include ++# ifndef GL_VERSION_1_5 ++# include + typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t + typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t ++# endif + #endif + + /* Some definitions from GLES 3.0. From 1262be5c61ce6508990e67ac161605bbc9bda923 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Dec 2018 12:55:11 +0200 Subject: [PATCH 081/250] gnu: glib-networking: Work around test failure. * gnu/packages/gnome.scm (glib-networking)[source]: Add patch. * gnu/packages/patches/glib-networking-connection.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- .../patches/glib-networking-connection.patch | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-networking-connection.patch diff --git a/gnu/local.mk b/gnu/local.mk index b55382cc5d..158d157395 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -742,6 +742,7 @@ 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 95bfcaf564..49872e6afe 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2398,7 +2398,8 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")))) + "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) + (patches (search-patches "glib-networking-connection.patch")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlibproxy_support=false") diff --git a/gnu/packages/patches/glib-networking-connection.patch b/gnu/packages/patches/glib-networking-connection.patch new file mode 100644 index 0000000000..f64b090ae5 --- /dev/null +++ b/gnu/packages/patches/glib-networking-connection.patch @@ -0,0 +1,51 @@ +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 + From 152d6bf014a16c6759f3ebd8d5109b758990bae8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 11:49:16 +0200 Subject: [PATCH 082/250] gnu: fbreader: Fix building with newer curl. * gnu/packages/ebook.scm (fbreader)[source]: Add patch. * gnu/packages/patches/fbreader-curl-7.62.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 5 ++-- gnu/packages/patches/fbreader-curl-7.62.patch | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/fbreader-curl-7.62.patch diff --git a/gnu/local.mk b/gnu/local.mk index 158d157395..5b117595b9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -685,6 +685,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spUtils.patch \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ + %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index e750c6cac8..46d4c2cfe8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Andreas Enge -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen @@ -247,7 +247,8 @@ designed to be used in a generic text renderer.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")))) + "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")) + (patches (search-patches "fbreader-curl-7.62.patch")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) diff --git a/gnu/packages/patches/fbreader-curl-7.62.patch b/gnu/packages/patches/fbreader-curl-7.62.patch new file mode 100644 index 0000000000..e42a3375f0 --- /dev/null +++ b/gnu/packages/patches/fbreader-curl-7.62.patch @@ -0,0 +1,30 @@ +https://github.com/geometer/FBReader/commit/b7c78e965d06f78043a57e230c866c3af3f5a1eb.patch +https://github.com/geometer/FBReader/issues/310 +https://github.com/geometer/FBReader/pull/311/commits + +From b7c78e965d06f78043a57e230c866c3af3f5a1eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= +Date: Sun, 9 Dec 2018 10:18:03 +0100 +Subject: [PATCH] fix compatibility with curl-7.62 + +https://github.com/curl/curl/commit/3f3b26d6fe +--- + zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +index 54cc37f6c..03e2a5721 100644 +--- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp ++++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +@@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis + #endif + errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#if LIBCURL_VERSION_NUM < 0x073e00 + case CURLE_SSL_CACERT: + errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#endif + case CURLE_SSL_CACERT_BADFILE: + errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path)); + break; From 6f0ae1439c6c8429d1da7f3c9b9ebf4ba6640a36 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 12:04:01 +0200 Subject: [PATCH 083/250] gnu: fbreader: Use 'git-fetch'. * gnu/packages/ebook.scm (fbreader)[source]: Use 'git-fetch'. --- gnu/packages/ebook.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 46d4c2cfe8..980d574c4b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (guix build-system python) @@ -241,13 +242,14 @@ designed to be used in a generic text renderer.") (name "fbreader") (version "0.99.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/geometer/FBReader/" - "archive/" version "-freebsdport.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/geometer/FBReader") + (commit (string-append version "-freebsdport")))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")) + "0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d")) (patches (search-patches "fbreader-curl-7.62.patch")))) (build-system gnu-build-system) (inputs From 5dc5c5ea41fd72b0999c043148615bb2e585fe85 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 12:21:31 +0200 Subject: [PATCH 084/250] gnu: fbreader: Install desktop file. * gnu/packages/ebook.scm (fbreader)[arguments]: Add phase to remove hardcoded paths for desktop dir. --- gnu/packages/ebook.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 980d574c4b..c3805a7880 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -275,7 +275,13 @@ designed to be used in a generic text renderer.") (assoc-ref %outputs "out") "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-after 'unpack 'fix-install-locations + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "fbreader/desktop/Makefile" + (("/usr") out)) + #t)))))) (home-page "https://fbreader.org/") (synopsis "E-Book reader") (description "@code{fbreader} is an E-Book reader. It supports the From 47970cf66ce1817d79a09dbc8e5a9e3af262b242 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 31 Dec 2018 10:26:16 +0200 Subject: [PATCH 085/250] gnu: wesnoth: Fix building with newer boost. * gnu/packages/games.scm (wesnoth)[source]: Add patch. * gnu/packages/patches/wenoth-newer-boost.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 3 +- .../patches/wesnoth-newer-boost.patch | 46 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wesnoth-newer-boost.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b117595b9..050d174f5b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1237,6 +1237,7 @@ dist_patch_DATA = \ %D%/packages/patches/wavpack-CVE-2018-7253.patch \ %D%/packages/patches/wavpack-CVE-2018-7254.patch \ %D%/packages/patches/weechat-python.patch \ + %D%/packages/patches/wesnoth-newer-boost.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7896c9c3f4..423c977de5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2141,7 +2141,8 @@ falling, themeable graphics and sounds, and replays.") name "-" version ".tar.bz2")) (sha256 (base32 - "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85")))) + "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85")) + (patches (search-patches "wesnoth-newer-boost.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no check target diff --git a/gnu/packages/patches/wesnoth-newer-boost.patch b/gnu/packages/patches/wesnoth-newer-boost.patch new file mode 100644 index 0000000000..d48a48e801 --- /dev/null +++ b/gnu/packages/patches/wesnoth-newer-boost.patch @@ -0,0 +1,46 @@ +https://github.com/wesnoth/wesnoth/commit/f6a32792d023d182d350b5a2ed9e469ad67484c8.patch +This should be able to be removed with wesnoth@1.14.6 + +From f6a32792d023d182d350b5a2ed9e469ad67484c8 Mon Sep 17 00:00:00 2001 +From: Wedge009 +Date: Thu, 27 Dec 2018 08:15:10 +1100 +Subject: [PATCH] Use explicit casts to accommodate changes to boost's tribool + in 1.69. + +(fixes #3646) +--- + src/units/frame.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/units/frame.cpp b/src/units/frame.cpp +index 3215fa4fa79d..6370ad69566b 100644 +--- a/src/units/frame.cpp ++++ b/src/units/frame.cpp +@@ -460,15 +460,15 @@ std::vector frame_parsed_parameters::debug_strings() const + } + + if(!boost::indeterminate(auto_vflip_)) { +- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); ++ v.emplace_back("auto_vflip=" + utils::bool_string(static_cast(auto_vflip_))); + } + + if(!boost::indeterminate(auto_hflip_)) { +- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); ++ v.emplace_back("auto_hflip=" + utils::bool_string(static_cast(auto_hflip_))); + } + + if(!boost::indeterminate(primary_frame_)) { +- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); ++ v.emplace_back("primary_frame=" + utils::bool_string(static_cast(primary_frame_))); + } + + if(!drawing_layer_.get_original().empty()) { +@@ -768,7 +768,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time, const fram + } + + // Convert the tribool to bool +- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); ++ const bool primary = static_cast(result.primary_frame) || boost::logic::indeterminate(result.primary_frame); + + /** The engine provides a default image to use for the unit when none is available */ + result.image = current_val.image.is_void() || current_val.image.get_filename().empty() From d5c60e0aff8c71d66e598e2c7787a9f7c875fd0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Jan 2019 10:20:18 +0200 Subject: [PATCH 086/250] gnu: allegro@4: Fix building with newer mesa. * gnu/packages/game-development.scm (allegro@4)[source]: Add patch. * gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 4 +- .../allegro4-mesa-18.2.5-and-later.patch | 41 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch diff --git a/gnu/local.mk b/gnu/local.mk index 050d174f5b..64f2bf9a9c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -577,6 +577,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 8a29297805..efca9852d6 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2018 Ludovic Courtès ;;; Copyright © 2015, 2018 Alex Kost ;;; Copyright © 2015, 2016, 2017 David Thompson -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Julian Graham @@ -613,6 +613,8 @@ programming language.") (uri (string-append "https://github.com/liballeg/allegro5/" "releases/download/" version "/allegro-" version ".tar.gz")) + (patches (search-patches + "allegro4-mesa-18.2.5-and-later.patch")) (sha256 (base32 "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v")))) diff --git a/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch new file mode 100644 index 0000000000..a4944821db --- /dev/null +++ b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch @@ -0,0 +1,41 @@ +Fixes compilation with Mesa >= 18.2.5. + +Modified from upstream to work on allegro4: + +https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47 + +diff --git a/addons/allegrogl/include/alleggl.h b/addons/allegrogl/include/alleggl.h +index 0f86a6768..652dd024e 100644 +--- a/addons/allegrogl/include/alleggl.h ++++ b/addons/allegrogl/include/alleggl.h +@@ -103,10 +103,14 @@ + + /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ + #define __glext_h_ ++#define __gl_glext_h_ + #define __glxext_h_ ++#define __glx_glxext_h_ + #include + #undef __glext_h_ ++#undef __gl_glext_h_ + #undef __glxext_h_ ++#undef __glx_glxext_h_ + + #endif /* ALLEGRO_MACOSX */ + +diff --git a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h +index 49c502091..fba8aea5d 100644 +--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h ++++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h +@@ -1,7 +1,9 @@ + /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ + #define __glxext_h_ ++#define __glx_glxext_h_ + #include + #undef __glxext_h_ ++#undef __glx_glxext_h_ + + #ifndef GLX_VERSION_1_3 + #define _ALLEGRO_GLX_VERSION_1_3 +-- +2.20.0 From 0109b89c5834b5374f248dc3681702180013f41f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Jan 2019 10:22:34 +0200 Subject: [PATCH 087/250] gnu: allegro@5.0: Fix building with newer mesa. * gnu/packages/game-development.scm (allegro@5.0)[source]: Add patch. (allegro)[patch]: Rename patch file. * gnu/packages/patches/allegro-fix-compiliation-mesa-18.2.5-and-later.patch: Rename to gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 4 +++- ....5-and-later.patch => allegro-mesa-18.2.5-and-later.patch} | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename gnu/packages/patches/{allegro-fix-compilation-mesa-18.2.5-and-later.patch => allegro-mesa-18.2.5-and-later.patch} (100%) diff --git a/gnu/local.mk b/gnu/local.mk index 64f2bf9a9c..4d8813a9b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -577,6 +577,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index efca9852d6..9a77cdc645 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -655,7 +655,7 @@ etc.") "/download/" version "/allegro-" version ".tar.gz")) (patches (search-patches - "allegro-fix-compilation-mesa-18.2.5-and-later.patch")) + "allegro-mesa-18.2.5-and-later.patch")) (sha256 (base32 "1w9a5yqi5q03b2qvmx5ff90paz0xbr9cy7i7f0xiqa65ava66q9l")))) @@ -700,6 +700,8 @@ etc.") (string-drop-right version 2) version) ".tar.gz")) + (patches (search-patches + "allegro-mesa-18.2.5-and-later.patch")) (sha256 (base32 "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9")))))) diff --git a/gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch b/gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch similarity index 100% rename from gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch rename to gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch From 1bb9969f83658ec8448e5eb852ae9b1ceb50ec94 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 9 Jan 2019 15:46:53 -0500 Subject: [PATCH 088/250] gnu: tzdata: Update to 2018i. * gnu/packages/base.scm (tzdata): Update to 2018i. (tzdata-for-tests): Keep at version 2018g. --- gnu/packages/base.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0fed144059..9af04029ba 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1111,7 +1111,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2018g") + (version "2018i") (source (origin (method url-fetch) (uri (string-append @@ -1119,7 +1119,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2")))) + "1n80ih8agibagic401smqscz3xxqvs5bm5x3lk803g539kw5xi42")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1169,7 +1169,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa")))))) + "1p1jxlnryaxknj0l768h3dmlk2jpqz5n5d24w9c9vyx6dj3xpb5a")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) @@ -1187,7 +1187,25 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata)))) + (inherit tzdata) + (version "2018g") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.iana.org/time-zones/repository/releases/tzdata" + version ".tar.gz")) + (sha256 + (base32 + "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2")))) + (inputs + `(("tzcode" ,(origin + (method url-fetch) + (uri (string-append + "http://www.iana.org/time-zones/repository/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"))))))))) (define-public libiconv (package From 67ff2bdf6100cc887b0d5aebbcd1f539c634a3dc Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 10 Jan 2019 11:42:13 +0100 Subject: [PATCH 089/250] gnu: vulkan-headers: Update to 1.1.97. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.97. [source]: Use git-fetch. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. [source]: Use git-fetch. * gnu/packages/vulkan.scm (vulkan-tools): Update hash. [source]: Use git-fetch. --- gnu/packages/vulkan.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f346d155dc..56982dbda8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Rutger Helling +;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; @@ -163,19 +163,19 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.96") + (version "1.1.97") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/KhronosGroup/Vulkan-Headers/" - "archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Headers") + (commit (string-append "v" version)))) (sha256 (base32 - "1mr15v7d7lxi7qjkgwyvy2s3a5k2xd7y8x40dd2al3a3c4chl2y2")))) + "1yjwhbnccsmn99q9cb0vdimcpa8bacx1cxndzfxbgqzkckmd9mhc")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No tests. + `(#:tests? #f)) ; No tests. (home-page "https://github.com/KhronosGroup/Vulkan-Headers") (synopsis "Vulkan Header files and API registry") @@ -189,13 +189,13 @@ interpretation of the specifications for these languages.") (version (package-version vulkan-headers)) (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/KhronosGroup/Vulkan-Loader/" - "archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Loader") + (commit (string-append "v" version)))) (sha256 (base32 - "11jg678sj8yykr3n1km0638l6737iyhsl4x4q1zwbwyiifm0w89z")))) + "14p8n5bpq0qri2b9f22ydc5lh9zv0sd80lmwwdpyhyzkdj6cw08r")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -210,7 +210,7 @@ interpretation of the specifications for these languages.") "-DBUILD_LAYERS=OFF" ; FIXME: Fails to build. "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib")))) + (assoc-ref %outputs "out") "/lib")))) (inputs `(("glslang" ,glslang) ("libxcb" ,libxcb) ("libx11" ,libx11) @@ -245,13 +245,13 @@ and the ICD.") (version (package-version vulkan-headers)) (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/KhronosGroup/Vulkan-Tools/" - "archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Tools") + (commit (string-append "v" version)))) (sha256 (base32 - "066v0vfhcqcwzlijvvs3jrbldp5kdqgwydkn7k2wrbcgynr77h8q")))) + "11ggmmzxcayyya43izfjdqr0pp03n857w83kmmn9cnxvfzipkndc")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) @@ -264,7 +264,7 @@ and the ICD.") `(("pkg-config" ,pkg-config) ("python" ,python))) (arguments - `(#:tests? #f)) ; No tests. + `(#:tests? #f)) ; No tests. (home-page "https://github.com/KhronosGroup/Vulkan-Tools") (synopsis "Tools and utilities for Vulkan") From ad79ae7e2d7505292b11e87302b08f4db0f934e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 13 Jan 2019 11:49:32 +0200 Subject: [PATCH 090/250] gnu: bitshuffle-for-snappy: Inherit package arguments. * gnu/packages/compression.scm (bitshuffle-for-snappy)[arguments]: Inherit package arguments from bitshuffle. Always skip tests. --- gnu/packages/compression.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1c1276dc82..ea3d72c011 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1269,14 +1269,15 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (name "bitshuffle-for-snappy") (build-system gnu-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (with-output-to-file "Makefile" - (lambda _ - (format #t "\ + (substitute-keyword-arguments (package-arguments bitshuffle) + ((#:tests? _ #f) #f) + ((#:phases phases) + `(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "Makefile" + (lambda _ + (format #t "\ libbitshuffle.so: src/bitshuffle.o src/bitshuffle_core.o src/iochain.o lz4/lz4.o \tgcc -O3 -ffast-math -std=c99 -o $@ -shared -fPIC $^ @@ -1296,7 +1297,7 @@ install: libbitshuffle.so \tinstall -m644 src/iochain.h $(INCLUDEDIR) \tinstall -m644 lz4/lz4.h $(INCLUDEDIR) " (assoc-ref outputs "out")))) - #t))))) + #t)))))) (inputs '()) (native-inputs '()))) From c82cd3a7bd5d7a85fb48a37c3a5e37fbe3ed6738 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 2 Jan 2019 09:39:17 +0200 Subject: [PATCH 091/250] gnu: qt: Update to 5.11.3. * gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtscxml, qtgamepad, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech): Update to 5.11.3. (qt)[source]: Remove patch. * gnu/packages/patches/qt-5-renameat2.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/qt-5-renameat2.patch | 35 ------ gnu/packages/qt.scm | 142 +++++++++++----------- 3 files changed, 70 insertions(+), 108 deletions(-) delete mode 100644 gnu/packages/patches/qt-5-renameat2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5deae50336..99603b3be9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1177,7 +1177,6 @@ dist_patch_DATA = \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ - %D%/packages/patches/qt-5-renameat2.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-test-fix-regex.patch \ diff --git a/gnu/packages/patches/qt-5-renameat2.patch b/gnu/packages/patches/qt-5-renameat2.patch deleted file mode 100644 index 036070c7ff..0000000000 --- a/gnu/packages/patches/qt-5-renameat2.patch +++ /dev/null @@ -1,35 +0,0 @@ -Avoid conflicting declaration of 'renameat2' on glibc 2.28 -(see .) - -Patch from -by Andreas Müller . - ---- - src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index be6ce48d0cb..1bf1bebc7f1 100644 ---- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp -@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); - # define FICLONE _IOW(0x94, 9, int) - #endif - -+// renameat2/statx features for non bootstrapped build -+#ifndef QT_BOOTSTRAPPED -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+# define QT_FEATURE_statx -1 -+#endif -+#endif -+ - # if defined(Q_OS_ANDROID) - // renameat2() and statx() are disabled on Android because quite a few systems - // come with sandboxes that kill applications that make system calls outside a --- -2.14.4 - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index de5d31e4d7..b980f20d83 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -110,7 +110,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qt (package (name "qt") - (version "5.11.2") + (version "5.11.3") (outputs '("out" "examples")) (source (origin (method url-fetch) @@ -123,8 +123,7 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466")) - (patches (search-patches "qt-5-renameat2.patch")) + "0kgzy32s1fr22fxxfhcyncfryb3qxrznlr737r4y5khk4xj1g545")) (modules '((guix build utils))) (snippet '(begin @@ -501,7 +500,7 @@ system, and the core design of Django is reused in Grantlee.") (define-public qtbase (package (name "qtbase") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -510,20 +509,19 @@ system, and the core design of Django is reused in Grantlee.") version ".tar.xz")) (sha256 (base32 - "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3")) + "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 '(begin - (for-each - (lambda (dir) - (delete-file-recursively (string-append "src/3rdparty/" dir))) - (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "xkbcommon" "zlib")) - #t)))) + (with-directory-excursion "src/3rdparty" + (for-each delete-file-recursively + (list "double-conversion" "freetype" "harfbuzz-ng" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" + "xkbcommon" "zlib")) + #t))))) (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa) @@ -741,7 +739,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -750,7 +748,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "0rni3cdcli91v7k8ra9s9phpznvkza8qqvcrv9yyfrmlapwbn5mw")))) + "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -816,7 +814,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -825,7 +823,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "0s1s33k0wrnf9fi1wlm1kaq9hs1fx89597nhk53vzdfha42x3r97")) + "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4")) (modules '((guix build utils))) (snippet '(begin @@ -847,7 +845,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -856,7 +854,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "12cha7pd3cjx7zr0l7rbi1j2pfwmfpdwc7w3dsqbyi1d0mhwl1zl")))) + "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -871,7 +869,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -880,7 +878,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "0ik7m1a0shjsyzs8n9hfx8m9hy1p3wg505slcs0xznj0pa0gdmaz")))) + "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -900,7 +898,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -909,7 +907,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "1kgj6q53rk573yi47j32mn1mfk5ag98zvhv9qgrlb78y0gw8c392")))) + "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -932,7 +930,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -941,7 +939,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "1ia21llw610wd7licdm81p8zpkrkvkc5yc7y4wplgg6k2jyip42q")))) + "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -956,7 +954,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -965,7 +963,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "13cbr2pffv1hwvm8d8kzask0pyc2j3brgq23vi5i1i70kihrfqdf")))) + "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -983,7 +981,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -992,7 +990,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "1iv3gmk121myqdr64d9lf2m816ypxrb526gn0ssxx8gp4j4c69qf")))) + "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -1016,7 +1014,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1025,7 +1023,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "0vbjrxsdahgbgpc2zcvgg3mpijzd5kknz5clfcw2cq3310yqyq15")) + "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j")) (modules '((guix build utils))) (snippet '(begin @@ -1067,7 +1065,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1076,7 +1074,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "0wdpxjr3zfmgcfg14zlwd8mjbc191pvlchj1xxd0lj30ldfy2daf")) + "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -1119,7 +1117,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1128,7 +1126,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "0vkgvicm67vds2iqmhnjsqwnx1f8zhbzc31w6q198i0x8b76j6xh")))) + "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1153,7 +1151,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1162,7 +1160,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "07k4g5qfh657das2f5i6ph0hl4bva13yzlmxnay7qpzqcb0w4x0p")))) + "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1174,7 +1172,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1183,7 +1181,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "1z02dhrd1h2rpdhww9py9dnhss80xwf45n568y7gr3gay7ldlpwl")))) + "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1198,7 +1196,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1207,7 +1205,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "0vazz9yr1qgpcq7p77vg9mrjxy6hjabvwj9irw5l5w7fmsk2ns0n")))) + "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1233,7 +1231,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1242,7 +1240,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "1r30n9vjcgh2cd2iycfwwwpmbz7grrd3iqrc0afwnri3vylnfqil")))) + "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1256,7 +1254,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1265,7 +1263,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "0kh2c2ahg8xkpvqsva13i35ndsc0x0ypnmd6vix5pm5jvwg9366n")))) + "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1286,7 +1284,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1295,7 +1293,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "1f1iqvksrlgkxdbagb6vvjib3argbv9l7iis6ymb8n0rfwn37s7h")))) + "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1314,7 +1312,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1323,7 +1321,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "0xprhd1brn30dqf5vy4inqgzpq48i8nlc428x9rr8fk5hdm4dhmj")) + "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1338,7 +1336,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1347,7 +1345,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "1q11nr85436xzrf4mbrbav306hrz0s2qaclqhhb0g88vzcq2wxww")))) + "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1362,7 +1360,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1371,7 +1369,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "116b5nhmsx898626s37r446yci7kxd3k7xap1dh9spqklkwlj1da")))) + "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1387,7 +1385,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1396,7 +1394,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1zd9wjh2hhd6lby0z3ak0ff6zkbv73hh0drrg9qp2yrgjfismp59")))) + "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1442,7 +1440,7 @@ backend for QtQuick scene graph.") (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1451,7 +1449,7 @@ backend for QtQuick scene graph.") version ".tar.xz")) (sha256 (base32 - "076874iyadj7pkprlk24h257nb8i4sni9c6kbixm5zrr2y73fbxf")))) + "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1472,7 +1470,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1481,7 +1479,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "197p5x1dadgjb39pd2vw60r63lvz68i0pm5i8xbyzgzm94hwn9fn")) + "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk")) (modules '((guix build utils))) (snippet '(begin @@ -1503,7 +1501,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1512,7 +1510,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "1xld1yx085mhnqdipy29g2yy5af67hfm0wy4mvj7pl6y5qj8jw9d")))) + "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1523,7 +1521,7 @@ purchasing goods and services."))) (define-public qtcanvas3d (package (inherit qtsvg) (name "qtcanvas3d") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1532,7 +1530,7 @@ purchasing goods and services."))) version ".tar.xz")) (sha256 (base32 - "0h7arss7wr0jwl87kiwgbf0nlcgpbriyf7cnv9j4h7g8d09a777x")) + "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m")) (modules '((guix build utils))) (snippet '(begin @@ -1562,7 +1560,7 @@ drawing calls from Qt Quick JavaScript."))) (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1571,7 +1569,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "0551qfqnsfiy8kb1ng2v0yn7s6ggy7ghcmis983sbzxzjv2i58zn")))) + "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1589,7 +1587,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1598,7 +1596,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "05pzvrhvxhxjlav4axrhwlnxjzlr7mi8k3f06g59ryrwmb99kd37")))) + "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1616,7 +1614,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1625,7 +1623,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "1zmpvkhf2kmnr8vsa6jq675d5cpnmsg3f8yds6g91yq1g3prqdvr")))) + "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1645,7 +1643,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1654,7 +1652,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "06awsaf15rch1y9p2q9kdlmlaa8g28whbzf04b10zfflyijnvg7j")))) + "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1678,7 +1676,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1687,7 +1685,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "110xr2y174sayi9f6swzp1wx7mx4sw9rifcdx2bkbsnbfab6zg8a")))) + "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests From 0dae43ac6a2cf2a1ca82ceb5dfd1b3423d73b62a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 2 Jan 2019 14:25:53 +0200 Subject: [PATCH 092/250] gnu: python-sip: Update to 4.19.13. * gnu/packages/qt.scm (python-sip): Update to 4.19.13. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b980f20d83..b9ab443ed2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1708,7 +1708,7 @@ message."))) (define-public python-sip (package (name "python-sip") - (version "4.19.12") + (version "4.19.13") (source (origin (method url-fetch) @@ -1717,7 +1717,7 @@ message."))) "sip-" version "/sip-" version ".tar.gz")) (sha256 (base32 - "08iqj9qyanc6a4bllbd87gv8pd1gkplw1jhfa1sz0gcq3g1pyq94")))) + "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) From d4274628a63bd5fc73a1ef02855dcff9a8fada3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 2 Jan 2019 14:40:07 +0200 Subject: [PATCH 093/250] gnu: python-pyqt: Update to 5.11.3. * gnu/packages/qt.scm (python-pyqt): Update to 5.11.3. * gnu/packages/patches/pyqt-public-sip: Update patch. --- gnu/packages/patches/pyqt-public-sip.patch | 70 +++++++++++----------- gnu/packages/qt.scm | 4 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/patches/pyqt-public-sip.patch b/gnu/packages/patches/pyqt-public-sip.patch index 5ec45f032b..44cdcb6371 100644 --- a/gnu/packages/patches/pyqt-public-sip.patch +++ b/gnu/packages/patches/pyqt-public-sip.patch @@ -1,4 +1,4 @@ -https://sources.debian.org/data/main/p/pyqt5/5.11.2+dfsg-1/debian/patches/public_sip.diff +https://sources.debian.org/data/main/p/pyqt5/5.11.3+dfsg-1/debian/patches/public_sip.diff From: Dmitry Shachnev Date: Tue, 3 Jul 2018 09:46:42 +0300 @@ -6,30 +6,16 @@ Subject: Use the public version of sip module Per https://www.debian.org/doc/debian-policy/#convenience-copies-of-code. --- - configure.py | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) + configure.py | 2 +- + designer/pluginloader.cpp | 2 +- + qmlscene/pluginloader.cpp | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.py b/configure.py -index 7c48136..ca23f93 100644 +index 32d03a0..3c43a14 100644 --- a/configure.py +++ b/configure.py -@@ -642,15 +642,6 @@ class TargetConfiguration: - "Unable to import enum. Please install the enum34 " - "package from PyPI.") - -- # Check there is a private copy of the sip module already installed. -- try: -- from PyQt5 import sip -- except ImportError: -- error( -- "Unable to import PyQt5.sip. Make sure you have " -- "configured SIP to create a private copy of the sip " -- "module.") -- - # Get the details of the Python interpreter library. - py_major = self.py_version >> 16 - py_minor = (self.py_version >> 8) & 0x0ff -@@ -2438,7 +2429,7 @@ def get_sip_flags(target_config): +@@ -2440,7 +2440,7 @@ def get_sip_flags(target_config): the target configuration. """ @@ -38,18 +24,32 @@ index 7c48136..ca23f93 100644 # If we don't check for signed interpreters, we exclude the 'VendorID' # feature -@@ -2914,14 +2905,6 @@ def check_sip(target_config): - target_config is the target configuration. - """ +diff --git a/designer/pluginloader.cpp b/designer/pluginloader.cpp +index f41d391..3ca8b11 100644 +--- a/designer/pluginloader.cpp ++++ b/designer/pluginloader.cpp +@@ -167,7 +167,7 @@ bool PyCustomWidgets::importPlugins(const QString &dir, const QStringList &plugi + // Make sure we have sip.unwrapinstance. + if (!sip_unwrapinstance) + { +- sip_unwrapinstance = getModuleAttr("PyQt5.sip", "unwrapinstance"); ++ sip_unwrapinstance = getModuleAttr("sip", "unwrapinstance"); -- # Check there is a private copy of the sip module already installed. -- try: -- from PyQt5 import sip -- except ImportError: -- error( -- "Unable to import PyQt5.sip. Make sure you have configured " -- "SIP to create a private copy of the sip module.") -- - if target_config.sip is None: - error( - "Make sure you have a working sip on your PATH or use the " + if (!sip_unwrapinstance) + return true; +diff --git a/qmlscene/pluginloader.cpp b/qmlscene/pluginloader.cpp +index e14b946..140e80c 100644 +--- a/qmlscene/pluginloader.cpp ++++ b/qmlscene/pluginloader.cpp +@@ -412,9 +412,9 @@ PyObject *PyQt5QmlPlugin::getModuleAttr(const char *module, const char *attr) + void PyQt5QmlPlugin::getSipAPI() + { + #if defined(SIP_USE_PYCAPSULE) +- sip = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0); ++ sip = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0); + #else +- PyObject *c_api = getModuleAttr("PyQt5.sip", "_C_API"); ++ PyObject *c_api = getModuleAttr("sip", "_C_API"); + + if (c_api) + { diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b9ab443ed2..f4fd5680b7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1770,7 +1770,7 @@ module provides support functions to the automatically generated code.") (define-public python-pyqt (package (name "python-pyqt") - (version "5.11.2") + (version "5.11.3") (source (origin (method url-fetch) @@ -1780,7 +1780,7 @@ module provides support functions to the automatically generated code.") version ".tar.gz")) (sha256 (base32 - "00wn9svgyp0fsrkc4ma15zcxg31pw4gsgaz6nwb3fhy3al8miakw")) + "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9")) (patches (search-patches "pyqt-configure.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) From 9f8fee5027f622a18b38b8b15a37d3731a3aff68 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 2 Jan 2019 15:38:53 +0200 Subject: [PATCH 094/250] gnu: qscintilla: Update to 2.10.8. * gnu/packages/qt.scm (qscintilla): Update to 2.10.8. (python-qscintilla)[arguments]: Update custom 'configure phase. --- gnu/packages/qt.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f4fd5680b7..8c376bf259 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1917,7 +1917,7 @@ contain over 620 classes.") (define-public qscintilla (package (name "qscintilla") - (version "2.10.7") + (version "2.10.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pyqt/QScintilla2/" @@ -1925,7 +1925,7 @@ contain over 620 classes.") version ".tar.gz")) (sha256 (base32 - "06hs6civq13dvzlws0spjb7gwyk6kynpnfwg5plhahnxf7g5h137")))) + "1swjr786w04r514pry9pn32ivza4il1cg35s60qy39cwc175pka6")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1973,19 +1973,21 @@ indicators, code completion and call tips.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs configure-flags #:allow-other-keys) - (chdir "Python") - (apply invoke "python3" "configure.py" - configure-flags) - ;; Install to the right directory - (substitute* '("Makefile" - "Qsci/Makefile") - (("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") - (assoc-ref outputs "out"))) - ;; And fix the installed.txt file - (substitute* "installed.txt" - (("/gnu/store/[^/]+") - (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python"))) + (chdir "Python") + (apply invoke "python3" "configure.py" + configure-flags) + ;; Install to the right directory + (substitute* '("Makefile" + "Qsci/Makefile") + (("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") out) + (((string-append python "/lib")) + (string-append out "/lib"))) + ;; And fix the installed.txt file + (substitute* "installed.txt" + (("/gnu/store/[^/]+") out))) #t))))) (inputs `(("qscintilla" ,qscintilla) From 38f77be464b0b6ca76105d5f0a1b5e55fd694036 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 21 Jan 2019 16:59:44 +0000 Subject: [PATCH 095/250] gnu: mariadb: Disable sporadically failing tests. * guix/packages/databases.scm: Disable sporadically failing tests. Signed-off-by: Eric Bavier --- gnu/packages/databases.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e1284ee9bd..079d303fca 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -582,6 +582,8 @@ Language.") "main.explain_non_select" "main.stat_tables_innodb" "roles.acl_statistics" + "main.mysqldump" + "innodb_fts.crash_recovery" ;; FIXME: This test fails on i686: ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") From e4ee84202633636b4c8cef4a332f0c74912a3b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 26 Jan 2019 23:14:12 +0100 Subject: [PATCH 096/250] download: Ask not to use TLS 1.3. Works around . Reported by Marius Bakke . * guix/build/download.scm (tls-wrap): Add "-VERS-TLS1.3" to the priority string when (gnutls-version) is not prefixed by "3.5". --- guix/build/download.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index c08221b3b2..a64e0f0bd3 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -157,7 +157,8 @@ out if the connection could not be established in less than TIMEOUT seconds." ;; XXX: Use this hack instead of #:autoload to avoid compilation errors. ;; See . (module-autoload! (current-module) - '(gnutls) '(make-session connection-end/client)) + '(gnutls) + '(gnutls-version make-session connection-end/client)) (define %tls-ports ;; Mapping of session record ports to the underlying file port. @@ -268,7 +269,18 @@ host name without trailing dot." ;; "(gnutls) Priority Strings"); see . ;; Explicitly disable SSLv3, which is insecure: ;; . - (set-session-priorities! session "NORMAL:%COMPAT:-VERS-SSL3.0") + ;; + ;; FIXME: Since we currently fail to handle TLS 1.3 (with GnuTLS 3.6.5), + ;; remove it; see . + (set-session-priorities! session + (string-append + "NORMAL:%COMPAT:-VERS-SSL3.0" + + ;; The "VERS-TLS1.3" priority string is not + ;; supported by GnuTLS 3.5. + (if (string-prefix? "3.5." (gnutls-version)) + "" + ":-VERS-TLS1.3"))) (set-session-credentials! session (if (and verify-certificate? ca-certs) From df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 27 Jan 2019 00:16:36 +0100 Subject: [PATCH 097/250] gnu: telepathy-glib: Build sequentially. * gnu/packages/glib.scm (telepathy-glib)[arguments]: Pass #:parallel-build? #f. --- gnu/packages/glib.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index dee349395d..5148a6aec3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver @@ -709,7 +709,15 @@ up the Gnome environment, and are used in many unrelated projects.") "0z261fwrszxb28ccg3hsg9rizig4s84zvwmx6y31a4pyv7bvs5w3"))))))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-vala-bindings"))) + '(#:configure-flags '("--enable-vala-bindings") + + ;; '../tools/glib-*.py' generate files but the target dependencies are + ;; (presumably) not fully specified in the makefile, leading to + ;; parallel build errors like: + ;; + ;; EOFError: EOF read where object expected + ;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1 + #:parallel-build? #f)) (native-inputs `(("glib" ,glib "bin") ; uses glib-mkenums ("gobject-introspection" ,gobject-introspection) From 85765054221de172049eeec5676da139212916a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Feb 2019 18:53:02 +0100 Subject: [PATCH 098/250] gnu: libreoffice: Fix FTBFS with Boost 1.69.0. * gnu/packages/patches/libreoffice-boost.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/libreoffice.scm | 3 ++- gnu/packages/patches/libreoffice-boost.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libreoffice-boost.patch diff --git a/gnu/local.mk b/gnu/local.mk index ee8b13d2fb..a63f595b30 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-mips-newgcc.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 \ %D%/packages/patches/libreoffice-icu.patch \ %D%/packages/patches/libreoffice-glm.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2824d87fc6..b047c34a0b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -997,7 +997,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (sha256 (base32 "1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f")))) - (search-patches "libreoffice-icu.patch" + (search-patches "libreoffice-boost.patch" + "libreoffice-icu.patch" "libreoffice-glm.patch"))) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/libreoffice-boost.patch b/gnu/packages/patches/libreoffice-boost.patch new file mode 100644 index 0000000000..b50664226b --- /dev/null +++ b/gnu/packages/patches/libreoffice-boost.patch @@ -0,0 +1,17 @@ +Fix compatibility with newer Boost. + +Extracted from this upstream commit: +https://cgit.freedesktop.org/libreoffice/core/commit/?id=23a8d5ffbbe58761b89f590f0735abccd69a3681 + +diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx +--- a/sfx2/source/appl/shutdownicon.cxx ++++ b/sfx2/source/appl/shutdownicon.cxx +@@ -144,7 +144,7 @@ bool LoadModule() + #endif // ENABLE_QUICKSTART_APPLET + } + assert(!boost::logic::indeterminate(loaded)); +- return loaded; ++ return bool(loaded); + } + + } From 965ff0233e16174d4a012bbb28964caf3a06f124 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 4 Feb 2019 00:31:26 +0300 Subject: [PATCH 099/250] gnu: gtk-vnc: Update to 0.9.0. * gnu/packages/gnome.scm (gtk-vnc): Update to 0.9.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6f0c7fbf1..4f2b24b8ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5658,7 +5658,7 @@ like switching to windows and launching applications.") (define-public gtk-vnc (package (name "gtk-vnc") - (version "0.7.1") + (version "0.9.0") (source (origin (method url-fetch) @@ -5667,7 +5667,7 @@ like switching to windows and launching applications.") name "-" version ".tar.xz")) (sha256 (base32 - "1cdaywj5lqnl5b22qzd7k7lmacsnmk8b8rc4drk6gvqmcrlsljzk")))) + "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-gtk=3.0"))) From 14a6699c177c0b3435fe5e7d5d5b41f7425889ad Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 4 Feb 2019 19:42:30 +0300 Subject: [PATCH 100/250] gnu: php: Fix test failure. * gnu/packages/php.scm (php)[arguments]: Delete 'ext/curl/tests/curl_basic_009.phpt' file. --- gnu/packages/php.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 392ac92430..eba11943b0 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -259,6 +259,8 @@ ;; XXX: These test failures appear legitimate, needs investigation. ;; open_basedir() restriction failure. "ext/curl/tests/bug61948.phpt" + ;; Fails on recent curl https://bugs.php.net/patch-display.php?bug_id=77493 + "ext/curl/tests/curl_basic_009.phpt" ;; Expects a false boolean, gets empty array from glob(). "ext/standard/tests/file/bug41655_1.phpt" "ext/standard/tests/file/glob_variation5.phpt" From 6c8666b4513ba66bb1de0c129eec8a5623fddfeb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 1 Feb 2019 09:50:09 +0100 Subject: [PATCH 101/250] gnu: unison: Update to 2.51.1. * gnu/packages/ocaml.scm (unison): Update to 2.51.1, use source from git instead of svn and remove a snippet, and compile with current OCaml. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 65 +++++++----------------------------------- 1 file changed, 11 insertions(+), 54 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 28f1c99e4c..2fd53b01b5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -805,64 +805,21 @@ libpanel, librsvg and quartz.") (define-public unison (package (name "unison") - (version "2.48.3") - (source - (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "https://webdav.seas.upenn.edu/svn/" - "unison/branches/" - (version-major+minor version))) - (revision 535))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0486s53wyayicj9f2raj2dvwvk4xyzar219rccc1iczdwixm4x05")) - (modules '((guix build utils) - (ice-9 rdelim) - (ice-9 regex) - (srfi srfi-1))) - (snippet - `(begin - ;; The svn revision in the release tarball appears to be - ;; artificially manipulated in order to set the desired point - ;; version number. Because the point version is calculated during - ;; the build, we can offset pointVersionOrigin by the desired - ;; point version and write that into "Rev: %d". We do this rather - ;; than hardcoding the necessary revision number, for - ;; maintainability. - (with-atomic-file-replacement "src/mkProjectInfo.ml" - (lambda (in out) - (let ((pt-ver (string->number (third (string-split ,version #\.)))) - (pt-rx (make-regexp "^let pointVersionOrigin = ([0-9]+)")) - (rev-rx (make-regexp "Rev: [0-9]+"))) - (let loop ((pt-origin #f)) - (let ((line (read-line in 'concat))) - (cond - ((regexp-exec pt-rx line) - => (lambda (m) - (display line out) - (loop (string->number (match:substring m 1))))) - ((regexp-exec rev-rx line) - => (lambda (m) - (format out "~aRev: ~d~a" - (match:prefix m) - (+ pt-origin pt-ver) - (match:suffix m)) - (dump-port in out))) ;done - (else - (display line out) - (loop pt-origin)))))))) - ;; Without the '-fix' argument, the html file produced does not - ;; have functioning internal hyperlinks. - (substitute* "doc/Makefile" - (("hevea unison") "hevea -fix unison")) - #t)))) + (version "2.51.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bcpierce00/unison.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.9 MiB of documentation (native-inputs - `(("ocaml" ,ocaml-4.02) + `(("ocaml" ,ocaml) ;; For documentation ("ghostscript" ,ghostscript) ("texlive" ,texlive-tiny) From 0f4432c620f8d569ef29ca74bad2b7eebd803441 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 15:58:12 +0100 Subject: [PATCH 102/250] import: opam: Fix conditions. * guix/import/opam.scm (condition-eq, condition-neq): The first argument can be empty. * tests/opam.scm: Add test case. --- guix/import/opam.scm | 4 ++-- tests/opam.scm | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index c254db5f2c..6ffb16b49b 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -90,8 +90,8 @@ (define-peg-pattern condition-lower all (and (ignore "<") (* SP) condition-string)) (define-peg-pattern condition-and all (and condition-form2 (* SP) (? (ignore "&")) (* SP) condition-form)) (define-peg-pattern condition-or all (and condition-form2 (* SP) (ignore "|") (* SP) condition-form)) -(define-peg-pattern condition-eq all (and condition-content (* SP) (ignore "=") (* SP) condition-content)) -(define-peg-pattern condition-neq all (and condition-content (* SP) (ignore (and "!" "=")) (* SP) condition-content)) +(define-peg-pattern condition-eq all (and (? condition-content) (* SP) (ignore "=") (* SP) condition-content)) +(define-peg-pattern condition-neq all (and (? condition-content) (* SP) (ignore (and "!" "=")) (* SP) condition-content)) (define-peg-pattern condition-content body (or condition-string condition-var)) (define-peg-pattern condition-content2 body (and condition-content (* SP) (not-followed-by (or "&" "=" "!")))) (define-peg-pattern condition-string all (and QUOTE (* STRCHR) QUOTE)) diff --git a/tests/opam.scm b/tests/opam.scm index e0ec5ef3d4..e8c0d15198 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -192,6 +192,8 @@ url { ("{>= \"0.2.0\" | build}" . (condition-or (condition-greater-or-equal (condition-string "0.2.0")) - (condition-var "build")))))) + (condition-var "build"))) + ("{ = \"1.0+beta19\" }" . (condition-eq + (condition-string "1.0+beta19")))))) (test-end "opam") From beee37ecdb246bf503c72e7da11e51d0b7d1a0b0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:16:25 +0100 Subject: [PATCH 103/250] import: opam: Replace "_" with "-" in imported names. * guix/import/opam.scm (ocaml-name->guix-name): Replace "_" with "-". (opam->guix-packages): Add upstream name when we cannot guess it properly. --- guix/import/opam.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 6ffb16b49b..fa8dc86d32 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -127,12 +127,17 @@ path to the repository." (lambda _ (peg:tree (match-pattern records (get-string-all (current-input-port))))))) +(define (substitute-char str what with) + (string-join (string-split str what) with)) + (define (ocaml-name->guix-name name) - (cond - ((equal? name "ocamlfind") "ocaml-findlib") - ((string-prefix? "ocaml" name) name) - ((string-prefix? "conf-" name) (substring name 5)) - (else (string-append "ocaml-" name)))) + (substitute-char + (cond + ((equal? name "ocamlfind") "ocaml-findlib") + ((string-prefix? "ocaml" name) name) + ((string-prefix? "conf-" name) (substring name 5)) + (else (string-append "ocaml-" name))) + #\_ "-")) (define (metadata-ref file lookup) (fold (lambda (record acc) @@ -247,6 +252,10 @@ path to the repository." ,@(if (null? native-inputs) '() `((native-inputs ,(list 'quasiquote native-inputs)))) + ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) + '() + `((properties + ,(list 'quasiquote `((upstream-name . ,name)))))) (home-page ,(metadata-ref opam-content "homepage")) (synopsis ,(metadata-ref opam-content "synopsis")) (description ,(metadata-ref opam-content "description")) @@ -259,6 +268,11 @@ path to the repository." (opam->guix-package name)) #:guix-name ocaml-name->guix-name)) +(define (guix-name->opam-name name) + (if (string-prefix? "ocaml-" name) + (substring name 6) + name)) + (define (guix-package->opam-name package) "Given an OCaml PACKAGE built from OPAM, return the name of the package in OPAM." @@ -266,10 +280,9 @@ package in OPAM." (package-properties package) 'upstream-name)) (name (package-name package))) - (cond - (upstream-name upstream-name) - ((string-prefix? "ocaml-" name) (substring name 6)) - (else name)))) + (if upstream-name + upstream-name + (guix-name->opam-name name)))) (define (opam-package? package) "Return true if PACKAGE is an OCaml package from OPAM" From 51e52f47df65dacb5dba7bea7f0df28b5b5b031d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:20:13 +0100 Subject: [PATCH 104/250] gnu: ocaml-ppx-derivers: Add upstream-name. * gnu/packages/ocaml.scm (ocaml-ppx-derivers)[properties]: Add upstream-name. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2fd53b01b5..2aded62e69 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5096,6 +5096,7 @@ a more consistent API.") (build-system dune-build-system) (arguments '(#:tests? #f)) ;no tests + (properties `((upstream-name . "ppx_derivers"))) (synopsis "Shared @code{@@deriving} plugin registry") (description "Ppx_derivers is a tiny package whose sole purpose is to allow From c3a191fafd88e1ecd8bf0ab0adc0cb959c038c94 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 15:35:45 +0100 Subject: [PATCH 105/250] import: opam: Work around janestreet version numbers. janestreet reversionned its packages and prefixed them with "v". Let the importer know about that and choose "v" versions first. * guix/import/opam.scm (find-latest-version): Work around version rewrite from janestreet. (opam->guix-package): Do not pass "v" to version number. --- guix/import/opam.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index fa8dc86d32..7b2e832e92 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -1,4 +1,3 @@ -;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. @@ -117,7 +116,11 @@ path to the repository." (lambda (dir) (string-join (cdr (string-split dir #\.)) ".")) versions))) - (latest-version versions)) + ;; Workaround for janestreet re-versionning + (let ((v-versions (filter (lambda (version) (string-prefix? "v" version)) versions))) + (if (null? v-versions) + (latest-version versions) + (string-append "v" (latest-version (map (lambda (version) (substring version 1)) v-versions)))))) (begin (format #t (G_ "Package not found in opam repository: ~a~%") package) #f)))) @@ -239,7 +242,9 @@ path to the repository." (values `(package (name ,(ocaml-name->guix-name name)) - (version ,version) + (version ,(if (string-prefix? "v" version) + (substring version 1) + version)) (source (origin (method url-fetch) From 7e12b4c2bbccff460724be62477a8b57889dfd25 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:39:04 +0100 Subject: [PATCH 106/250] gnu: ocaml: Use propagated-inputs. * gnu/packages/ocaml.scm (ocaml-ppxlib, ocaml-ppx-derivers, ocaml-base) (ocaml-sexplib): Use propagated-inputs. --- gnu/packages/ocaml.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2aded62e69..7e57752d43 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4976,7 +4976,7 @@ parsexp_io.") (base32 "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb")))) (build-system dune-build-system) - (inputs + (propagated-inputs `(("ocaml-num" ,ocaml-num) ("ocaml-parsexp" ,ocaml-parsexp) ("ocaml-sexplib0" ,ocaml-sexplib0))) @@ -5003,7 +5003,7 @@ functionality for parsing and pretty-printing s-expressions.") (base32 "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) (build-system dune-build-system) - (inputs + (propagated-inputs `(("ocaml-sexplib0" ,ocaml-sexplib0))) (arguments `(#:phases @@ -5066,8 +5066,9 @@ is now @code{Ocaml_common.Ast_helper}.") (base32 "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) (build-system dune-build-system) - (inputs `(("ocaml-base" ,ocaml-base) - ("ocaml-sexplib0" ,ocaml-sexplib0))) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-sexplib0" ,ocaml-sexplib0))) (arguments '(#:tests? #f)) ;no tests (synopsis "Standard IO library for OCaml") @@ -5120,7 +5121,7 @@ as part of the same ocaml-migrate-parsetree driver.") (base32 "1nr4igf5m4prvigvv470dnhfdhdw0p6hz6zw8gnm5bzcv7s2lg5l")))) (build-system dune-build-system) - (inputs + (propagated-inputs `(("ocaml-base" ,ocaml-base) ("ocaml-compiler-libs" ,ocaml-compiler-libs) ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) @@ -5128,8 +5129,6 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-stdio" ,ocaml-stdio) ("ocaml-result" ,ocaml-result) ("ocaml-sexplib0" ,ocaml-sexplib0))) - (native-inputs - `(("ocaml-findlib" ,ocaml-findlib))) (arguments '(#:phases (modify-phases %standard-phases @@ -5137,7 +5136,7 @@ as part of the same ocaml-migrate-parsetree driver.") (lambda* (#:key inputs #:allow-other-keys) ;; add the line #directory ".." at the top of each file ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "ocaml-findlib")) + (let* ((findlib-path (assoc-ref inputs "findlib")) (findlib-libdir (string-append findlib-path "/lib/ocaml/site-lib"))) (substitute* '("test/base/test.ml" From c16c8bb68d389edcc7b866a8e91abba0e0204241 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:39:59 +0100 Subject: [PATCH 107/250] gnu: Add ocaml-ppx-compare. * gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7e57752d43..b65c633a28 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5164,3 +5164,32 @@ OCaml AST in the OCaml syntax; @item a generator of open recursion classes from type definitions. @end itemize") (license license:expat))) + +(define-public ocaml-ppx-compare + (package + (name "ocaml-ppx-compare") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_compare.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_compare"))) + (home-page "https://github.com/janestreet/ppx_compare") + (synopsis "Generation of comparison functions from types") + (description "Generation of fast comparison functions from type expressions +and definitions. Ppx_compare is a ppx rewriter that derives comparison functions +from type representations. The scaffolded functions are usually much faster +than ocaml's Pervasives.compare. Scaffolding functions also gives you more +flexibility by allowing you to override them for a specific type and more safety +by making sure that you only compare comparable values.") + (license license:asl2.0))) From 143685fd1af1b8de6fb9facaf8199fa0734095f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:46:17 +0100 Subject: [PATCH 108/250] gnu: Add ocaml-fieldslib. * gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b65c633a28..54a451a720 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5193,3 +5193,31 @@ than ocaml's Pervasives.compare. Scaffolding functions also gives you more flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) + +(define-public ocaml-fieldslib + (package + (name "ocaml-fieldslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) "/files/" + "fieldslib-v" version ".tar.gz")) + (sha256 + (base32 + "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "fieldslib"))) + (home-page "https://github.com/janestreet/fieldslib") + (synopsis "Syntax extension to record fields") + (description "Syntax extension to define first class values representing +record fields, to get and set record fields, iterate and fold over all fields +of a record and create new record values.") + (license license:asl2.0))) From d9f8433e170d7024a1763a2983db4f357acf81fa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:50:21 +0100 Subject: [PATCH 109/250] gnu: Add ocaml-variantslib. * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 54a451a720..08ead1d952 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5221,3 +5221,30 @@ by making sure that you only compare comparable values.") record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) + +(define-public ocaml-variantslib + (package + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib"))) + (home-page "https://github.com/janestreet/variantslib") + (synopsis "OCaml variants as first class values") + (description "The Core suite of libraries is an alternative to OCaml's +standard library.") + (license license:asl2.0))) From 7b685486ce3f6e697830bf05e6dd4b47343b4eae Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:52:25 +0100 Subject: [PATCH 110/250] gnu: Add ocaml-ppx-fields-conv. * gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 08ead1d952..35c0fb59ec 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5248,3 +5248,30 @@ of a record and create new record values.") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) + +(define-public ocaml-ppx-fields-conv + (package + (name "ocaml-ppx-fields-conv") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_fields_conv-v" version ".tar.gz")) + (sha256 + (base32 + "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-fieldslib" ,ocaml-fieldslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_fields_conv"))) + (home-page "https://github.com/janestreet/ppx_fields_conv") + (synopsis "Generation of accessor and iteration functions for ocaml records") + (description "Ppx_fields_conv is a ppx rewriter that can be used to define +first class values representing record fields, and additional routines, to get +and set record fields, iterate and fold over all fields of a record and create +new record values.") + (license license:asl2.0))) From c7cf165e38ed8e24c7199d8a27ceefb4cf4afd5b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 16:54:57 +0100 Subject: [PATCH 111/250] gnu: Add ocaml-ppx-sexp-conv. * gnu/packaes/ocaml.scm (ocaml-ppx-sexp-conv): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 35c0fb59ec..f432baa111 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5275,3 +5275,28 @@ first class values representing record fields, and additional routines, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) + +(define-public ocaml-ppx-sexp-conv + (package + (name "ocaml-ppx-sexp-conv") + (version "0.11.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_conv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_sexp_conv"))) + (home-page "https://github.com/janestreet/ppx_sexp_conv") + (synopsis "Generation of S-expression conversion functions from type definitions") + (description "This package generates S-expression conversion functions from type +definitions.") + (license license:asl2.0))) From 7523674c2b35d767314c959eb94efc9a75ab54b0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:02:43 +0100 Subject: [PATCH 112/250] gnu: Add ocaml-ppx-variants-conv. * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f432baa111..2d4cc68044 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5300,3 +5300,32 @@ new record values.") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) + +(define-public ocaml-ppx-variants-conv + (package + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties + `((upstream-name . "ppx_variants_conv"))) + (home-page + "https://github.com/janestreet/ppx_variants_conv") + (synopsis "Generation of accessor and iteration functions for OCaml variant types") + (description + "This package generates accessors and interation functions for OCaml +variant types.") + (license license:asl2.0))) From e6f08ec93a0c33406f9b4a006b1e5153d0788d67 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:32:27 +0100 Subject: [PATCH 113/250] gnu: Add ocaml-ppx-custom-printf. * gnu/packages/ocaml.scm (ocaml-ppx-custom-printf): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2d4cc68044..1fcf119de0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5329,3 +5329,28 @@ definitions.") "This package generates accessors and interation functions for OCaml variant types.") (license license:asl2.0))) + +(define-public ocaml-ppx-custom-printf + (package + (name "ocaml-ppx-custom-printf") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_custom_printf-v" version ".tar.gz")) + (sha256 + (base32 + "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_custom_printf"))) + (home-page "https://github.com/janestreet/ppx_custom_printf") + (synopsis "Printf-style format-strings for user-defined string conversion") + (description "Extensions to printf-style format-strings for user-defined +string conversion.") + (license license:asl2.0))) From a0584d6c9758456930e243e7e16dd2472d51ddf5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:35:10 +0100 Subject: [PATCH 114/250] gnu: Add ocaml-bin-prot. * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable. --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1fcf119de0..7887058349 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5354,3 +5354,37 @@ variant types.") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) + +(define-public ocaml-bin-prot + (package + (name "ocaml-bin-prot") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/bin_prot-v" version ".tar.gz")) + (sha256 + (base32 + "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (build-system dune-build-system) + (inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + (properties `((upstream-name . "bin_prot"))) + (home-page "https://github.com/janestreet/bin_prot") + (synopsis "Binary protocol generator") + (description "This library contains functionality for reading and writing +OCaml-values in a type-safe binary protocol. It is extremely efficient, +typically supporting type-safe marshalling and unmarshalling of even highly +structured values at speeds sufficient to saturate a gigabit connection. The +protocol is also heavily optimized for size, making it ideal for long-term +storage of large amounts of data.") + (license (list + license:asl2.0 + license:bsd-3)))) From 49b01fa3e9b780d62c1ead54a472aa607bd2a495 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:47:33 +0100 Subject: [PATCH 115/250] gnu: Add ocaml-octavius. * gnu/packages/ocaml.scm (ocaml-octavius): New variable. --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7887058349..b5f63ba28a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5388,3 +5388,23 @@ storage of large amounts of data.") (license (list license:asl2.0 license:bsd-3)))) + +(define-public ocaml-octavius + (package + (name "ocaml-octavius") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-doc/octavius") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gqfbwsh0zq4b9mvvlmg3zhpbfbvq8swqr31320aibbqydwf77hr")))) + (build-system dune-build-system) + (properties `((upstream-name . "octavius"))) + (home-page "https://github.com/ocaml-doc/octavius") + (synopsis "Ocamldoc comment syntax parser") + (description "Octavius is a library to parse the `ocamldoc` comment syntax.") + (license license:isc))) From 6692f652182314eeeab4aad634084ec60d81f035 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:52:37 +0100 Subject: [PATCH 116/250] gnu: Add ocaml-ppx-hash. * gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b5f63ba28a..f01eb37ad7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5408,3 +5408,29 @@ storage of large amounts of data.") (synopsis "Ocamldoc comment syntax parser") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) + +(define-public ocaml-ppx-hash + (package + (name "ocaml-ppx-hash") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_hash.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_hash"))) + (home-page "https://github.com/janestreet/ppx_hash") + (synopsis "Generation of hash functions from type expressions and definitions") + (description "This package is a collecton of ppx rewriters that generate +hash functions from type exrpessions and definitions.") + (license license:asl2.0))) From db67f56901fcb5b365281dd726ed9c06c993e054 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 17:57:21 +0100 Subject: [PATCH 117/250] gnu: Add ocaml-ppx-enumerate. * gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f01eb37ad7..78f26b4f6d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5434,3 +5434,31 @@ storage of large amounts of data.") (description "This package is a collecton of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) + +(define-public ocaml-ppx-enumerate + (package + (name "ocaml-ppx-enumerate") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_enumerate.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_enumerate"))) + (home-page "https://github.com/janestreet/ppx_enumerate") + (synopsis "Generate a list containing all values of a finite type") + (description "Ppx_enumerate is a ppx rewriter which generates a definition +for the list of all values of a type (for a type which only has finitely +many values).") + (license license:asl2.0))) From b42afab2e2aaa6415700a934c20d7dd0fb6f7834 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:01:03 +0100 Subject: [PATCH 118/250] gnu: Add ocaml-ppx-bench. * gnu/packages/ocaml.scm (ocaml-ppx-bench): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 78f26b4f6d..70ff74fe81 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5462,3 +5462,29 @@ hash functions from type exrpessions and definitions.") for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) + +(define-public ocaml-ppx-bench + (package + (name "ocaml-ppx-bench") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_bench-v" version ".tar.gz")) + (sha256 + (base32 + "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_bench"))) + (home-page "https://github.com/janestreet/ppx_bench") + (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") + (description "Syntax extension for writing in-line benchmarks in ocaml code.") + (license license:asl2.0))) From 164b06daebe368124e22bd0d8810569b95438eeb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:07:07 +0100 Subject: [PATCH 119/250] gnu: Add ocaml-ppx-here. * gnu/packages/ocaml.scm (ocaml-ppx-here): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 70ff74fe81..43a66e2ef5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5488,3 +5488,30 @@ many values).") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:asl2.0))) + +(define-public ocaml-ppx-here + (package + (name "ocaml-ppx-here") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_here-v" version ".tar.gz")) + (sha256 + (base32 + "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")))) + (build-system dune-build-system) + (arguments + ;; broken tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_here"))) + (home-page "https://github.com/janestreet/ppx_here") + (synopsis "Expands [%here] into its location") + (description + "Part of the Jane Street's PPX rewriters collection.") + (license license:asl2.0))) From a58118ca6b1b4f971e997675ccdff5def0b0b3c3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:16:56 +0100 Subject: [PATCH 120/250] gnu: Add ocaml-typerep. * gnu/packages/ocaml.scm (ocaml-typerep): New variable. --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43a66e2ef5..549bc15610 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5515,3 +5515,24 @@ many values).") (description "Part of the Jane Street's PPX rewriters collection.") (license license:asl2.0))) + +(define-public ocaml-typerep + (package + (name "ocaml-typerep") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/typerep-v" version ".tar.gz")) + (sha256 + (base32 + "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)) + (propagated-inputs `(("ocaml-base" ,ocaml-base))) + (home-page "https://github.com/janestreet/typerep") + (synopsis "Typerep is a library for runtime types") + (description "Typerep is a library for runtime types.") + (license license:asl2.0))) From e93281507d40c8b4f0c1e967c714c3c86a270b82 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:20:21 +0100 Subject: [PATCH 121/250] gnu: Add ocaml-ppx-sexp-value. * gnu/packages/ocaml.scm (ocaml-ppx-sexp-value): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 549bc15610..7e4ab5715f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5536,3 +5536,29 @@ many values).") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") (license license:asl2.0))) + +(define-public ocaml-ppx-sexp-value + (package + (name "ocaml-ppx-sexp-value") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_value-v" version ".tar.gz")) + (sha256 + (base32 + "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_sexp_value"))) + (home-page "https://github.com/janestreet/ppx_sexp_value") + (synopsis "Simplify building s-expressions from ocaml values") + (description "A ppx rewriter that simplifies building s-expressions from +ocaml values.") + (license license:asl2.0))) From 44a2ceca199b4e6b895a15ccb969d9b96d15880d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:22:33 +0100 Subject: [PATCH 122/250] gnu: Add ocaml-ppx-sexp-message. * gnu/packages/ocaml.scm (ocaml-ppx-sexp-message): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7e4ab5715f..538f2197c4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5562,3 +5562,31 @@ many values).") (description "A ppx rewriter that simplifies building s-expressions from ocaml values.") (license license:asl2.0))) + +(define-public ocaml-ppx-sexp-message + (package + (name "ocaml-ppx-sexp-message") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_message-v" version ".tar.gz")) + (sha256 + (base32 + "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_sexp_message"))) + (home-page "https://github.com/janestreet/ppx_sexp_message") + (synopsis "A ppx rewriter for easy construction of s-expressions") + (description "Ppx_sexp_message aims to ease the creation of s-expressions +in OCaml. This is mainly motivated by writing error and debugging messages, +where one needs to construct a s-expression based on various element of the +context such as function arguments.") + (license license:asl2.0))) From 6a1140012c9791e9ef3137280baf04254b4409d2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:25:16 +0100 Subject: [PATCH 123/250] gnu: Add ocaml-ppx-pipebang. * gnu/packages/ocaml.scm (ocaml-ppx-pipebang): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 538f2197c4..a8176c27ca 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5590,3 +5590,29 @@ in OCaml. This is mainly motivated by writing error and debugging messages, where one needs to construct a s-expression based on various element of the context such as function arguments.") (license license:asl2.0))) + +(define-public ocaml-ppx-pipebang + (package + (name "ocaml-ppx-pipebang") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_pipebang-v" version ".tar.gz")) + (sha256 + (base32 + "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_pipebang"))) + (home-page "https://github.com/janestreet/ppx_pipebang") + (synopsis "Inline reverse application operators `|>` and `|!`") + (description "A ppx rewriter that inlines reverse application operators +@code{|>} and @code{|!}.") + (license license:asl2.0))) From 3f4ecf6649b733d50b11acb941d16b7505fdb93e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:27:40 +0100 Subject: [PATCH 124/250] gnu: Add ocaml-ppx-optional. * gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a8176c27ca..7f208a8888 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5616,3 +5616,31 @@ context such as function arguments.") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") (license license:asl2.0))) + +(define-public ocaml-ppx-optional + (package + (name "ocaml-ppx-optional") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_optional-v" version ".tar.gz")) + (sha256 + (base32 + "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optional"))) + (home-page "https://github.com/janestreet/ppx_optional") + (synopsis "Pattern matching on flat options") + (description + "A ppx rewriter that rewrites simple match statements with an if then +else expression.") + (license license:asl2.0))) From 79967eeafc17e40594220cc3113959ac4b9deb37 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:30:08 +0100 Subject: [PATCH 125/250] gnu: add ocaml-ppx-optcomp. * gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f208a8888..6a56c712d5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5644,3 +5644,28 @@ context such as function arguments.") "A ppx rewriter that rewrites simple match statements with an if then else expression.") (license license:asl2.0))) + +(define-public ocaml-ppx-optcomp + (package + (name "ocaml-ppx-optcomp") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_optcomp-v" version ".tar.gz")) + (sha256 + (base32 + "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optcomp"))) + (home-page "https://github.com/janestreet/ppx_optcomp") + (synopsis "Optional compilation for OCaml") + (description "Ppx_optcomp stands for Optional Compilation. It is a tool +used to handle optional compilations of pieces of code depending of the word +size, the version of the compiler, ...") + (license license:asl2.0))) From 1365ae47d1668f0c2c7d619bc1d454a204269f0e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:33:20 +0100 Subject: [PATCH 126/250] gnu: Add ocaml-ppx-let. * gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6a56c712d5..6fbe762b6c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5669,3 +5669,27 @@ else expression.") used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) + +(define-public ocaml-ppx-let + (package + (name "ocaml-ppx-let") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_let-v" version ".tar.gz")) + (sha256 + (base32 + "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_let"))) + (home-page "https://github.com/janestreet/ppx_let") + (synopsis "Monadic let-bindings") + (description "A ppx rewriter for monadic and applicative let bindings, +match expressions, and if expressions.") + (license license:asl2.0))) From 6018802d9cea508cd7213db5da609c4f4158dd32 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:35:24 +0100 Subject: [PATCH 127/250] gnu: Add ocaml-ppx-fail. * gnu/packages/ocaml.scm (ocaml-ppx-fail): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6fbe762b6c..f750843fa6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5693,3 +5693,28 @@ size, the version of the compiler, ...") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) + +(define-public ocaml-ppx-fail + (package + (name "ocaml-ppx-fail") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_fail-v" version ".tar.gz")) + (sha256 + (base32 + "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_fail"))) + (home-page "https://github.com/janestreet/ppx_fail") + (synopsis "Add location to calls to failwiths") + (description "Syntax extension that makes [failwiths] always include a +position.") + (license license:asl2.0))) From 7ec9a45db3ad4b57bf6fc94ad25b8f6f091e5c0e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:40:11 +0100 Subject: [PATCH 128/250] gnu: Add ocaml-ppx-assert. * gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f750843fa6..c106229552 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5718,3 +5718,30 @@ match expressions, and if expressions.") (description "Syntax extension that makes [failwiths] always include a position.") (license license:asl2.0))) + +(define-public ocaml-ppx-assert + (package + (name "ocaml-ppx-assert") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_assert-v" version ".tar.gz")) + (sha256 + (base32 + "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert"))) + (home-page "https://github.com/janestreet/ppx_assert") + (synopsis "Assert-like extension nodes that raise useful errors on failure") + (description "This package contains assert-like extension nodes that raise +useful errors on failure.") + (license license:asl2.0))) From 4e4e5fb1dfed2c9c55486e09bb4a39e7e40aee1a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:44:22 +0100 Subject: [PATCH 129/250] gnu: Add ocaml-ppx-expect. * gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. --- gnu/packages/ocaml.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c106229552..20766790f0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5745,3 +5745,43 @@ position.") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) + +(define-public ocaml-ppx-expect + (package + (name "ocaml-ppx-expect") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bnz3cpj3vwdw409r6f8raakl8n364q5l7wy4i6gckr34a4vla69")))) + (build-system dune-build-system) + (arguments + `(#:jbuild? #t)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect"))) + (home-page "https://github.com/janestreet/ppx_expect") + (synopsis "Cram like framework for OCaml") + (description "Expect-test is a framework for writing tests in OCaml, similar +to Cram. Expect-tests mimics the existing inline tests framework with the +@code{let%expect_test} construct. The body of an expect-test can contain +output-generating code, interleaved with @code{%expect} extension expressions +to denote the expected output.") + (license license:asl2.0))) From f4304c1d6c3a89b0b01104964b06b95a1e4e94cf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:47:25 +0100 Subject: [PATCH 130/250] gnu: Add ocaml-ppx-js-style. * gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 20766790f0..c07585743c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5785,3 +5785,32 @@ to Cram. Expect-tests mimics the existing inline tests framework with the output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) + +(define-public ocaml-ppx-js-style + (package + (name "ocaml-ppx-js-style") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_js_style-v" version ".tar.gz")) + (sha256 + (base32 + "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-octavius" ,ocaml-octavius) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_js_style"))) + (home-page "https://github.com/janestreet/ppx_js_style") + (synopsis "Code style checker for Jane Street Packages") + (description "This packages is a no-op ppx rewriter. It is used as a +@code{lint} tool to enforce some coding conventions across all Jane Street +packages.") + (license license:asl2.0))) From 48ad1181d0f09af86d26cfdbc99461968092b466 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 18:58:33 +0100 Subject: [PATCH 131/250] gnu: Add ocaml-ppx-typerep-conv. * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c07585743c..5f4595d70e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5814,3 +5814,30 @@ to denote the expected output.") @code{lint} tool to enforce some coding conventions across all Jane Street packages.") (license license:asl2.0))) + +(define-public ocaml-ppx-typerep-conv + (package + (name "ocaml-ppx-typerep-conv") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-typerep" ,ocaml-typerep) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_typerep_conv"))) + (home-page "https://github.com/janestreet/ppx_typerep_conv") + (synopsis "Generation of runtime types from type declarations") + (description "This package can automatically generate runtime types +from type definitions.") + (license license:asl2.0))) From d13b9c5f67c3ce7c03b58bad78ebbf80a8427dda Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:02:36 +0100 Subject: [PATCH 132/250] gnu: Add ocaml-ppx-base. * gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5f4595d70e..c9df13dc28 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5841,3 +5841,35 @@ packages.") (description "This package can automatically generate runtime types from type definitions.") (license license:asl2.0))) + +(define-public ocaml-ppx-base + (package + (name "ocaml-ppx-base") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_base-v" version ".tar.gz")) + (sha256 + (base32 + "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base"))) + (home-page "https://github.com/janestreet/ppx_base") + (synopsis "Base set of ppx rewriters") + (description "Ppx_base is the set of ppx rewriters used for Base. + +Note that Base doesn't need ppx to build, it is only used as a +verification tool.") + (license license:asl2.0))) From 7bd4b85e9bbb70687129721c9bdb2cf0576c715c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:06:12 +0100 Subject: [PATCH 133/250] gnu: Add ocaml-ppx-bin-prot. * gnu/packages/ocaml.scm (ocaml-ppx-bin-prot): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c9df13dc28..cbcb225c78 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5873,3 +5873,33 @@ from type definitions.") Note that Base doesn't need ppx to build, it is only used as a verification tool.") (license license:asl2.0))) + +(define-public ocaml-ppx-bin-prot + (package + (name "ocaml-ppx-bin-prot") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (build-system dune-build-system) + (arguments + ;; Cyclic dependency with ocaml-ppx-jane + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-bin-prot" ,ocaml-bin-prot) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_bin_prot"))) + (home-page "https://github.com/janestreet/ppx_bin_prot") + (synopsis "Generation of bin_prot readers and writers from types") + (description "Generation of binary serialization and deserialization +functions from type definitions.") + (license license:asl2.0))) From 255f1cae42edce0b06a068b4d7134e2cef1c514b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:07:44 +0100 Subject: [PATCH 134/250] gnu: Add ocaml-ppx-jane. * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. --- gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cbcb225c78..686be3cb59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5903,3 +5903,46 @@ verification tool.") (description "Generation of binary serialization and deserialization functions from type definitions.") (license license:asl2.0))) + +(define-public ocaml-ppx-jane + (package + (name "ocaml-ppx-jane") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_jane-v" version ".tar.gz")) + (sha256 + (base32 + "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-base" ,ocaml-ppx-base) + ("ocaml-ppx-bench" ,ocaml-ppx-bench) + ("ocaml-ppx-bin-prot" ,ocaml-ppx-bin-prot) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-ppx-fail" ,ocaml-ppx-fail) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-let" ,ocaml-ppx-let) + ("ocaml-ppx-optcomp" ,ocaml-ppx-optcomp) + ("ocaml-ppx-optional" ,ocaml-ppx-optional) + ("ocaml-ppx-pipebang" ,ocaml-ppx-pipebang) + ("ocaml-ppx-sexp-message" ,ocaml-ppx-sexp-message) + ("ocaml-ppx-sexp-value" ,ocaml-ppx-sexp-value) + ("ocaml-ppx-typerep-conv" ,ocaml-ppx-typerep-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_jane"))) + (home-page "https://github.com/janestreet/ppx_jane") + (synopsis "Standard Jane Street ppx rewriters") + (description "This package installs a ppx-jane executable, which is a ppx +driver including all standard Jane Street ppx rewriters.") + (license license:asl2.0))) From 5995e6d1042cc8427c2ad9ac8cc78c21f4bbe7a4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:14:02 +0100 Subject: [PATCH 135/250] gnu: Add ocaml-splittable-random. * gnu/packages/ocaml.scm (ocaml-splittable-random): New variable. --- gnu/packages/ocaml.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 686be3cb59..2d12d20190 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5946,3 +5946,32 @@ functions from type definitions.") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") (license license:asl2.0))) + +(define-public ocaml-splittable-random + (package + (name "ocaml-splittable-random") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/splittable_random-v" version ".tar.gz")) + (sha256 + (base32 + "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-jane" ,ocaml-ppx-jane) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + (properties `((upstream-name . "splittable_random"))) + (home-page "https://github.com/janestreet/splittable_random") + (synopsis "PRNG that can be split into independent streams") + (description "This package provides a splittable pseudo-random number generator +(@defn{PRNG}) functions like a PRNG that can be used as a stream of random +values; it can also be split to produce a second, independent stream of +random values. + +This library implements a splittable pseudo-random number generator that sacrifices +cryptographic-quality randomness in favor of performance.") + (license license:asl2.0))) From dc361a2563fa0349ef169bd3edecb984932043bf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:16:19 +0100 Subject: [PATCH 136/250] gnu: Add ocaml-jane-street-headers. * gnu/packages/ocaml.scm (ocaml-jane-street-headers): New variable. --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2d12d20190..2adbaf5232 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5975,3 +5975,24 @@ random values. This library implements a splittable pseudo-random number generator that sacrifices cryptographic-quality randomness in favor of performance.") (license license:asl2.0))) + +(define-public ocaml-jane-street-headers + (package + (name "ocaml-jane-street-headers") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/jane-street-headers-v" version ".tar.gz")) + (sha256 + (base32 + "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (home-page "https://github.com/janestreet/jane-street-headers") + (synopsis "Jane Street C header files") + (description "This package provides C header files shared between the +various Jane Street packages.") + (license license:asl2.0))) From 3e3d5ffc3483c95902a1bc3c40da76138611fb48 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Feb 2019 19:18:42 +0100 Subject: [PATCH 137/250] gnu: Add ocaml-configurator. * gnu/packages/ocaml.scm (ocaml-configurator): New variable. --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2adbaf5232..7e7e58cf5f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5996,3 +5996,37 @@ cryptographic-quality randomness in favor of performance.") (description "This package provides C header files shared between the various Jane Street packages.") (license license:asl2.0))) + +(define-public ocaml-configurator + (package + (name "ocaml-configurator") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/configurator-v" version ".tar.gz")) + (sha256 + (base32 + "0kwgi3sh92v4n242dk5hgpwd85zzgnczgbkqi0q0kr6m93zgbf7p")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio))) + (home-page "https://github.com/janestreet/configurator") + (synopsis "Helper library for gathering system configuration") + (description "Configurator is a small library that helps writing OCaml +scripts that test features available on the system, in order to generate config.h +files for instance. + +Configurator allows one to: +@itemize +@item test if a C program compiles +@item query pkg-config +@item import #define from OCaml header files +@item generate config.h file +@end itemize") + (license license:asl2.0))) From 9e81db80eb10d0de751defac0218dcf20ee7a6db Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 3 Feb 2019 17:29:33 +0100 Subject: [PATCH 138/250] gnu: Add ocaml-spawn. * gnu/packages/ocaml.scm (ocaml-spawn): New variable. --- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7e7e58cf5f..a07c4efa97 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6030,3 +6030,47 @@ Configurator allows one to: @item generate config.h file @end itemize") (license license:asl2.0))) + +(define-public ocaml-spawn + (package + (name "ocaml-spawn") + (version "0.12.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/spawn.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0amgj7g9sjlbjivn1mg7yjdmxd21hgp4a0ak2zrm95dmm4gi846i")))) + (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda _ + (substitute* "test/tests.ml" + (("/bin/pwd") (which "pwd")) + (("/bin/echo") (which "echo"))) + #t))))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (home-page "https://github.com/janestreet/spawn") + (synopsis "Spawning sub-processes") + (description + "Spawn is a small library exposing only one functionality: spawning sub-process. + +It has three main goals: + +@itemize +@item provide missing features of Unix.create_process such as providing a +working directory, +@item provide better errors when a system call fails in the +sub-process. For instance if a command is not found, you get a proper +@code{Unix.Unix_error} exception, +@item improve performances by using vfork when available. It is often +claimed that nowadays fork is as fast as vfork, however in practice +fork takes time proportional to the process memory while vfork is +constant time. In application using a lot of memory, vfork can be +thousands of times faster than fork.") + (license license:asl2.0))) From 514b542018e85d724e6163faf2fab314d9a9e492 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 3 Feb 2019 17:55:55 +0100 Subject: [PATCH 139/250] gnu: Add ocaml-core. * gnu/packages/ocaml.scm (ocaml-core): New variable. --- gnu/packages/ocaml.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a07c4efa97..43467da1a0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6074,3 +6074,39 @@ fork takes time proportional to the process memory while vfork is constant time. In application using a lot of memory, vfork can be thousands of times faster than fork.") (license license:asl2.0))) + +(define-public ocaml-core + (package + (name "ocaml-core") + (version "0.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (build-system dune-build-system) + (arguments + `(#:jbuild? #t + ;; Require a cyclic dependency: core_extended + #:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-configurator" ,ocaml-configurator) + ("ocaml-core-kernel" ,ocaml-core-kernel) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-jane" ,ocaml-ppx-jane) + ("ocaml-sexplib" ,ocaml-sexplib) + ("ocaml-spawn" ,ocaml-spawn) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (home-page "https://github.com/janestreet/core") + (synopsis "Alternative to OCaml's standard library") + (description "The Core suite of libraries is an alternative to OCaml's +standard library that was developed by Jane Street.") + ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). + (license license:asl2.0))) From 8baa5c8b7c9aa1d85726778d1a44d11e2791388b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 3 Feb 2019 17:57:36 +0100 Subject: [PATCH 140/250] gnu: Add ocaml-core-kernel. * gnu/packages/ocaml.scm (ocaml-core-kernel): New variable. --- gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43467da1a0..3f324ed226 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6110,3 +6110,52 @@ standard library that was developed by Jane Street.") ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:asl2.0))) + +(define-public ocaml-core-kernel + (package + (name "ocaml-core-kernel") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (build-system dune-build-system) + (arguments + ;; Cyclic dependency with ocaml-core + `(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-bin-prot" ,ocaml-bin-prot) + ("ocaml-configurator" ,ocaml-configurator) + ("ocaml-fieldslib" ,ocaml-fieldslib) + ("ocaml-jane-street-headers" ,ocaml-jane-street-headers) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-base" ,ocaml-ppx-base) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-jane" ,ocaml-ppx-jane) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-sexp-message" ,ocaml-ppx-sexp-message) + ("ocaml-sexplib" ,ocaml-sexplib) + ("ocaml-splittable-random" ,ocaml-splittable-random) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-typerep" ,ocaml-typerep) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + (properties `((upstream-name . "core_kernel"))) + (home-page "https://github.com/janestreet/core_kernel") + (synopsis "Portable standard library for OCaml") + (description "Core is an alternative to the OCaml standard library. + +Core_kernel is the system-independent part of Core. It is aimed for cases when +the full Core is not available, such as in Javascript.") + (license (list + ;; this package and parts of OCaml, relicensed by janestreet + license:asl2.0 + ;; MLton and sjs + license:expat)))) From 00e18f9fa9c5e4e595c08da43325bf2f1d800d1b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 5 Feb 2019 23:10:38 +0100 Subject: [PATCH 141/250] gnu: musescore: Update to 3.0.2. * gnu/packages/music.scm (musescore): Update to 3.0.2. [source]: Add patch. * gnu/packages/patches/musescore-fix-use_webengine.patch: New file. * gnu/local.mk (dist_patch_DATA): Reference patch. --- gnu/local.mk | 1 + gnu/packages/music.scm | 10 +- .../patches/musescore-fix-use_webengine.patch | 165 ++++++++++++++++++ 3 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/musescore-fix-use_webengine.patch diff --git a/gnu/local.mk b/gnu/local.mk index dffc58069d..939a91b600 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1057,6 +1057,7 @@ dist_patch_DATA = \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ + %D%/packages/patches/musescore-fix-use_webengine.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/netcdf-date-time.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a716f0e142..c4333364e1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3637,7 +3637,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "3.0.1") + (version "3.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -3646,7 +3646,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (file-name (git-file-name name version)) (sha256 (base32 - "085qwfv3fsgry1pnx531w83lnyvf7kbaklipdf8zqa9shi6d3x9i")) + "1w9il6gg0dh4yi20nbdcibx5z5z4bvzppq8wsqf1l916hnczsj3s")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. @@ -3660,7 +3660,11 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke '("thirdparty/freetype" "thirdparty/openssl" "thirdparty/portmidi")) - #t)))) + #t)) + ;; Fix compilation error due to BUILD_WEBENGINE CMake option not + ;; properly handled. Applied upstream already: + ;; + (patches (search-patches "musescore-fix-use_webengine.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/musescore-fix-use_webengine.patch b/gnu/packages/patches/musescore-fix-use_webengine.patch new file mode 100644 index 0000000000..b0b8216a42 --- /dev/null +++ b/gnu/packages/patches/musescore-fix-use_webengine.patch @@ -0,0 +1,165 @@ +From bb0c1a9b4940f3f6b52c0df535289ec8a3bc9e03 Mon Sep 17 00:00:00 2001 +From: Dmitri Ovodok +Date: Mon, 4 Feb 2019 21:35:25 +0300 +Subject: [PATCH] Fix build without USE_WEBENGINE and SCRIPT_INTERFACE + +Old-style login dialog is used if USE_WEBENGINE is turned off +--- + mscore/logindialog.h | 2 ++ + mscore/musescore.cpp | 4 +++- + mscore/network/loginmanager.cpp | 13 +++++++++++-- + mscore/network/loginmanager.h | 4 ++++ + mscore/network/loginmanager_p.h | 4 ++++ + 5 files changed, 24 insertions(+), 3 deletions(-) + +diff --git a/mscore/logindialog.h b/mscore/logindialog.h +index 4e86ae7985..f44511d8c0 100644 +--- a/mscore/logindialog.h ++++ b/mscore/logindialog.h +@@ -21,6 +21,8 @@ class LoginManager; + + //--------------------------------------------------------- + // LoginDialog ++// Old-style login dialog in case QtWebEngine is ++// unavailable. + //--------------------------------------------------------- + + class LoginDialog : public QDialog, public Ui::LoginDialog +diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp +index 80c712aea9..5bb8354992 100644 +--- a/mscore/musescore.cpp ++++ b/mscore/musescore.cpp +@@ -7572,12 +7572,14 @@ bool MuseScore::exportPartsPdfsToJSON(const QString& inFilePath, const QString& + } + + //--------------------------------------------------------- +-// getQmlEngine ++// getPluginEngine + //--------------------------------------------------------- + ++#ifdef SCRIPT_INTERFACE + QmlPluginEngine* MuseScore::getPluginEngine() + { + if (!_qmlEngine) + _qmlEngine = new QmlPluginEngine(this); + return _qmlEngine; + } ++#endif +diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp +index a53d7fe811..664786ccc8 100644 +--- a/mscore/network/loginmanager.cpp ++++ b/mscore/network/loginmanager.cpp +@@ -18,7 +18,9 @@ + #include "kQOAuth/kqoauthrequest.h" + #include "kQOAuth/kqoauthrequest_xauth.h" + ++#ifdef USE_WEBENGINE + #include ++#endif + + namespace Ms { + +@@ -286,8 +288,11 @@ void LoginManager::onTryLoginError(const QString& error) + disconnect(this, SIGNAL(getUserError(QString)), this, SLOT(onTryLoginError(QString))); + connect(this, SIGNAL(loginSuccess()), this, SLOT(tryLogin())); + logout(); ++#ifdef USE_WEBENGINE + loginInteractive(); +-// mscore->showLoginDialog(); // TODO: switch depending on USE_WEBENGINE ++#else ++ mscore->showLoginDialog(); ++#endif + } + /*------- END - TRY LOGIN ROUTINES ----------------------------*/ + +@@ -295,6 +300,7 @@ void LoginManager::onTryLoginError(const QString& error) + // loginInteractive + //--------------------------------------------------------- + ++#ifdef USE_WEBENGINE + void LoginManager::loginInteractive() + { + QWebEngineView* webView = new QWebEngineView; +@@ -326,6 +332,7 @@ void LoginManager::loginInteractive() + webView->load(ApiInfo::loginUrl); + webView->show(); + } ++#endif + + //--------------------------------------------------------- + // login +@@ -346,7 +353,7 @@ void LoginManager::login(QString login, QString password) + connect(reply, &QNetworkReply::finished, this, [this, reply] { + onReplyFinished(reply, RequestType::LOGIN); + }); +- } ++ } + + //--------------------------------------------------------- + // onLoginSuccessReply +@@ -874,6 +881,7 @@ ApiRequest ApiRequestBuilder::build() const + // musescore.com + //--------------------------------------------------------- + ++#ifdef USE_WEBENGINE + void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& request) + { + const ApiInfo& apiInfo = ApiInfo::instance(); +@@ -881,4 +889,5 @@ void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& + request.setHttpHeader(apiInfo.clientIdHeader, apiInfo.clientId); + request.setHttpHeader(apiInfo.apiKeyHeader, apiInfo.apiKey); + } ++#endif + } +diff --git a/mscore/network/loginmanager.h b/mscore/network/loginmanager.h +index 584eeea30d..327d9fc966 100644 +--- a/mscore/network/loginmanager.h ++++ b/mscore/network/loginmanager.h +@@ -13,6 +13,8 @@ + #ifndef __LOGINMANAGER_H__ + #define __LOGINMANAGER_H__ + ++#include "config.h" ++ + namespace Ms { + + //--------------------------------------------------------- +@@ -83,7 +85,9 @@ class LoginManager : public QObject + public: + LoginManager(QAction* uploadAudioMenuAction, QObject* parent = 0); + void login(QString login, QString password); ++#ifdef USE_WEBENGINE + void loginInteractive(); ++#endif + void upload(const QString& path, int nid, const QString& title, const QString& description, const QString& priv, const QString& license, const QString& tags, const QString& changes); + bool hasAccessToken(); + void getUser(); +diff --git a/mscore/network/loginmanager_p.h b/mscore/network/loginmanager_p.h +index 88228a3958..2848dde35a 100644 +--- a/mscore/network/loginmanager_p.h ++++ b/mscore/network/loginmanager_p.h +@@ -20,6 +20,8 @@ + #ifndef __LOGINMANAGER_P_H__ + #define __LOGINMANAGER_P_H__ + ++#include "config.h" ++ + namespace Ms { + + //--------------------------------------------------------- +@@ -102,6 +104,7 @@ class ApiRequestBuilder + // ApiWebEngineRequestInterceptor + //--------------------------------------------------------- + ++#ifdef USE_WEBENGINE + class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor + { + Q_OBJECT +@@ -109,6 +112,7 @@ class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor + ApiWebEngineRequestInterceptor(QObject* parent) : QWebEngineUrlRequestInterceptor(parent) {} + void interceptRequest(QWebEngineUrlRequestInfo& info) override; + }; ++#endif + + //--------------------------------------------------------- + // HttpStatus From f4f8c23bae3167e16ae29d9f48ca26c39e875613 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 6 Feb 2019 13:05:45 +0530 Subject: [PATCH 142/250] gnu: mpop: Update to 1.4.2. * gnu/packages/mail.scm (mpop): Update to 1.4.2. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c5e422fbd5..be2098ad61 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Troy Sankey ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016, 2017, 2018 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2018 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert @@ -1861,7 +1861,7 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) @@ -1869,7 +1869,7 @@ converts them to maildir format directories.") name "-" version ".tar.xz")) (sha256 (base32 - "14xsvpm5bc1wycisq882gqrnamnyi1q4rlk6anlw8ihzvwgm4h2j")))) + "1rx5mhgqkm7swbynrhbsz32v85h0rydb4kqfgfs9jrznd9d14m2d")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) From 1d5d0447d33fb50dc5ecb19ff94732ab935c6743 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 6 Feb 2019 09:16:50 +0000 Subject: [PATCH 143/250] gnu: ocaml-spawn: Add missing @end itemize to description. As otherwise this error appears when running things like guix package -s: texinfo.scm:745:27: Throw to key `parser-error' with args `(# "EOF while reading a token " "reading char data")'. * gnu/packages/ocaml.scm (ocaml-spawn)[description]: Add @end itemize to the end. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3f324ed226..8968ce82fe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6072,7 +6072,8 @@ sub-process. For instance if a command is not found, you get a proper claimed that nowadays fork is as fast as vfork, however in practice fork takes time proportional to the process memory while vfork is constant time. In application using a lot of memory, vfork can be -thousands of times faster than fork.") +thousands of times faster than fork. +@end itemize") (license license:asl2.0))) (define-public ocaml-core From e88fd8beb11900b60fc8ebdb7bf2ea9ae1d7b3c6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 6 Feb 2019 09:18:08 +0000 Subject: [PATCH 144/250] gnu: ocaml-splittable-random: Change @defn to @acronym. I see an error when running guix package -s relating to this: Throw to key `parser-error' with args `(#f "Unknown command" defn)'. * gnu/packages/ocaml.scm (ocaml-splittable-random)[description]: Change @defn to @acronym. --- gnu/packages/ocaml.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8968ce82fe..07fcf92aea 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5967,10 +5967,10 @@ driver including all standard Jane Street ppx rewriters.") (properties `((upstream-name . "splittable_random"))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") - (description "This package provides a splittable pseudo-random number generator -(@defn{PRNG}) functions like a PRNG that can be used as a stream of random -values; it can also be split to produce a second, independent stream of -random values. + (description "This package provides a splittable +@acronym{PRNG,pseudo-random number generator} functions like a PRNG that can +be used as a stream of random values; it can also be split to produce a +second, independent stream of random values. This library implements a splittable pseudo-random number generator that sacrifices cryptographic-quality randomness in favor of performance.") From 9b43a7360036261a63fd39cde20aabda4d4e6571 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Feb 2019 12:07:56 +0100 Subject: [PATCH 145/250] gnu: vulkan-headers: Update to 1.1.99. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.1.99. * gnu/packages/vulkan.scm (vulkan-loader): Update hash. * gnu/packages/vulkan.scm (vulkan-tools): Update to 1.1.97.0. --- gnu/packages/vulkan.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 61ffb427b2..fbed97ead0 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -163,7 +163,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.97") + (version "1.1.99") (source (origin (method git-fetch) @@ -172,7 +172,7 @@ interpretation of the specifications for these languages.") (commit (string-append "v" version)))) (sha256 (base32 - "1yjwhbnccsmn99q9cb0vdimcpa8bacx1cxndzfxbgqzkckmd9mhc")))) + "166z6wn5kxnqm55zgzhmqa9hg48d11bfmi3wnf1mqhsx48xw6b8z")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -195,7 +195,7 @@ interpretation of the specifications for these languages.") (commit (string-append "v" version)))) (sha256 (base32 - "14p8n5bpq0qri2b9f22ydc5lh9zv0sd80lmwwdpyhyzkdj6cw08r")))) + "02m3sdcbl8s6qr1nsba5621vg3f4akkfaa7g9hi70cpvws4x0gg8")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". @@ -242,16 +242,16 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version (package-version vulkan-headers)) + (version "1.1.97.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Tools") - (commit (string-append "v" version)))) + (commit (string-append "sdk-" version)))) (sha256 (base32 - "11ggmmzxcayyya43izfjdqr0pp03n857w83kmmn9cnxvfzipkndc")))) + "1p70wk0x546w1dlvlghrqm4l4b6ql0x08pdybyagnwwph0gdvqy3")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) From 61dafdc0fee97dc1ee5016edc50ed1abd60464f7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 6 Feb 2019 11:12:20 +0000 Subject: [PATCH 146/250] gnu: Add guile-squee. * gnu/packages/guile-xyz.scm (guile-squee): New variable. --- gnu/packages/guile-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 117d309c92..f249761ebc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -560,6 +560,45 @@ HTML (via SXML) or any other format for rendering.") It has a nice, simple s-expression based syntax.") (license license:lgpl3+))) +(define-public guile-squee + (let ((commit "a85902a92bf6f58a1d35fd974a01ade163deda8d") + (revision "0")) + (package + (name "guile-squee") + (version (string-append "0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/cwebber/guile-squee.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p1lpsp4kx57j3ai1dkxilm4ziavzzx8wbbc42m3hpziq0a7qz5z")))) + (build-system guile-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "squee.scm" + (("dynamic-link \"libpq\"") + (string-append + "dynamic-link \"" + (assoc-ref inputs "postgresql") "/lib/libpq.so" + "\""))) + #t))))) + (inputs + `(("postgresql" ,postgresql))) + (native-inputs + `(("guile" ,guile-2.2))) + (home-page "https://notabug.org/cwebber/guile-squee") + (synopsis "Connect to PostgreSQL using Guile") + (description + "@code{squee} is a Guile library for connecting to PostgreSQL databases +using Guile's foreign function interface.") + (license license:gpl3+)))) + (define-public guile-colorized (package (name "guile-colorized") From b6a7697914f3e0f0708023351998b34e5a43c304 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 6 Feb 2019 16:18:28 +0100 Subject: [PATCH 147/250] gnu: emacs-evil: Update to 1.2.14. * gnu/packages/emacs-xyz.scm (emacs-evil): Update to 1.2.14. --- gnu/packages/emacs-xyz.scm | 45 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d1d88ce82c..8b53fa1145 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5184,31 +5184,30 @@ news items, openrc and runscripts.") (license license:gpl2+))) (define-public emacs-evil - (let ((commit "230b87212c81aaa68ef5547a6b998d9c365fe139")) - (package - (name "emacs-evil") - (version (git-version "1.2.13" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-evil/evil") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0c9zy3bpck10gcrv79kd3h7i4ygd5bgbgy773n0lg7a2r5kwn1gx")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-undo-tree" ,emacs-undo-tree) - ("emacs-goto-chg" ,emacs-goto-chg))) - (home-page "https://github.com/emacs-evil/evil") - (synopsis "Extensible Vi layer for Emacs") - (description - "Evil is an extensible vi layer for Emacs. It emulates the + (package + (name "emacs-evil") + (version "1.2.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-evil/evil") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-undo-tree" ,emacs-undo-tree) + ("emacs-goto-chg" ,emacs-goto-chg))) + (home-page "https://github.com/emacs-evil/evil") + (synopsis "Extensible Vi layer for Emacs") + (description + "Evil is an extensible vi layer for Emacs. It emulates the main features of Vim, and provides facilities for writing custom extensions.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-evil-collection (let ((commit "4e1f0e0b17153d460805a0da90d6191d66b2673d") From de87d70e542c097c29d4dbba2f121ece2c28765d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 6 Feb 2019 16:18:54 +0100 Subject: [PATCH 148/250] gnu: emacs-evil-collection: Update to 20190206. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20190206. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b53fa1145..35a6941aea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5210,8 +5210,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "4e1f0e0b17153d460805a0da90d6191d66b2673d") - (revision "5")) + (let ((commit "0cfdf4ecf0420aac2a9dd29ff7b54067c3433d71") + (revision "6")) (package (name "emacs-evil-collection") (version (git-version "0.0.1" revision commit)) @@ -5223,7 +5223,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "11d5ppdnb2y2mwsdd9g62h7zds962kw3nss89zv5iwgcf9f1fb5x")))) + "1igsvgxvij918myc397cjhfybmm11znc7961vnbcd5xlviq2p01y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) From caf810d3553866bb4e4870c5edef735f1765c895 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 6 Feb 2019 16:20:32 +0100 Subject: [PATCH 149/250] gnu: emacs-lispy: Update to 20190205. * gnu/packages/emacs-xyz.scm (emacs-lispy): Update to 20190205. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35a6941aea..3368e08fef 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4000,8 +4000,8 @@ navigate code in a tree-like fashion.") (define-public emacs-lispy ;; Release 0.26.0 was almost 3 years ago, and there have been ~772 commits ;; since. - (let ((commit "c2a358a7a15fcf056a5b7461a8e690b481b03b80") - (revision "0")) + (let ((commit "f94cfc6b8f9c3afe7d028c366928049c011023de") + (revision "1")) (package (name "emacs-lispy") (version (git-version "0.26.0" revision commit)) @@ -4011,7 +4011,7 @@ navigate code in a tree-like fashion.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "1g6756qqx2n4cx8jac6mlwayilsiyc5rz8nrqjnywvzc75xdinjd")) + "1bm2cpwizg1qfpm377gpx1af1hm5maw69if1csnk5vwaphmv8c4g")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs From 808136bdb6203157c68c1b9dc44db779cd31f5bf Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 6 Feb 2019 16:20:52 +0100 Subject: [PATCH 150/250] gnu: emacs-lispyville: Update to 20181217. * gnu/packages/emacs-xyz.scm (emacs-lispyville): Update to 20181217. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3368e08fef..173b1430b3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4031,10 +4031,8 @@ S-expression.") (license license:gpl3+)))) (define-public emacs-lispyville - ;; Later versions need a more recent Evil, with an evil-define-key* - ;; supporting nil for the state. - (let ((commit "b4291857ed6a49a67c4ea77522889ce51fb171ab") - (revision "0")) + (let ((commit "d28b937f0cabd8ce61e2020fe9a733ca80d82c74") + (revision "1")) (package (name "emacs-lispyville") (version (git-version "0.1" revision commit)) @@ -4044,7 +4042,7 @@ S-expression.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3")) + "0f6srwj1qqkfkbmp5n5pjvi6gm7b7xav05p5hrs2i83rjrakzzqx")) (file-name (git-file-name name version)))) (propagated-inputs `(("emacs-evil" ,emacs-evil) From a4362fba0e2f61fcd19a0584058e89430af224a4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 6 Feb 2019 09:28:10 -0500 Subject: [PATCH 151/250] gnu: maxima: Update to 5.42.2. * gnu/packages/maths.scm (maxima): Update to 5.42.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 602c696567..ae073f700a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2691,7 +2691,7 @@ to BMP, JPEG or PNG image formats.") (define-public maxima (package (name "maxima") - (version "5.42.1") + (version "5.42.2") (source (origin (method url-fetch) @@ -2699,7 +2699,7 @@ to BMP, JPEG or PNG image formats.") version "-source/" name "-" version ".tar.gz")) (sha256 (base32 - "1ka0xf70a55ndgmyrq7p5xxbd78pq7bfkqhgxsivaqdw6gn5lmcg")) + "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn")) (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs From d11840b43ed2e0174b6012f1aeefb4c910c8c6c4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 6 Feb 2019 12:51:50 -0500 Subject: [PATCH 152/250] gnu: wxmaxima: Update to 19.01.3. * gnu/packages/maths.scm (wxmaxima): Update to 19.01.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ae073f700a..4806a5e19e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2802,7 +2802,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "18.11.4") + (version "19.01.3") (source (origin (method git-fetch) @@ -2812,7 +2812,7 @@ point numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "1sz8n9v23q442l7yjj67pjh0dk78rl4cbcc3j8m1bm88anlfxl9r")))) + "1vwahx3zxkn3qlv4z0fm7v8wh0wspvs026alrh7ff7s0c2dcy95x")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) From 6df215f8c8ad0ed4afd8c32a0414cf2ac7ec8983 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Feb 2019 21:24:42 +0100 Subject: [PATCH 153/250] gnu: star: Update to 2.7.0b. * gnu/packages/bioinformatics.scm (star): Update to 2.7.0b. [arguments]: Add "add-missing-header" build phase. --- gnu/packages/bioinformatics.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 23eba74175..516a7c1ee1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6020,7 +6020,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (define-public star (package (name "star") - (version "2.7.0a") + (version "2.7.0b") (source (origin (method git-fetch) (uri (git-reference @@ -6029,7 +6029,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1yx28gra6gqdx1ps5y8mpdinsn8r0dhsc2m3gcvjfrk71i9yhd6l")) + "1lih6cbpvnvhyvvswdhy06mwyzvwax96m723378v4z6psqzsh11d")) (modules '((guix build utils))) (snippet '(begin @@ -6055,6 +6055,13 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (("(COMPILATION_TIME_PLACE=\")(.*)(\")" _ pre mid post) (string-append pre "Built with Guix" post))) #t)) + ;; See https://github.com/alexdobin/STAR/pull/562 + (add-after 'enter-source-dir 'add-missing-header + (lambda _ + (substitute* "SoloReadFeature_inputRecords.cpp" + (("#include \"binarySearch2.h\"" h) + (string-append h "\n#include "))) + #t)) (add-after 'enter-source-dir 'do-not-use-bundled-htslib (lambda _ (substitute* "Makefile" From 25945666e3dfb7f81e984bb8a3c9ec1d20730558 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 6 Feb 2019 13:05:27 -0500 Subject: [PATCH 154/250] gnu: abcde: Update to 2.9.3. * gnu/packages/cdrom.scm (abcde): Update to 2.9.3. [source]: Update snippet. --- gnu/packages/cdrom.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b44cc3bce9..546e1a20d0 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -525,7 +525,7 @@ from an audio CD.") (define-public abcde (package (name "abcde") - (version "2.9.2") + (version "2.9.3") (home-page "https://abcde.einval.com/") (source (origin (method url-fetch) @@ -533,19 +533,13 @@ from an audio CD.") version ".tar.gz")) (sha256 (base32 - "13c5yvp87ckqgha160ym5rdr1a4divgvyqbjh0yb6ffclip6qd9l")) + "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04")) (modules '((guix build utils))) (snippet - `(begin + '(begin (substitute* "Makefile" - ;; Fix abcde 2.9.2 still thinking it's 2.9.1. - ;; XXX This will be fixed in the next release. - (("(abcde_version = abcde-)(2.9.1)" _ good bad) - (string-append good ,version)) (("/usr/bin/install") - "install") - (("^etcdir = .*$") - (string-append "etcdir = $(prefix)/etc\n"))) + "install")) #t)))) (build-system gnu-build-system) (arguments From d59124280851c5d62b6ecf5aa07f6b4f6520a0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Feb 2019 22:58:13 +0100 Subject: [PATCH 155/250] daemon: Emit a 'build-succeeded' event in check mode. Until now, something like "guix build sed -v1 --check" would not get a 'build-succeeded' event, which in turn meant that the spinner would not be erased upon build completion. * nix/libstore/build.cc (DerivationGoal::registerOutputs): When 'buildMode' is bmCheck and 'settings.printBuildTrace' emit a "@ build-succeeded" trace upon success. * tests/store.scm ("build-succeeded trace in check mode"): New test. --- nix/libstore/build.cc | 4 ++++ tests/store.scm | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index f4a866c68f..06bc7601b9 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2502,6 +2502,10 @@ void DerivationGoal::registerOutputs() throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs") % drvPath % path); } + + if (settings.printBuildTrace) + printMsg(lvlError, format("@ build-succeeded %1% -") % drvPath); + continue; } diff --git a/tests/store.scm b/tests/store.scm index e28c0c5aaa..df66feaebb 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -917,6 +917,19 @@ (build-mode check)) #f)))))))) +(test-assert "build-succeeded trace in check mode" + (string-contains + (call-with-output-string + (lambda (port) + (let ((d (build-expression->derivation + %store "foo" '(mkdir (assoc-ref %outputs "out")) + #:guile-for-build + (package-derivation %store %bootstrap-guile)))) + (build-derivations %store (list d)) + (parameterize ((current-build-output-port port)) + (build-derivations %store (list d) (build-mode check)))))) + "@ build-succeeded")) + (test-assert "build multiple times" (with-store store ;; Ask to build twice. From 8245bb74fc7bdcdc2f9d458057cefc9cd982e489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 6 Feb 2019 21:58:43 +0100 Subject: [PATCH 156/250] monads, gexp: Prevent redefinition of syntax parameters. Fixes . This fixes multi-threaded compilation of this code where syntax parameters could end up being redefined and where a race condition could lead a thread to see the "wrong" value of the syntax parameter. * guix/monads.scm (define-syntax-parameter-once): New macro. (>>=, return): Use it. * guix/gexp.scm (define-syntax-parameter-once): New macro. (current-imported-modules, current-imported-extensions): Use it. --- guix/gexp.scm | 15 +++++++++++++-- guix/monads.scm | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index f7c064297b..5b5b064b59 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -920,7 +920,18 @@ and in the current monad setting (system type, etc.)" (simple-format #f "~a:~a" line column))) ""))) -(define-syntax-parameter current-imported-modules +(define-syntax-rule (define-syntax-parameter-once name proc) + ;; Like 'define-syntax-parameter' but ensure the top-level binding for NAME + ;; does not get redefined. This works around a race condition in a + ;; multi-threaded context with Guile <= 2.2.4: . + (eval-when (load eval expand compile) + (define name + (if (module-locally-bound? (current-module) 'name) + (module-ref (current-module) 'name) + (make-syntax-transformer 'name 'syntax-parameter + (list proc)))))) + +(define-syntax-parameter-once current-imported-modules ;; Current list of imported modules. (identifier-syntax '())) @@ -931,7 +942,7 @@ environment." (identifier-syntax modules))) body ...)) -(define-syntax-parameter current-imported-extensions +(define-syntax-parameter-once current-imported-extensions ;; Current list of extensions. (identifier-syntax '())) diff --git a/guix/monads.scm b/guix/monads.scm index 6ae616aca9..6924471345 100644 --- a/guix/monads.scm +++ b/guix/monads.scm @@ -274,12 +274,23 @@ more optimizations." (_ #'generic-name)))))))))) -(define-syntax-parameter >>= +(define-syntax-rule (define-syntax-parameter-once name proc) + ;; Like 'define-syntax-parameter' but ensure the top-level binding for NAME + ;; does not get redefined. This works around a race condition in a + ;; multi-threaded context with Guile <= 2.2.4: . + (eval-when (load eval expand compile) + (define name + (if (module-locally-bound? (current-module) 'name) + (module-ref (current-module) 'name) + (make-syntax-transformer 'name 'syntax-parameter + (list proc)))))) + +(define-syntax-parameter-once >>= ;; The name 'bind' is already taken, so we choose this (obscure) symbol. (lambda (s) (syntax-violation '>>= ">>= (bind) used outside of 'with-monad'" s))) -(define-syntax-parameter return +(define-syntax-parameter-once return (lambda (s) (syntax-violation 'return "return used outside of 'with-monad'" s))) From 67321719240ebc04c3a382c9358e45f5c820d710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 6 Feb 2019 22:09:42 +0100 Subject: [PATCH 157/250] gnu: iproute2: Update to 4.20.0. * gnu/packages/linux.scm (iproute): Update to 4.20.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2bb6f83803..0edbd40717 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1257,7 +1257,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") - (version "4.19.0") + (version "4.20.0") (source (origin (method url-fetch) (uri (string-append @@ -1265,7 +1265,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 - "114rlb3bvrf7q6yr03mn1rj6gl7mrg0psvm2dx0qb2kxyjhmrv6r")))) + "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite From 3ef29c00ed2224cd1d636fa16397f325857f8270 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 3 Feb 2019 23:00:52 -0500 Subject: [PATCH 158/250] gnu: Add datefudge. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/time.scm (datefudge): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/time.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index e491970300..948d2b995c 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,10 +35,12 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz)) @@ -377,3 +380,41 @@ datetime type.") (define-public python2-aniso8601 (package-with-python2 python-aniso8601)) + +(define-public datefudge + (package + (name "datefudge") + (version "1.22") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/datefudge.git") + (commit (string-append "debian/" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list "CC=gcc" + (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* "Makefile" + ((" -o root -g root") "") + (("VERSION := \\$\\(shell dpkg-parsechangelog .*") + (string-append "VERSION = " ,version))) + #t)) + (delete 'configure)))) + (native-inputs + `(("perl" ,perl))) + (home-page "https://salsa.debian.org/debian/datefudge") + (synopsis "Pretend the system date is different") + (description + "Utility that fakes the system time by pre-loading a small library that +modifies the @code{time}, @code{gettimeofday} and @code{clock_gettime} system +calls.") + (license gpl2))) From 69fb26d4f51e9d22111cb1360e2941192afee5b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 23:30:34 +0100 Subject: [PATCH 159/250] gnu: mariadb: Add comments about failing tests. * gnu/packages/databases.scm (mariadb): Add comments. --- gnu/packages/databases.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 96e84de685..33fb530509 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -582,7 +582,12 @@ Language.") "main.explain_non_select" "main.stat_tables_innodb" "roles.acl_statistics" + + ;; This file contains a time bomb which makes it fail after + ;; 2019-01-01. See for details. "main.mysqldump" + + ;; XXX: Fails sporadically. "innodb_fts.crash_recovery" ;; FIXME: This test fails on i686: From 746c074bbe811e440622ab7f44ca886eafd41da7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 6 Feb 2019 23:14:22 -0800 Subject: [PATCH 160/250] gnu: python-wheel: Update to 0.32.2. * gnu/packages/python-xyz.scm (python-wheel): Update to 0.32.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8239792f6..946f7e967c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1695,14 +1695,14 @@ with sensible defaults out of the box.") (define-public python-wheel (package (name "python-wheel") - (version "0.30.0a0") + (version "0.32.3") (source (origin (method url-fetch) (uri (pypi-uri "wheel" version)) (sha256 (base32 - "1nm6mn8isny0hr86rhbfrpfj867c0phf001xgsd69xfp9ady1wwq")))) + "1dhxl1bf18bx9szmqcnxbg6204hp3im8089q3hkwh5jfa6zh75q2")))) (build-system python-build-system) (native-inputs `(("python-jsonschema" ,python-jsonschema) From 86ae491f37fa3f9b587b10b55475777fa50de6e5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 6 Feb 2019 23:16:11 -0800 Subject: [PATCH 161/250] gnu: python-configargparse: Update to 0.14.0. * gnu/packages/python-xyz.scm (python-configargparse): Update to 0.14.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 946f7e967c..e8def4d9f3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7107,13 +7107,13 @@ config files.") (define-public python-configargparse (package (name "python-configargparse") - (version "0.12.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (pypi-uri "ConfigArgParse" version)) (sha256 (base32 - "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98")))) + "149fy4zya0rsnlkvxbbq43cyr8lscb5k4pj1m6n7f1grwcmzwbif")))) (build-system python-build-system) (native-inputs `(("python-pyyaml" ,python-pyyaml))) From a9ba0a3154f3f20097000407a96a390ad3dee100 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 6 Feb 2019 15:25:36 -0600 Subject: [PATCH 162/250] gnu: python2-rope: Update to 0.11.0 From 1e6322de0c3227827176fb460a11da21a6bba08d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 6 Feb 2019 15:23:56 -0600 Subject: [PATCH] gnu: python2-rope: Update to 0.11.0 * gnu/packages/python-xyz.scm (python2-rope): Update to 0.11.0 --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8def4d9f3..d2b348942d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -8750,14 +8751,14 @@ Python. It generates C++ code and a Makefile.")) (define-public python2-rope (package (name "python2-rope") - (version "0.10.3") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "rope" version)) (sha256 (base32 - "18k5znhpwvrfck3yp0jmhd5j8r0f0s8bk1zh5yhs2cfgmfhbwigb")))) + "1cppm0pa9aqgsbkq130lskrzmrvjs5vpiavjjbhpz2fdw52w8251")))) (arguments ;; Rope is currently python-2 only. ;; https://github.com/python-rope/rope/issues/57 From 89ea6252b6849131ba35d141006e1bbf3a49594f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 7 Feb 2019 14:44:44 +0100 Subject: [PATCH 163/250] gnu: flatpak: Update to 1.2.0. * gnu/packages/package-management.scm (flatpak): Update to 1.2.0. --- gnu/packages/package-management.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c52f5e3699..c3b195a64f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Julien Lepiller -;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Efraim Flashner @@ -961,7 +961,7 @@ the bootloader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) @@ -969,7 +969,7 @@ the bootloader configuration.") version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "0bkjwh49kajyd78vdh0g9arb352a7rccaifas9zxa78phhja2v2p")))) + "1bdk6qmsvy4d80245x1si9qvrga2f2yalj9qfmf1lqj5ljxxxifv")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;; Tests fail due to trying to create files where it can't. @@ -988,6 +988,7 @@ the bootloader configuration.") ("pkg-config" ,pkg-config))) (inputs `(("appstream-glib" ,appstream-glib) ("bubblewrap" ,bubblewrap) + ("dconf" ,dconf) ("gdk-pixbuf" ,gdk-pixbuf) ("gpgme" ,gpgme) ("json-glib" ,json-glib) From 487cbb0164c715e722b622fa800fa0b217fa132c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Feb 2019 14:54:43 +0100 Subject: [PATCH 164/250] profiles: Raise an error for unmatched patterns. Previously, "guix package -r something-not-installed" would silently complete. Now an error is raised. * guix/profiles.scm (&unmatched-pattern-error): New condition type. (manifest-matching-entries): Rewrite to raise an error when one of PATTERNS is not matched. * guix/ui.scm (call-with-error-handling): Handle 'unmatched-pattern-error?'. * tests/guix-package.sh: Add test. * tests/profiles.scm ("manifest-matching-entries"): Don't try to remove unmatched pattern. ("manifest-matching-entries, no match"): New test. ("manifest-transaction-effects"): Remove 'remove' field. --- guix/profiles.scm | 34 ++++++++++++++++++++++++---------- guix/ui.scm | 8 ++++++++ tests/guix-package.sh | 7 ++++++- tests/profiles.scm | 17 +++++++++++------ 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index efe5ecb9dc..6564526aee 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -63,6 +63,10 @@ &missing-generation-error missing-generation-error? missing-generation-error-generation + &unmatched-pattern-error + unmatched-pattern-error? + unmatched-pattern-error-pattern + unmatched-pattern-error-manifest manifest make-manifest manifest? @@ -156,6 +160,11 @@ (entry profile-collision-error-entry) ; (conflict profile-collision-error-conflict)) ; +(define-condition-type &unmatched-pattern-error &error + unmatched-pattern-error? + (pattern unmatched-pattern-error-pattern) ; + (manifest unmatched-pattern-error-manifest)) ; + (define-condition-type &missing-generation-error &profile-error missing-generation-error? (generation missing-generation-error-generation)) @@ -559,16 +568,21 @@ no match.." (->bool (manifest-lookup manifest pattern))) (define (manifest-matching-entries manifest patterns) - "Return all the entries of MANIFEST that match one of the PATTERNS." - (define predicates - (map entry-predicate patterns)) - - (define (matches? entry) - (any (lambda (pred) - (pred entry)) - predicates)) - - (filter matches? (manifest-entries manifest))) + "Return all the entries of MANIFEST that match one of the PATTERNS. Raise +an '&unmatched-pattern-error' if none of the entries of MANIFEST matches one +of PATTERNS." + (fold-right (lambda (pattern matches) + (match (filter (entry-predicate pattern) + (manifest-entries manifest)) + (() + (raise (condition + (&unmatched-pattern-error + (pattern pattern) + (manifest manifest))))) + (lst + (append lst matches)))) + '() + patterns)) (define (manifest-search-paths manifest) "Return the list of search path specifications that apply to MANIFEST, diff --git a/guix/ui.scm b/guix/ui.scm index 9eab4ba3f7..f0465519b6 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -643,6 +643,14 @@ or remove one of them from the profile.") (leave (G_ "generation ~a of profile '~a' does not exist~%") (missing-generation-error-generation c) (profile-error-profile c))) + ((unmatched-pattern-error? c) + (let ((pattern (unmatched-pattern-error-pattern c))) + (leave (G_ "package '~a~@[@~a~]~@[:~a~]' not found in profile~%") + (manifest-pattern-name pattern) + (manifest-pattern-version pattern) + (match (manifest-pattern-output pattern) + ("out" #f) + (output output))))) ((profile-collision-error? c) (let ((entry (profile-collision-error-entry c)) (conflict (profile-collision-error-conflict c))) diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 7eeb4304d1..0d60481895 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -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 © 2013 Nikita Karetnikov # # This file is part of GNU Guix. @@ -97,6 +97,11 @@ then false; else true; fi if guix package --bootstrap -i "guile-bootstrap:does-not-exist" -p "$profile"; then false; else true; fi +# Make sure we get an error when trying to remove something that's not +# installed. +if guix package --bootstrap -r something-not-installed -p "$profile"; +then false; else true; fi + # Check whether `--list-available' returns something sensible. guix package -p "$profile" -A 'gui.*e' | grep guile diff --git a/tests/profiles.scm b/tests/profiles.scm index 9a05030aff..eef93e24cf 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -93,10 +93,7 @@ (test-assert "manifest-matching-entries" (let* ((e (list guile-2.0.9 guile-2.0.9:debug)) (m (manifest e))) - (and (null? (manifest-matching-entries m - (list (manifest-pattern - (name "python"))))) - (equal? e + (and (equal? e (manifest-matching-entries m (list (manifest-pattern (name "guile") @@ -107,6 +104,15 @@ (name "guile") (version "2.0.9")))))))) +(test-assert "manifest-matching-entries, no match" + (let ((m (manifest (list guile-2.0.9))) + (p (manifest-pattern (name "python")))) + (guard (c ((unmatched-pattern-error? c) + (and (eq? p (unmatched-pattern-error-pattern c)) + (eq? m (unmatched-pattern-error-manifest c))))) + (manifest-matching-entries m (list p)) + #f))) + (test-assert "manifest-remove" (let* ((m0 (manifest (list guile-2.0.9 guile-2.0.9:debug))) (m1 (manifest-remove m0 @@ -165,8 +171,7 @@ (test-assert "manifest-transaction-effects" (let* ((m0 (manifest (list guile-1.8.8))) (t (manifest-transaction - (install (list guile-2.0.9 glibc)) - (remove (list (manifest-pattern (name "coreutils"))))))) + (install (list guile-2.0.9 glibc))))) (let-values (((remove install upgrade downgrade) (manifest-transaction-effects m0 t))) (and (null? remove) (null? downgrade) From b07712bfb13039b3ead57e9f3ca91d4e3ebadd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Feb 2019 15:24:01 +0100 Subject: [PATCH 165/250] gnu: openmpi: Add dependency on SLURM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows users to run Open MPI programs with 'srun'. * gnu/packages/mpi.scm (openmpi)[inputs]: Add SLURM. [arguments]: Add "--with-pmi" to #:configure-flags. --- gnu/packages/mpi.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 6e56142bd1..1f69a04bc9 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018 Eric Bavier -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love @@ -40,6 +40,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages perl) #:use-module (gnu packages ncurses) + #:use-module (gnu packages parallel) #:use-module (gnu packages pkg-config) #:use-module (gnu packages valgrind) #:use-module (srfi srfi-1) @@ -180,7 +181,8 @@ bind processes, and much more.") `(("psm2" ,psm2)) '()) ("rdma-core" ,rdma-core) - ("valgrind" ,valgrind))) + ("valgrind" ,valgrind) + ("slurm" ,slurm))) ;for PMI support (launching via "srun") (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) @@ -197,7 +199,12 @@ bind processes, and much more.") ,(string-append "--with-valgrind=" (assoc-ref %build-inputs "valgrind")) ,(string-append "--with-hwloc=" - (assoc-ref %build-inputs "hwloc"))) + (assoc-ref %build-inputs "hwloc")) + + ;; Enable support for SLURM's Process Manager + ;; Interface (PMI). + ,(string-append "--with-pmi=" + (assoc-ref %build-inputs "slurm"))) #:phases (modify-phases %standard-phases (add-before 'build 'remove-absolute (lambda _ From 9c6124f8297cfffb7c754f109882f8962ba56ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Feb 2019 15:28:01 +0100 Subject: [PATCH 166/250] doc: Mention flag to get an ISO image. * doc/guix.texi (Building the Installation Image): Add '--file-system-type=iso9660'. --- doc/guix.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 868f1959e8..53c133804d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2375,7 +2375,8 @@ The installation image described above was built using the @command{guix system} command, specifically: @example -guix system disk-image gnu/system/install.scm +guix system disk-image --file-system-type=iso9660 \ + gnu/system/install.scm @end example Have a look at @file{gnu/system/install.scm} in the source tree, From 024d5275c5cd72c0121b4f70d64c63f859a68f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Feb 2019 15:42:18 +0100 Subject: [PATCH 167/250] status: Do not systematically erase the previous line. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After a successful download, we'd erase the download-progress line, and the end result would be two empty lines following the "downloading …" line. Reported by Ricardo Wurmus at . * guix/status.scm (print-build-event)[erase-current-line*]: Set to a no-op when PRINT-LOG? is true. Move calls to 'erase-current-line*' to the 'build-succeeded' and 'build-failed' events. --- guix/status.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/status.scm b/guix/status.scm index 984f329964..cd5027ef17 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -498,14 +498,12 @@ addition to build events." (spin! #f port)))))) (define erase-current-line* - (if (isatty?* port) - (lambda (port) + (if (and (not print-log?) (isatty?* port)) + (lambda () (erase-current-line port) (force-output port)) (const #t))) - (unless print-log? - (erase-current-line* port)) ;clear the spinner or progress bar (match event (('build-started drv . _) (let ((properties (derivation-properties @@ -530,6 +528,7 @@ addition to build events." (format port (info (G_ "building ~a...")) drv)))) (newline port)) (('build-succeeded drv . _) + (erase-current-line*) ;erase spinner or progress bar (when (or print-log? (not (extended-build-trace-supported?))) (format port (success (G_ "successfully built ~a")) drv) (newline port)) @@ -542,6 +541,7 @@ addition to build events." (length ongoing)) (map build-derivation ongoing))))) (('build-failed drv . _) + (erase-current-line*) ;erase spinner or progress bar (format port (failure (G_ "build of ~a failed")) drv) (newline port) (match (derivation-log-file drv) From 285bf324f0b3ec8a25cc8fe037e8e3c39a620991 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 Feb 2019 19:21:24 +0100 Subject: [PATCH 168/250] gnu: Add emacs-redshank. * gnu/packages/emacs-xyz.scm (emacs-redshank): New variable. --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 173b1430b3..e8ee0af558 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13086,3 +13086,29 @@ GUI.") (description "@code{emacs-google-c-style} provides an Emacs settings file for Google C and C++ style.") (license license:gpl1+)))) + +(define-public emacs-redshank + (let ((commit "f98e68f532e622bcd464292ca4a9cf5fbea14ebb") + (revision "1")) + (package + (name "emacs-redshank") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "http://www.foldr.org/~michaelw/projects/redshank.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-paredit" ,emacs-paredit))) + (home-page "http://www.foldr.org/~michaelw/emacs/redshank/") + (synopsis "Common Lisp Editing Extensions (for Emacs)") + (description "Redshank is a collection of code-wrangling Emacs macros +mostly geared towards Common Lisp, but some are useful for other Lisp +dialects, too. Redshank's code transformations aim to be expression-based (as +opposed to character-based).") + (license license:gpl1+)))) From 2b06fcdcd7b2a4614acd6eb3eea379b7305690e2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Feb 2019 13:52:01 -0500 Subject: [PATCH 169/250] gnu: linux-libre@4.4: Update to 4.4.173. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.173. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0edbd40717..08a04478d8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -457,8 +457,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.172" - "000bz3jfg0li3rwlf2c80df6682lhi59hj1kwm4hw7whgg69xi7b" + (make-linux-libre "4.4.173" + "1iy8qzjvcssf7ppb590lqzhb01ap2fjqv9iam691q1d4r8vmgcsh" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) From 4888c21543b851bf3823f665faca60027256a830 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Feb 2019 13:53:27 -0500 Subject: [PATCH 170/250] gnu: linux-libre@4.9: Update to 4.9.155. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.155. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08a04478d8..bfc00aaaf8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.154" - "18qy7d8ndjwx65s2z18z30px94y8ci3ymvbv0mgdcbp16brak9zf" + (make-linux-libre "4.9.155" + "0fyj8dqhpqi3jh6i58avyvmg4mp9bplnpiffpp3fdka4v85lx152" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) From 848e28aab51e3dab1f424e2b7622329a119695a1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Feb 2019 13:54:19 -0500 Subject: [PATCH 171/250] gnu: linux-libre@4.14: Update to 4.14.98. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.98. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfc00aaaf8..a42349fb6c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -441,8 +441,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.97") -(define %linux-libre-4.14-hash "056cnap79a0m4n9cldqfr3sbx61wvxwnpz6x9fh6lq0byqcil26k") +(define %linux-libre-4.14-version "4.14.98") +(define %linux-libre-4.14-hash "165wlqqpb16zhrwihsb75y153xyz8q5dbi14xim7jsnvwlbh5i79") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version From 43194fbe3c9021372d13fcb1f642e23f67929f63 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Feb 2019 13:55:42 -0500 Subject: [PATCH 172/250] gnu: linux-libre@4.19: Update to 4.19.20. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.20. (%linux-libre-4.19-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a42349fb6c..2fbeb75c10 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -427,8 +427,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.20-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.19") -(define %linux-libre-4.19-hash "1sgcca9zpw5hza6vkza7613pd8bmvvd2kmd2f0xkl5fyrna7dipq") +(define %linux-libre-4.19-version "4.19.20") +(define %linux-libre-4.19-hash "1rs4jvp88n23n9a6f037sn498fzl1fn96zsjjmjngb8nmjr1y9vp") (define %linux-libre-4.19-patches (list %boot-logo-patch From d5240bc09d3f060de219b5f1a1cc0410ba4c9f36 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Feb 2019 13:56:44 -0500 Subject: [PATCH 173/250] gnu: linux-libre: Update to 4.20.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.20.7. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2fbeb75c10..b1dfb7f701 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.20.6") -(define %linux-libre-hash "1wn5qf40xapsl3j19wrvgfz7ar5i0sfrri72wi78ydy4c7ik3gs5") +(define %linux-libre-version "4.20.7") +(define %linux-libre-hash "05jbpg4ivcbr8xi5ki03f4n57hnhc52nfjk1ik8czag7f4ph9v0b") (define %linux-libre-4.20-patches (list %boot-logo-patch From 7d60df330aa165982abd31c8483651788fdf49b9 Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Sun, 3 Feb 2019 16:14:12 +0100 Subject: [PATCH 174/250] gnu: Add coq-autosubst * gnu/packages/coq.scm (coq-autosubst): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 51dd5dedcf..e42f8af1ab 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2019 Dan Frumin ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -444,3 +446,49 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.") simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant.") (license license:cecill-c))) + +(define-public coq-autosubst + ;; Latest commit on that branch, where work on supporting coq 8.6 and + ;; more recent versions of coq happen. + (let ((branch "coq86-devel") + (commit "d0d73557979796b3d4be7aac72135581c33f26f7")) + (package + (name "coq-autosubst") + (version (git-version "1" branch commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://github.com/uds-psl/autosubst.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1852xb5cwkjw3dlc0lp2sakwa40bjzw37qmwz4bn3vqazg1hnh6r")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) + (invoke "make" + (string-append "COQLIB=" (assoc-ref outputs "out") + "/lib/coq/") + "install")))))) + (native-inputs + `(("coq" ,coq))) + (home-page "https://www.ps.uni-saarland.de/autosubst/") + (synopsis "Coq library for parallel de Bruijn substitutions") + (description "Formalizing syntactic theories with variable binders is +not easy. Autosubst is a library for the Coq proof assistant to +automate this process. Given an inductive definition of syntactic objects in +de Bruijn representation augmented with binding annotations, Autosubst +synthesizes the parallel substitution operation and automatically proves the +basic lemmas about substitutions. This library contains an automation +tactic that solves equations involving terms and substitutions. This makes the +usage of substitution lemmas unnecessary. The tactic is based on our current +work on a decision procedure for the equational theory of an extension of the +sigma-calculus by Abadi et al. The library is completely written in Coq and +uses Ltac to synthesize the substitution operation.") + (license license:bsd-3)))) From 3847d1f22f3222a008971a65ba6d1ffaef1ec676 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Feb 2019 14:13:02 +0100 Subject: [PATCH 175/250] gnu: Add dune-common. * gnu/packages/maths.scm (dune-common): New variable. --- gnu/packages/maths.scm | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4806a5e19e..ea91602d26 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4244,3 +4244,72 @@ linear algebra primitives specifically targeting graph analytics.") license:gpl2+ ;include/psort/(funnel|sort)*.h license:x11 ;usort and psort license:bsd-3)))) ;CombBLAS and MersenneTwister.h + +(define-public dune-common + (package + (name "dune-common") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-common-" version ".tar.gz")) + (sha256 + (base32 + "019wcr1qf7jwyxx1y5y290wdlglylskvbb2m01ljkzcza2xnlmhw")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags))) + ;; These tests fail because they require a fully functional MPI + ;; environment. + (add-after 'unpack 'disable-failing-tests + (lambda _ + (setenv "ARGS" + (string-append "--exclude-regex '(" + (string-join + (list + "remoteindicestest" + "remoteindicestest-mpi-2" + "syncertest" + "syncertest-mpi-2" + "variablesizecommunicatortest" + "variablesizecommunicatortest-mpi-2" + "arithmetictestsuitetest" + "assertandreturntest" + "assertandreturntest_ndebug" + "concept" + "debugaligntest" + "mpicollectivecommunication" + "mpicollectivecommunication-mpi-2" + "mpiguardtest" + "mpiguardtest-mpi-2" + "mpihelpertest" + "mpihelpertest-mpi-2" + "mpihelpertest2" + "mpihelpertest2-mpi-2") + "|") + ")'")) + #t))))) + (inputs + `(("gmp" ,gmp) + ("metis" ,metis) + ("openmpi" ,openmpi) + ("openblas" ,openblas) + ("python" ,python) + ("superlu" ,superlu))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. It supports the easy implementation of methods like +@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite +Differences} (FD).") + ;; GPL version 2 with "runtime exception" to make it behave like LGPLv2. + (license license:gpl2))) From 242dbd8e5d4467b6f885bc45ad8ba943d6d51792 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Feb 2019 14:19:04 +0100 Subject: [PATCH 176/250] gnu: Add dune-geometry. * gnu/packages/maths.scm (dune-geometry): New variable. --- gnu/packages/maths.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ea91602d26..eb0abaf3d7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4313,3 +4313,44 @@ grid-based methods. It supports the easy implementation of methods like Differences} (FD).") ;; GPL version 2 with "runtime exception" to make it behave like LGPLv2. (license license:gpl2))) + +(define-public dune-geometry + (package + (name "dune-geometry") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-geometry-" version ".tar.gz")) + (sha256 + (base32 + "0hlaaxjyv9j05blasvb67sy02hd0w4g9znf68gdh3l731dd1aqbn")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("openmpi" ,openmpi) + ;; Optional + ("openblas" ,openblas) + ("gmp" ,gmp) + ("python" ,python))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. It supports the easy implementation of methods like +@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite +Differences} (FD). + +This package contains the basic DUNE geometry classes.") + ;; GPL version 2 with "runtime exception" + (license license:gpl2))) From 6f8ade6ee6920903c0c179bd6983d63afcba9236 Mon Sep 17 00:00:00 2001 From: Tim Stahel Date: Thu, 7 Feb 2019 22:33:08 +0100 Subject: [PATCH 177/250] gnu: Add gpx. * gnu/packages/engineering.scm (gpx): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/engineering.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ea5dd885d1..ad7ae18781 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Jonathan Brielmaier ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2019 Tim Stahel ;;; ;;; This file is part of GNU Guix. ;;; @@ -1911,3 +1912,24 @@ editors.") license:cc0 ; libs/optional, libs/sexpresso license:bsd-2 ; libs/optional/tests/catch.hpp license:lgpl2.1+)))) ; libs/quazip + +(define-public gpx + (package + (name "gpx") + (version "2.5.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/markwal/GPX.git") + (commit version))) + (sha256 + (base32 + "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5")))) + (build-system gnu-build-system) + (home-page "https://github.com/markwal/GPX") + (synopsis "Converting gcode to x3g files for 3D printing") + (description + "GPX is a post processing utility for converting gcode output from 3D +slicing software to x3g files for standalone 3D printing on common 3D +printers.") + (license license:gpl2+))) From 674d180cfac6acc168412bf263aedc4c6b0e6eba Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 Feb 2019 23:10:05 +0100 Subject: [PATCH 178/250] gnu: emacs-fish-completion: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-fish-completion): Update to 1.0. --- gnu/packages/emacs-xyz.scm | 67 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e8ee0af558..5d8aa0e863 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11307,39 +11307,38 @@ Org-mode. It features: (license license:gpl3+)))) (define-public emacs-fish-completion - (let ((commit "bac15fda1392a891070574dfe5d2d50b10831e8b")) - (package - (name "emacs-fish-completion") - (version (git-version "20180616" "1" commit)) - (source - (origin - (method url-fetch) - (uri (string-append - "https://gitlab.com/Ambrevar/emacs-fish-completion/repository/" - "archive.tar.gz?ref=" - commit)) - (sha256 - (base32 - "093qzdrbkl7dhjk16zq8i13kh1phyigkblcfrbgbrxjqd2ndrfdi")))) - (build-system emacs-build-system) - (inputs `(("fish" ,fish))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((fish (assoc-ref inputs "fish"))) - ;; Specify the absolute file names of the various - ;; programs so that everything works out-of-the-box. - (emacs-substitute-variables - "fish-completion.el" - ("fish-completion-command" - (string-append fish "/bin/fish"))))))))) - (home-page - "https://gitlab.com/Ambrevar/emacs-fish-completion") - (synopsis "Fish completion for Emacs pcomplete") - (description - "This package provides completion for the Fish shell to pcomplete (used + (package + (name "emacs-fish-completion") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/Ambrevar/emacs-fish-completion/repository/" + "archive.tar.gz?ref=" + version)) + (sha256 + (base32 + "1hpma1c5j50ja03ibr7h1xmyv7k8j3rbvqivad47kwqhlsgw0jk0")))) + (build-system emacs-build-system) + (inputs `(("fish" ,fish))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((fish (assoc-ref inputs "fish"))) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables + "fish-completion.el" + ("fish-completion-command" + (string-append fish "/bin/fish"))))))))) + (home-page + "https://gitlab.com/Ambrevar/emacs-fish-completion") + (synopsis "Fish completion for Emacs pcomplete") + (description + "This package provides completion for the Fish shell to pcomplete (used by shell and Eshell). You can set it up globally with: @example @@ -11354,7 +11353,7 @@ shell/Eshell mode hook. The package @code{emacs-bash-completion} is an optional dependency: if available, @code{fish-completion-complete} can be configured to fall back on bash to further try completing. See @code{fish-completion-fallback-on-bash-p}.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-gif-screencast (let ((commit "12b25442b97b84abae74ecb5190a9d14ff7cfe5a")) From 2bdf26f1c8964b3937fa695f7867b09c750ec9b8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 6 Feb 2019 14:07:23 -0600 Subject: [PATCH 179/250] gnu: superlu-dist: Remove use of deprecated MPI1 symbols. * gnu/packages/patches/superlu-dist-fix-mpi-deprecations.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (superlu-dist)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 3 +- .../superlu-dist-fix-mpi-deprecations.patch | 57 +++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/superlu-dist-fix-mpi-deprecations.patch diff --git a/gnu/local.mk b/gnu/local.mk index 939a91b600..785e49a774 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1238,6 +1238,7 @@ dist_patch_DATA = \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/streamlink-update-test.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 \ %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eb0abaf3d7..10b0978ba0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2331,7 +2331,8 @@ void mc64ad_dist (int *a, int *b, int *c, int *d, int *e, double *f, int *g, "RowPerm = NOROWPERM;")) #t)) (patches (search-patches "superlu-dist-scotchmetis.patch" - "superlu-dist-awpm-grid.patch")))) + "superlu-dist-awpm-grid.patch" + "superlu-dist-fix-mpi-deprecations.patch")))) (build-system cmake-build-system) (native-inputs `(("tcsh" ,tcsh))) diff --git a/gnu/packages/patches/superlu-dist-fix-mpi-deprecations.patch b/gnu/packages/patches/superlu-dist-fix-mpi-deprecations.patch new file mode 100644 index 0000000000..25f0aaf2f3 --- /dev/null +++ b/gnu/packages/patches/superlu-dist-fix-mpi-deprecations.patch @@ -0,0 +1,57 @@ +From c9cbcf8730221e366c7495073f8f8d819ee8ce89 Mon Sep 17 00:00:00 2001 +From: Eric Bavier +Date: Wed, 6 Feb 2019 10:06:59 -0600 +Subject: [PATCH] Replace deprecated MPI_Attr_get. + +Fixes build with OpenMPI version 4.0. + +* SRC/pdgstrf.c, SRC/pdgstrf.c, SRC/superlu_grid.c: 'MPI_Attr_get' -> + 'MPI_Comm_get_attr'. +--- + SRC/pdgstrf.c | 2 +- + SRC/pzgstrf.c | 2 +- + SRC/superlu_grid.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/SRC/pdgstrf.c b/SRC/pdgstrf.c +index 736ffa2..f92a1ba 100644 +--- a/SRC/pdgstrf.c ++++ b/SRC/pdgstrf.c +@@ -426,7 +426,7 @@ pdgstrf(superlu_dist_options_t * options, int m, int n, double anorm, + s_eps = smach_dist("Epsilon"); + thresh = s_eps * anorm; + +- MPI_Attr_get (MPI_COMM_WORLD, MPI_TAG_UB, &attr_val, &flag); ++ MPI_Comm_get_attr (MPI_COMM_WORLD, MPI_TAG_UB, &attr_val, &flag); + if (!flag) { + fprintf (stderr, "Could not get TAG_UB\n"); + return (-1); +diff --git a/SRC/pzgstrf.c b/SRC/pzgstrf.c +index 8896548..8800057 100644 +--- a/SRC/pzgstrf.c ++++ b/SRC/pzgstrf.c +@@ -426,7 +426,7 @@ pzgstrf(superlu_dist_options_t * options, int m, int n, double anorm, + s_eps = smach_dist("Epsilon"); + thresh = s_eps * anorm; + +- MPI_Attr_get (MPI_COMM_WORLD, MPI_TAG_UB, &attr_val, &flag); ++ MPI_Comm_get_attr (MPI_COMM_WORLD, MPI_TAG_UB, &attr_val, &flag); + if (!flag) { + fprintf (stderr, "Could not get TAG_UB\n"); + return (-1); +diff --git a/SRC/superlu_grid.c b/SRC/superlu_grid.c +index 1213d27..0c0fb90 100644 +--- a/SRC/superlu_grid.c ++++ b/SRC/superlu_grid.c +@@ -150,7 +150,7 @@ void superlu_gridmap( + { + int tag_ub; + if ( !grid->iam ) { +- MPI_Attr_get(Bcomm, MPI_TAG_UB, &tag_ub, &info); ++ MPI_Comm_get_attr(Bcomm, MPI_TAG_UB, &tag_ub, &info); + printf("MPI_TAG_UB %d\n", tag_ub); + /* returns 4295677672 + In reality it is restricted to no greater than 16384. */ +-- +2.20.1 + From 7fedc3fdfb5fba8098c08d04a7d0cb7131c24a79 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 6 Feb 2019 15:32:22 -0600 Subject: [PATCH 180/250] gnu: hdf5: Remove use of deprecated MPI1 symbols. * gnu/packages/patches/hdf5-1.8-mpi-deprecations.patch, gnu/packages/patches/hdf5-mpi-deprecations.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/maths.scm (hdf5, hdf5-1.10)[source]: Use them. --- gnu/local.mk | 2 + gnu/packages/maths.scm | 6 +- .../patches/hdf5-1.8-mpi-deprecations.patch | 169 ++++++++++++++++++ .../patches/hdf5-mpi-deprecations.patch | 61 +++++++ 4 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/hdf5-1.8-mpi-deprecations.patch create mode 100644 gnu/packages/patches/hdf5-mpi-deprecations.patch diff --git a/gnu/local.mk b/gnu/local.mk index 785e49a774..f1bcef2a68 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,6 +873,8 @@ dist_patch_DATA = \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ %D%/packages/patches/hdf5-config-date.patch \ + %D%/packages/patches/hdf5-mpi-deprecations.patch \ + %D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \ %D%/packages/patches/hdf-eos2-build-shared.patch \ %D%/packages/patches/hdf-eos2-remove-gctp.patch \ %D%/packages/patches/hdf-eos2-fortrantests.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 10b0978ba0..402b53ca0e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -764,7 +764,8 @@ incompatible with HDF5.") "/src/hdf5-" version ".tar.bz2"))) (sha256 (base32 "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r")) - (patches (list (search-patch "hdf5-config-date.patch"))))) + (patches (search-patches "hdf5-config-date.patch" + "hdf5-1.8-mpi-deprecations.patch")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) @@ -877,7 +878,8 @@ extremely large and complex data collections.") "/src/hdf5-" version ".tar.bz2"))) (sha256 (base32 "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj")) - (patches (list (search-patch "hdf5-config-date.patch"))))))) + (patches (search-patches "hdf5-config-date.patch" + "hdf5-mpi-deprecations.patch")))))) (define-public hdf-java (package diff --git a/gnu/packages/patches/hdf5-1.8-mpi-deprecations.patch b/gnu/packages/patches/hdf5-1.8-mpi-deprecations.patch new file mode 100644 index 0000000000..29242dc4e8 --- /dev/null +++ b/gnu/packages/patches/hdf5-1.8-mpi-deprecations.patch @@ -0,0 +1,169 @@ +--- a/src/H5.c ++++ b/src/H5.c +@@ -138,7 +138,7 @@ + if (mpi_initialized && !mpi_finalized) { + int key_val; + +- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, ++ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) +--- hdf5-1.8.19/testpar/t_cache.c ++++ hdf5-1.8.19/testpar/t_cache.c +@@ -1187,20 +1187,20 @@ + struct mssg_t sample; /* used to compute displacements */ + + /* setup the displacements array */ +- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { ++ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { + + nerrors++; + success = FALSE; + if ( verbose ) { +- HDfprintf(stdout, "%d:%s: MPI_Address() call failed.\n", ++ HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", + world_mpi_rank, fcn_name); + } + +@@ -1215,14 +1215,14 @@ + + if ( success ) { + +- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); ++ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); + + if ( result != MPI_SUCCESS ) { + + nerrors++; + success = FALSE; + if ( verbose ) { +- HDfprintf(stdout, "%d:%s: MPI_Type_struct() call failed.\n", ++ HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", + world_mpi_rank, fcn_name); + } + } +--- hdf5-1.8.19/testpar/t_mpi.c ++++ hdf5-1.8.19/testpar/t_mpi.c +@@ -279,7 +279,7 @@ + printf("Skipped GB file range test " + "because MPI_Offset cannot support it\n"); + }else{ +- buf = HDmalloc(MB); ++ buf = (char *)HDmalloc(MB); + VRFY((buf!=NULL), "malloc succeed"); + + /* open a new file. Remove it first in case it exists. */ +@@ -624,7 +624,7 @@ + and this platform. + + 1. Details for the test: +-1) Create two derived datatypes with MPI_Type_hindexed: ++1) Create two derived datatypes with MPI_Type_create_hindexed: + datatype1: + count = 1, blocklens = 1, offsets = 0, + base type = MPI_BYTE(essentially a char) +@@ -633,7 +633,7 @@ + base type = MPI_BYTE + + 2) Using these two derived datatypes, +- Build another derived datatype with MPI_Type_struct: ++ Build another derived datatype with MPI_Type_create_struct: + advtype: derived from datatype1 and datatype2 + advtype: + count = 2, blocklens[0] = 1, blocklens[1]=1, +@@ -676,10 +676,9 @@ + int mpi_err_strlen; + int mpi_err; + int i; +- int nerrors = 0; /* number of errors */ + MPI_Datatype etype,filetype; + MPI_Datatype adv_filetype,bas_filetype[2]; +- MPI_Datatype etypenew, filetypenew; ++ MPI_Datatype filetypenew; + MPI_Offset disp; + MPI_Status Status; + MPI_Aint adv_disp[2]; +@@ -715,7 +714,7 @@ + blocklens[0] = 1; + offsets[0] = 0; + +- if((mpi_err= MPI_Type_hindexed(count,blocklens,offsets,MPI_BYTE,&filetype)) ++ if((mpi_err= MPI_Type_create_hindexed(count,blocklens,offsets,MPI_BYTE,&filetype)) + != MPI_SUCCESS){ + MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen); + printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str); +@@ -731,7 +730,7 @@ + count = 1; + blocklens[0]=1; + offsets[0] = 1; +- if((mpi_err= MPI_Type_hindexed(count,blocklens,offsets,MPI_BYTE,&filetypenew)) ++ if((mpi_err= MPI_Type_create_hindexed(count,blocklens,offsets,MPI_BYTE,&filetypenew)) + != MPI_SUCCESS){ + MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen); + printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str); +@@ -752,10 +751,10 @@ + bas_filetype[0] = filetype; + bas_filetype[1] = filetypenew; + +- if((mpi_err= MPI_Type_struct(outcount,adv_blocklens,adv_disp,bas_filetype,&adv_filetype)) ++ if((mpi_err= MPI_Type_create_struct(outcount,adv_blocklens,adv_disp,bas_filetype,&adv_filetype)) + != MPI_SUCCESS){ + MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen); +- printf("MPI_Type_struct failed (%s)\n", mpi_err_str); ++ printf("MPI_Type_create_struct failed (%s)\n", mpi_err_str); + return 1; + } + if((mpi_err=MPI_Type_commit(&adv_filetype))!=MPI_SUCCESS){ +@@ -842,7 +841,7 @@ + processes are needed. + + 1. Details for the test: +-1) Create one derived datatype with MPI_Type_hindexed: ++1) Create one derived datatype with MPI_Type_create_hindexed: + + 2) Choosing at least two processes to contribute none for IO with + the buf size inside MPI_Write_at_all to 0. +@@ -898,7 +897,7 @@ + offsets[1] = (mpi_size+mpi_rank)*count; + + if(count !=0) { +- if((mpi_err = MPI_Type_hindexed(2, ++ if((mpi_err = MPI_Type_create_hindexed(2, + blocklens, + offsets, + etype, +@@ -914,7 +913,7 @@ + return 1; + } /* end if */ + +- if((mpi_err = MPI_Type_hindexed(2, ++ if((mpi_err = MPI_Type_create_hindexed(2, + blocklens, + offsets, + etype, +@@ -1098,7 +1097,7 @@ + * calls. By then, MPI calls may not work. + */ + if (H5dont_atexit() < 0){ +- printf("Failed to turn off atexit processing. Continue.\n", mpi_rank); ++ printf("Failed to turn off atexit processing. Continue.\n"); + }; + H5open(); + if (parse_options(argc, argv) != 0){ diff --git a/gnu/packages/patches/hdf5-mpi-deprecations.patch b/gnu/packages/patches/hdf5-mpi-deprecations.patch new file mode 100644 index 0000000000..eb5d1cb681 --- /dev/null +++ b/gnu/packages/patches/hdf5-mpi-deprecations.patch @@ -0,0 +1,61 @@ +--- a/src/H5.c ++++ b/src/H5.c +@@ -138,7 +138,7 @@ + if (mpi_initialized && !mpi_finalized) { + int key_val; + +- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, ++ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) +--- hdf5-1.10.4/testpar/t_cache.c ++++ hdf5-1.10.4/testpar/t_cache.c +@@ -1217,20 +1217,20 @@ + struct mssg_t sample; /* used to compute displacements */ + + /* setup the displacements array */ +- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { ++ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { + + nerrors++; + success = FALSE; + if ( verbose ) { +- HDfprintf(stdout, "%d:%s: MPI_Address() call failed.\n", ++ HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", + world_mpi_rank, FUNC); + } + +@@ -1245,14 +1245,14 @@ + + if ( success ) { + +- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); ++ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); + + if ( result != MPI_SUCCESS ) { + + nerrors++; + success = FALSE; + if ( verbose ) { +- HDfprintf(stdout, "%d:%s: MPI_Type_struct() call failed.\n", ++ HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", + world_mpi_rank, FUNC); + } + } From 7b84610e2113d634c962020e4715a34518060918 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 6 Feb 2019 16:12:38 -0600 Subject: [PATCH 181/250] gnu: hdf5: Upgrade to 1.8.21. * gnu/packages/maths.scm (hdf5): Upgrade to 1.8.21. [source]: Make version manipulations more readable using match. --- gnu/packages/maths.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 402b53ca0e..074e878de4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -749,7 +749,7 @@ incompatible with HDF5.") (define-public hdf5 (package (name "hdf5") - (version "1.8.19") + (version "1.8.21") (source (origin (method url-fetch) @@ -759,11 +759,12 @@ incompatible with HDF5.") version ".tar.bz2") (string-append "https://support.hdfgroup.org/ftp/HDF5/" "current" - (apply string-append - (take (string-split version #\.) 2)) + (match (string-split version #\.) + ((major minor _ ...) + (string-append major minor))) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r")) + (base32 "03glk4w4wyb1jyb443g53y3y1ncnf6mj2cqwm6avfr2awkgb3cg5")) (patches (search-patches "hdf5-config-date.patch" "hdf5-1.8-mpi-deprecations.patch")))) (build-system gnu-build-system) From 92becc3f15ce196a94274f80ee0b6594774856fa Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 29 Jan 2019 23:07:33 -0600 Subject: [PATCH 182/250] build: clean-go: Do not warn about *.go files in "test-tmp". * Makefile.am (clean-go): Ignore "test-tmp" directory. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0590c51519..fec9800ce7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -318,7 +318,7 @@ nobase_nodist_guileobject_DATA = $(GOBJECTS) # Handy way to remove the .go files without removing all the rest. clean-go: -$(RM) -f $(GOBJECTS) - @find . -name '*.go' -print | \ + @find . -path ./test-tmp -prune -o -name '*.go' -print | \ if test -t 1; then \ xargs -r echo -e "\033[31mwarning:\033[0m stray .go files:"; \ else \ From 60cbc6a8df348b7742fc47912a0827a697804d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 8 Feb 2019 09:12:07 +0100 Subject: [PATCH 183/250] git: Support recursive updates of submodules. * guix/git.scm: Autoload (git submodule). (url-cache-directory): Add #:recursive? and honor it. (call-with-repository): New procedure. (with-repository): New macro. (update-submodules): New procedure. (update-cached-checkout): Add #:recursive? and #:log-port and honor them. (latest-repository-commit): Add #:recursive? and honor it. [dot-git?]: Recognize ".git" regular files when RECURSIVE? is true. --- guix/git.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 7 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 0666f0c0a9..e2daa78f6b 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +43,11 @@ git-checkout-url git-checkout-branch)) +;; XXX: Use this hack instead of #:autoload to avoid compilation errors. +;; See . +(module-autoload! (current-module) + '(git submodule) '(repository-submodules)) + (define %repository-cache-directory (make-parameter (string-append (cache-directory #:ensure? #f) "/checkouts"))) @@ -57,11 +62,15 @@ (define* (url-cache-directory url #:optional (cache-directory - (%repository-cache-directory))) + (%repository-cache-directory)) + #:key recursive?) "Return the directory associated to URL in %repository-cache-directory." (string-append cache-directory "/" - (bytevector->base32-string (sha256 (string->utf8 url))))) + (bytevector->base32-string + (sha256 (string->utf8 (if recursive? + (string-append "R:" url) + url)))))) (define (clone* url directory) "Clone git repository at URL into DIRECTORY. Upon failure, @@ -119,18 +128,62 @@ OID (roughly the commit hash) corresponding to REF." (reset repository obj RESET_HARD) (object-id obj)) +(define (call-with-repository directory proc) + (let ((repository #f)) + (dynamic-wind + (lambda () + (set! repository (repository-open directory))) + (lambda () + (proc repository)) + (lambda () + (repository-close! repository))))) + +(define-syntax-rule (with-repository directory repository exp ...) + "Open the repository at DIRECTORY and bind REPOSITORY to it within the +dynamic extent of EXP." + (call-with-repository directory + (lambda (repository) exp ...))) + +(define* (update-submodules repository + #:key (log-port (current-error-port))) + "Update the submodules of REPOSITORY, a Git repository object." + ;; Guile-Git < 0.2.0 did not have (git submodule). + (if (false-if-exception (resolve-interface '(git submodule))) + (for-each (lambda (name) + (let ((submodule (submodule-lookup repository name))) + (format log-port (G_ "updating submodule '~a'...~%") + name) + (submodule-update submodule) + + ;; Recurse in SUBMODULE. + (let ((directory (string-append + (repository-working-directory repository) + "/" (submodule-path submodule)))) + (with-repository directory repository + (update-submodules repository + #:log-port log-port))))) + (repository-submodules repository)) + (format (current-error-port) + (G_ "Support for submodules is missing; \ +please upgrade Guile-Git.~%")))) + (define* (update-cached-checkout url #:key (ref '(branch . "master")) + recursive? + (log-port (%make-void-port "w")) (cache-directory (url-cache-directory - url (%repository-cache-directory)))) + url (%repository-cache-directory) + #:recursive? recursive?))) "Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return two values: the cache directory name, and the SHA1 commit (a string) corresponding to REF. REF is pair whose key is [branch | commit | tag] and value the associated -data, respectively [ | | ]." +data, respectively [ | | ]. + +When RECURSIVE? is true, check out submodules as well, if any." (define canonical-ref ;; We used to require callers to specify "origin/" for each branch, which ;; made little sense since the cache should be transparent to them. So @@ -150,6 +203,8 @@ data, respectively [ | | ]." ;; Only fetch remote if it has not been cloned just before. (when cache-exists? (remote-fetch (remote-lookup repository "origin"))) + (when recursive? + (update-submodules repository #:log-port log-port)) (let ((oid (switch-to-ref repository canonical-ref))) ;; Reclaim file descriptors and memory mappings associated with @@ -162,6 +217,7 @@ data, respectively [ | | ]." (define* (latest-repository-commit store url #:key + recursive? (log-port (%make-void-port "w")) (cache-directory (%repository-cache-directory)) @@ -172,21 +228,33 @@ reference to be checkout, once the repository is fetched, is specified by REF. REF is pair whose key is [branch | commit | tag] and value the associated data, respectively [ | | ]. +When RECURSIVE? is true, check out submodules as well, if any. + Git repositories are kept in the cache directory specified by %repository-cache-directory parameter. Log progress and checkout info to LOG-PORT." (define (dot-git? file stat) (and (string=? (basename file) ".git") - (eq? 'directory (stat:type stat)))) + (or (eq? 'directory (stat:type stat)) + + ;; Submodule checkouts end up with a '.git' regular file that + ;; contains metadata about where their actual '.git' directory + ;; lives. + (and recursive? + (eq? 'regular (stat:type stat)))))) (format log-port "updating checkout of '~a'...~%" url) (let*-values (((checkout commit) (update-cached-checkout url + #:recursive? recursive? #:ref ref #:cache-directory - (url-cache-directory url cache-directory))) + (url-cache-directory url cache-directory + #:recursive? + recursive?) + #:log-port log-port)) ((name) (url+commit->name url commit))) (format log-port "retrieved commit ~a~%" commit) @@ -244,3 +312,7 @@ Log progress and checkout info to LOG-PORT." `(commit . ,commit) `(branch . ,branch)) #:log-port (current-error-port))))) + +;; Local Variables: +;; eval: (put 'with-repository 'scheme-indent-function 2) +;; End: From 06fff484cec2abc1702e2131d963ed086c5e0b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 8 Feb 2019 09:16:27 +0100 Subject: [PATCH 184/250] git: Add a 'recursive?' field to records. * guix/git.scm ()[recursive?]: New field. (latest-repository-commit*): Add #:recursive? and honor it. (git-checkout-compiler): Honor the 'recursive?' field of CHECKOUT. --- guix/git.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index e2daa78f6b..51b8aa9ae5 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -273,9 +273,10 @@ Log progress and checkout info to LOG-PORT." git-checkout? (url git-checkout-url) (branch git-checkout-branch (default "master")) - (commit git-checkout-commit (default #f))) + (commit git-checkout-commit (default #f)) + (recursive? git-checkout-recursive? (default #f))) -(define* (latest-repository-commit* url #:key ref log-port) +(define* (latest-repository-commit* url #:key ref recursive? log-port) ;; Monadic variant of 'latest-repository-commit'. (lambda (store) ;; The caller--e.g., (guix scripts build)--may not handle 'git-error' so @@ -284,7 +285,9 @@ Log progress and checkout info to LOG-PORT." (catch 'git-error (lambda () (values (latest-repository-commit store url - #:ref ref #:log-port log-port) + #:ref ref + #:recursive? recursive? + #:log-port log-port) store)) (lambda (key error . _) (raise (condition @@ -306,11 +309,12 @@ Log progress and checkout info to LOG-PORT." ;; "Compile" CHECKOUT by updating the local checkout and adding it to the ;; store. (match checkout - (($ url branch commit) + (($ url branch commit recursive?) (latest-repository-commit* url #:ref (if commit `(commit . ,commit) `(branch . ,branch)) + #:recursive? recursive? #:log-port (current-error-port))))) ;; Local Variables: From 024a6bfba906742c136a47b4099f06880f1d3f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 8 Feb 2019 09:29:39 +0100 Subject: [PATCH 185/250] guix build: '--with-branch' & co. fetch submodules. * guix/scripts/build.scm (transform-package-source-branch)[replace]: Add 'recursive?' field to the new package. --- doc/guix.texi | 3 ++- guix/scripts/build.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 53c133804d..69b6985051 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7289,7 +7289,8 @@ care! Build @var{package} from the latest commit of @var{branch}. The @code{source} field of @var{package} must be an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object; the repository URL -is taken from that @code{source}. +is taken from that @code{source}. Git sub-modules of the repository are +fetched, recursively. For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 5a158799ae..fb7e04904d 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -308,7 +308,8 @@ strings like \"guile-next=stable-3.0\" meaning that packages are built using (package (inherit old) (version (string-append "git." branch)) - (source (git-checkout (url url) (branch branch))))) + (source (git-checkout (url url) (branch branch) + (recursive? #t))))) (let* ((replacements (evaluate-git-replacement-specs replacement-specs replace)) From bc041b3e264380bd49025515d3c5d11319aa3f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 8 Feb 2019 10:31:23 +0100 Subject: [PATCH 186/250] git: Always use the system certificates by default. 'guix pull' was always doing it, and now '--with-branch' & co. will do it as well. * guix/git.scm (honor-system-x509-certificates!): New procedure. (%certificates-initialized?): New variable. (with-libgit2): Add call to 'honor-system-x509-certificates!'. * guix/scripts/pull.scm (honor-x509-certificates): Call 'honor-system-x509-certificates!' and fall back to 'honor-lets-encrypt-certificates!'. --- guix/git.scm | 38 ++++++++++++++++++++++++++++++++++++++ guix/scripts/pull.scm | 26 ++------------------------ 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 51b8aa9ae5..0e3ce37e26 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -35,6 +35,8 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:export (%repository-cache-directory + honor-system-x509-certificates! + update-cached-checkout latest-repository-commit @@ -52,12 +54,48 @@ (make-parameter (string-append (cache-directory #:ensure? #f) "/checkouts"))) +(define (honor-system-x509-certificates!) + "Use the system's X.509 certificates for Git checkouts over HTTPS. Honor +the 'SSL_CERT_FILE' and 'SSL_CERT_DIR' environment variables." + ;; On distros such as CentOS 7, /etc/ssl/certs contains only a couple of + ;; files (instead of all the certificates) among which "ca-bundle.crt". On + ;; other distros /etc/ssl/certs usually contains the whole set of + ;; certificates along with "ca-certificates.crt". Try to choose the right + ;; one. + (let ((file (letrec-syntax ((choose + (syntax-rules () + ((_ file rest ...) + (let ((f file)) + (if (and f (file-exists? f)) + f + (choose rest ...)))) + ((_) + #f)))) + (choose (getenv "SSL_CERT_FILE") + "/etc/ssl/certs/ca-certificates.crt" + "/etc/ssl/certs/ca-bundle.crt"))) + (directory (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) + (and (or file + (and=> (stat directory #f) + (lambda (st) + (> (stat:nlink st) 2)))) + (begin + (set-tls-certificate-locations! directory file) + #t)))) + +(define %certificates-initialized? + ;; Whether 'honor-system-x509-certificates!' has already been called. + #f) + (define-syntax-rule (with-libgit2 thunk ...) (begin ;; XXX: The right thing to do would be to call (libgit2-shutdown) here, ;; but pointer finalizers used in guile-git may be called after shutdown, ;; resulting in a segfault. Hence, let's skip shutdown call for now. (libgit2-init!) + (unless %certificates-initialized? + (honor-system-x509-certificates!) + (set! %certificates-initialized? #t)) thunk ...)) (define* (url-cache-directory url diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 683ab3f059..3320200c07 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -216,30 +216,8 @@ true, display what would be built without actually building it." (define (honor-x509-certificates store) "Use the right X.509 certificates for Git checkouts over HTTPS." - ;; On distros such as CentOS 7, /etc/ssl/certs contains only a couple of - ;; files (instead of all the certificates) among which "ca-bundle.crt". On - ;; other distros /etc/ssl/certs usually contains the whole set of - ;; certificates along with "ca-certificates.crt". Try to choose the right - ;; one. - (let ((file (letrec-syntax ((choose - (syntax-rules () - ((_ file rest ...) - (let ((f file)) - (if (and f (file-exists? f)) - f - (choose rest ...)))) - ((_) - #f)))) - (choose (getenv "SSL_CERT_FILE") - "/etc/ssl/certs/ca-certificates.crt" - "/etc/ssl/certs/ca-bundle.crt"))) - (directory (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) - (if (or file - (and=> (stat directory #f) - (lambda (st) - (> (stat:nlink st) 2)))) - (set-tls-certificate-locations! directory file) - (honor-lets-encrypt-certificates! store)))) + (unless (honor-system-x509-certificates!) + (honor-lets-encrypt-certificates! store))) (define (report-git-error error) "Report the given Guile-Git error." From 6fd72f7094885dc3dbb10431996c445251094915 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 8 Feb 2019 10:26:20 +0000 Subject: [PATCH 187/250] gnu: guile-squee: Fix the license. The license originally specified in the package definition was incorrect. The true license is the Lesser GNU General Public License. * gnu/packages/guile-xyz.scm (guile-squee): Change license to license:lgpl3+. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f249761ebc..24df93ccce 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -597,7 +597,7 @@ It has a nice, simple s-expression based syntax.") (description "@code{squee} is a Guile library for connecting to PostgreSQL databases using Guile's foreign function interface.") - (license license:gpl3+)))) + (license license:lgpl3+)))) (define-public guile-colorized (package From 9d58e8819fdbc4c1c8a1ef6149e2d2376731a6a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Feb 2019 09:52:52 +0100 Subject: [PATCH 188/250] gnu: umoci: Update to 0.4.4. * gnu/packages/virtualization.scm (umoci): Update to 0.4.4. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 26855b8007..04165a9b8c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -904,7 +904,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (string-append @@ -913,7 +913,7 @@ Open Container Initiative specification.") (file-name (string-append "umoci-" version ".tar.xz")) (sha256 (base32 - "1hy3gcs8z25153qpw4rk2lispfaf2c90hv1q64xwyjxn22j9ayy9")))) + "1wchmha5k2f370jfijmx9fqp0cp99zfa9ajmfbq3j24qc8p5k8lk")))) (build-system go-build-system) (arguments '(#:import-path "github.com/openSUSE/umoci" From ef6e69fdecec8b19eff9dac54dc6457674223b45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 09:11:04 +0100 Subject: [PATCH 189/250] gnu: Add dune-grid. * gnu/packages/maths.scm (dune-grid): New variable. --- gnu/packages/maths.scm | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 074e878de4..93fb75214e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4358,3 +4358,93 @@ Differences} (FD). This package contains the basic DUNE geometry classes.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) + +(define-public dune-grid + (package + (name "dune-grid") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-grid-" version ".tar.gz")) + (sha256 + (base32 + "1jp4vscm9yb9xg0lh7apzccfkhvgbnk652yahigmh3cvzpl4acd0")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags))) + ;; These tests fail because they require a fully functional MPI + ;; environment. + (add-after 'unpack 'disable-failing-tests + (lambda _ + (setenv "ARGS" + (string-append "--exclude-regex '(" + (string-join + (list + "scsgmappertest" + "conformvolumevtktest" + "gnuplottest" + "nonconformboundaryvtktest" + "subsamplingvtktest" + "vtktest" + "vtktest-mpi-2" + "vtksequencetest" + "gmshtest-onedgrid" + "test-dgf-yasp" + "test-dgf-yasp-offset" + "test-dgf-oned" + "test-geogrid-yaspgrid" + "test-gridinfo" + "test-identitygrid" + "testiteratorranges" + "test-hierarchicsearch" + "test-parallel-ug-mpi-2" + "test-yaspgrid-backuprestore-equidistant" + "test-yaspgrid-backuprestore-equidistant-mpi-2" + "test-yaspgrid-backuprestore-equidistantoffset" + "test-yaspgrid-backuprestore-equidistantoffset-mpi-2" + "test-yaspgrid-backuprestore-tensor" + "test-yaspgrid-backuprestore-tensor-mpi-2" + "test-yaspgrid-tensorgridfactory" + "test-yaspgrid-tensorgridfactory-mpi-2" + "test-yaspgrid-yaspfactory-1d" + "test-yaspgrid-yaspfactory-1d-mpi-2" + "test-yaspgrid-yaspfactory-2d" + "test-yaspgrid-yaspfactory-2d-mpi-2" + "test-yaspgrid-yaspfactory-3d" + "test-yaspgrid-yaspfactory-3d-mpi-2" + "globalindexsettest" + "persistentcontainertest" + "structuredgridfactorytest" + "tensorgridfactorytest" + "vertexordertest") + "|") + ")'")) + #t))))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("gmp" ,gmp) + ("metis" ,metis) + ("openblas" ,openblas) + ("openmpi" ,openmpi) + ("python" ,python))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. It supports the easy implementation of methods like +@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite +Differences} (FD). + +This package contains the basic DUNE grid classes.") + ;; GPL version 2 with "runtime exception" + (license license:gpl2))) From ea51d3578c00ca6b3657b0255c3db2b3b8551deb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 09:11:31 +0100 Subject: [PATCH 190/250] gnu: Add dune-istl. * gnu/packages/maths.scm (dune-istl): New variable. --- gnu/packages/maths.scm | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 93fb75214e..d54335ba8e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4448,3 +4448,67 @@ Differences} (FD). This package contains the basic DUNE grid classes.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) + +(define-public dune-istl + (package + (name "dune-istl") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-istl-" version ".tar.gz")) + (sha256 + (base32 + "0l2gyrvys5w6wsmk0ckbb7295s80b7yk7qrl7x66akv2jv1nzq2w")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags))) + ;; These tests fail because they require a fully functional MPI + ;; environment. + (add-after 'unpack 'disable-failing-tests + (lambda _ + (setenv "ARGS" + (string-append "--exclude-regex '(" + (string-join + (list + "galerkintest" + "hierarchytest" + "pamgtest" + "pamg_comm_repart_test" + "matrixredisttest" + "vectorcommtest" + "matrixmarkettest") + "|") + ")'")) + #t))))) + (inputs + `(("dune-common" ,dune-common) + ("openmpi" ,openmpi) + ;; Optional + ("metis" ,metis) + ("superlu" ,superlu) + ("openblas" ,openblas) + ("gmp" ,gmp) + ("python" ,python))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. + +This is the iterative solver template library which provides generic sparse +matrix/vector classes and a variety of solvers based on these classes. A +special feature is the use of templates to exploit the recursive block +structure of finite element matrices at compile time. Available solvers +include Krylov methods, (block-) incomplete decompositions and +aggregation-based algebraic multigrid.") + ;; GPL version 2 with "runtime exception" + (license license:gpl2))) From 5a70aa7d69b487a6af464111f0cbedf18828108d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 10:14:39 +0100 Subject: [PATCH 191/250] gnu: Add dune-localfunctions. * gnu/packages/maths.scm (dune-localfunctions): New variable. --- gnu/packages/maths.scm | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d54335ba8e..61e58bda2a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4512,3 +4512,47 @@ include Krylov methods, (block-) incomplete decompositions and aggregation-based algebraic multigrid.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) + +(define-public dune-localfunctions + (package + (name "dune-localfunctions") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-localfunctions-" version ".tar.gz")) + (sha256 + (base32 + "19c6zjinwwpy8jh4v4prhphyd438rapd4x80fj93apmwgw04nrhl")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("openmpi" ,openmpi) + ;; Optional + ("metis" ,metis) + ("superlu" ,superlu) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") ; TODO + (description "This DUNE module provides interface and implementation for +shape functions defined on the DUNE reference elements. In addition to the +shape function, interpolation operators and special keys are provided which +can be used to assemble global function spaces on finite-element grids. + +This package provides an interface and implementation for shape functions +defined on the DUNE reference elements. In addition to the shape function, +interpolation operators and special keys are provided which can be used to +assemble global function spaces on finite-element grids.") + ;; GPL version 2 with "runtime exception" + (license license:gpl2))) From f57bf15cd88655062cd5dcf6314c82c3e19e85f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 16:26:02 +0100 Subject: [PATCH 192/250] gnu: guile-redis: Update to 1.3.0. * gnu/packages/guile-xyz.scm (guile-redis): Update to 1.3.0. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 24df93ccce..ae05197e16 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1837,14 +1837,14 @@ interface for reading articles in any format.") (define-public guile-redis (package (name "guile-redis") - (version "1.0.0") + (version "1.3.0") (home-page "https://github.com/aconchillo/guile-redis") (source (origin (method url-fetch) (uri (string-append home-page "/archive/" version ".tar.gz")) (sha256 (base32 - "1dp5fmqvma59pvp1nfpq6hqgbmjici8sd1y8llahl87fynw1dvr9")))) + "1li70a2716my9q9zfq0qn2x5d1cir9k2vx0jm9glm464yaf1vj39")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) From 6d0b50f6510dbe7c7724cee21155e09bb0b36402 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 5 Feb 2019 22:32:19 +0100 Subject: [PATCH 193/250] gnu: libimobiledevice: Propagate "libplist". * gnu/packages/libusb.scm (libimobiledevice)[propagated-inputs]: Add libplist. [inputs]: Remove libplist. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index e27cffa331..ce4c28506c 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -368,10 +368,10 @@ connections from and to iOS devices by connecting to a socket provided by a "m")))) (propagated-inputs `(("openssl" ,openssl) + ("libplist" ,libplist) ; libimobiledevice's ".pc" file requires it. ("libusbmuxd" ,libusbmuxd))) (inputs - `(("libplist" ,libplist) - ("python" ,python))) + `(("python" ,python))) (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython) From bc4e8d3e64b1e654d3f77d0aaabf962656aab3fa Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 5 Feb 2019 22:33:21 +0100 Subject: [PATCH 194/250] gnu: Add ifuse. * gnu/packages/libusb.scm (ifuse): New variable. --- gnu/packages/libusb.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ce4c28506c..ff3e14d5da 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -368,7 +368,7 @@ connections from and to iOS devices by connecting to a socket provided by a "m")))) (propagated-inputs `(("openssl" ,openssl) - ("libplist" ,libplist) ; libimobiledevice's ".pc" file requires it. + ("libplist" ,libplist) ("libusbmuxd" ,libusbmuxd))) (inputs `(("python" ,python))) @@ -386,6 +386,29 @@ addressbook/calendars/notes and bookmarks and (using libgpod) synchronize music and video to the device.") (license license:lgpl2.1+))) +(define-public ifuse + (package + (name "ifuse") + (version "1.1.3") + (source (origin + (method url-fetch) + (uri (string-append "http://www.libimobiledevice.org/downloads/" + "ifuse-" version ".tar.bz2")) + (sha256 + (base32 + "1p9a4n36jb194cnp6v57cz2bggwbywaz8pbpb95ch83pzdkdx257")))) + (inputs + `(("fuse" ,fuse) + ("libimobiledevice" ,libimobiledevice))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (build-system gnu-build-system) + (home-page "http://www.libimobiledevice.org/") + (synopsis "Mount iOS devices") + (description "This package provides @command{ifuse}, a command to mount +iOS devices and access their contents.") + (license license:lgpl2.1+))) + (define-public libmtp (package (name "libmtp") From fc80f54e29bc6da3cfa8b683bb30f767e05ae8f5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 5 Feb 2019 23:12:35 +0100 Subject: [PATCH 195/250] gnu: Add usbmuxd. * gnu/packages/libusb.scm (usbmuxd): New variable. --- gnu/packages/libusb.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ff3e14d5da..f0725d77e8 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -409,6 +409,32 @@ music and video to the device.") iOS devices and access their contents.") (license license:lgpl2.1+))) +(define-public usbmuxd + (package + (name "usbmuxd") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append "http://www.libimobiledevice.org/downloads/" + "usbmuxd-" version ".tar.bz2")) + (sha256 + (base32 + "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y")))) + (inputs + `(("libplist" ,libplist) + ("libusb" ,libusb) + ("libimobiledevice" ,libimobiledevice))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (build-system gnu-build-system) + (home-page "http://www.libimobiledevice.org/") + (synopsis "Multiplex connections over USB to an iOS device") + (description "This package provides the @code{usbmuxd} daemon +which multiplexes connections over USB to an iOS device. To +users, it means you can sync your music, contacts, photos, etc. +over USB.") + (license license:gpl2+))) + (define-public libmtp (package (name "libmtp") From ab03d899cac5e09faf0a4d759d48b7bc05f48f0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 17:17:26 +0100 Subject: [PATCH 196/250] gnu: Add dune-alugrid. * gnu/packages/maths.scm (dune-alugrid): New variable. --- gnu/packages/maths.scm | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 61e58bda2a..e01ec9d797 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4556,3 +4556,55 @@ interpolation operators and special keys are provided which can be used to assemble global function spaces on finite-element grids.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) + +(define-public dune-alugrid + (package + (name "dune-alugrid") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-alugrid-" version ".tar.gz")) + (sha256 + (base32 + "1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; 7 of 8 tests fail because they need a full MPI + ; environment + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-include + (lambda _ + (substitute* "dune/alugrid/test/test-alugrid.cc" + (("doc/grids/gridfactory/testgrids") + "doc/dune-grid/grids/gridfactory/testgrids")) + #t)) + (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"))) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ("openmpi" ,openmpi) + ;; Optional + ("metis" ,metis) + ("openblas" ,openblas) + ("python" ,python) + ("superlu" ,superlu) + ("gmp" ,gmp) + ("zlib" ,zlib))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "ALUGrid is an adaptive, loadbalancing, unstructured +implementation of the DUNE grid interface supporting either simplices or +cubes.") + (license license:gpl2+))) From 0e50630f1587c00c55bb3544d163098e6ac1920f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 17:58:32 +0100 Subject: [PATCH 197/250] gnu: Add dune-typetree. * gnu/packages/maths.scm (dune-typetree): New variable. --- gnu/packages/maths.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e01ec9d797..aad1293fad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4608,3 +4608,43 @@ assemble global function spaces on finite-element grids.") implementation of the DUNE grid interface supporting either simplices or cubes.") (license license:gpl2+))) + +(define-public dune-typetree + (package + (name "dune-typetree") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/staging/dune-typetree.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mnv6w2f22lz3j4bdpdjq55vjm8xxfx9v4vvhg9bd36xpsbjpjp9")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("openmpi" ,openmpi) + ;; Optional + ("openblas" ,openblas) + ("python" ,python) + ("metis" ,metis) + ("superlu" ,superlu) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "TypeTree is a template library for constructing and +operating on statically typed trees of objects.") + ;; Either GPL version 2 with "runtime exception" or LGPLv3+. + (license (list license:lgpl3+ license:gpl2)))) From 85b9371cbea82fd2d89bb393ce93c219b5b1efe9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 18:29:30 +0100 Subject: [PATCH 198/250] gnu: Add dune-functions. * gnu/packages/maths.scm (dune-functions): New variable. --- gnu/packages/maths.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index aad1293fad..a674699c58 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4648,3 +4648,43 @@ cubes.") operating on statically typed trees of objects.") ;; Either GPL version 2 with "runtime exception" or LGPLv3+. (license (list license:lgpl3+ license:gpl2)))) + +(define-public dune-functions + (package + (name "dune-functions") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/staging/dune-functions.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1an8gb477n8j0kzpbrv7nr1snh8pxip0gsxq6w63jc83gg3dj200")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; FIXME: tests require dune-uugrid + (inputs + `(("dune-common" ,dune-common) + ("dune-istl" ,dune-istl) + ("dune-localfunctions" ,dune-localfunctions) + ("dune-grid" ,dune-grid) + ("dune-geometry" ,dune-geometry) + ("dune-typetree" ,dune-typetree) + ("openmpi" ,openmpi) + ("openblas" ,openblas) + ("metis" ,metis) + ("python" ,python) + ("superlu" ,superlu) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-functions module provides an abstraction layer for +global finite element functions. Its two main concepts are functions +implemented as callable objects, and bases of finite element spaces.") + ;; Either GPL version 2 with "runtime exception" or LGPLv3+. + (license (list license:lgpl3+ license:gpl2)))) From 4714b00e7abaf0d284b0b282e5a3632cb95ac1ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 19:15:03 +0100 Subject: [PATCH 199/250] gnu: Add dune-pdelab. * gnu/packages/maths.scm (dune-pdelab): New variable. --- gnu/packages/maths.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a674699c58..2a587ac658 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4688,3 +4688,45 @@ global finite element functions. Its two main concepts are functions implemented as callable objects, and bases of finite element spaces.") ;; Either GPL version 2 with "runtime exception" or LGPLv3+. (license (list license:lgpl3+ license:gpl2)))) + +(define-public dune-pdelab + (package + (name "dune-pdelab") + (version "2.6.0-rc1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/pdelab/dune-pdelab") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07g0s9448z65vjrq88g5rv3340iifil85k170n8kbqchsvi4ny5v")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; XXX: the tests cannot be compiled + (inputs + `(("dune-common" ,dune-common) + ("dune-istl" ,dune-istl) + ("dune-localfunctions" ,dune-localfunctions) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ("dune-typetree" ,dune-typetree) + ("dune-functions" ,dune-functions) + ("openmpi" ,openmpi) + ;; Optional + ("openblas" ,openblas) + ("eigen" ,eigen) + ("metis" ,metis) + ("python" ,python) + ("superlu" ,superlu) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Differential equations solver toolbox") + (description "PDELab is a partial differential equations solver toolbox +built on top of DUNE, the Distributed and Unified Numerics Environment.") + ;; Either GPL version 2 with "runtime exception" or LGPLv3+. + (license (list license:lgpl3+ license:gpl2)))) From 4745f8d71d13dd02e34ebc6f0c81c7511ed2e4fd Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 9 Feb 2019 01:08:36 +0530 Subject: [PATCH 200/250] gnu: swaks: Update to 20181104.0. * gnu/packages/mail.scm (swaks): Update to 20181104.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be2098ad61..4f2c1c31e7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2317,7 +2317,7 @@ on the fly. Both programs are written in C and are very fast.") (define-public swaks (package (name "swaks") - (version "20170101.0") + (version "20181104.0") (source (origin (method url-fetch) @@ -2326,7 +2326,7 @@ on the fly. Both programs are written in C and are very fast.") version ".tar.gz")) (sha256 (base32 - "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4")))) + "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2")))) (build-system perl-build-system) (inputs `(("perl-net-dns" ,perl-net-dns) From 307182d4f7b1a56e220f208ad5f886e7784db115 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 22:44:32 +0100 Subject: [PATCH 201/250] gnu: rcas-web: Update to 0.1.0. * gnu/packages/bioinformatics.scm (rcas-web): Update to 0.1.0. [inputs]: Replace guile2.2-redis with guile-redis. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 516a7c1ee1..02cafb2358 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8664,7 +8664,7 @@ library implementing most of the pipeline's features.") (define-public rcas-web (package (name "rcas-web") - (version "0.0.5") + (version "0.1.0") (source (origin (method url-fetch) @@ -8673,7 +8673,7 @@ library implementing most of the pipeline's features.") "/rcas-web-" version ".tar.gz")) (sha256 (base32 - "0igz7jpcf7cm9800zcag6p3gd1i649figrhbdba6cjkm8f4gfspr")))) + "0wq951aj45gqki1bickg876i993lmawkp8x24agg264br5x716db")))) (build-system gnu-build-system) (arguments `(#:phases @@ -8696,7 +8696,7 @@ library implementing most of the pipeline's features.") ("r-rcas" ,r-rcas) ("guile-next" ,guile-2.2) ("guile-json" ,guile-json) - ("guile-redis" ,guile2.2-redis))) + ("guile-redis" ,guile-redis))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/BIMSBbioinfo/rcas-web") From c97a1c4297cf302930fe3fcb4beb6ac4a085f29d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 14:04:22 +0100 Subject: [PATCH 202/250] gnu: sdl2-ttf: Update to 2.0.15. * gnu/packages/sdl.scm (sdl2-ttf): Update to 2.0.15. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6198925727..ee143497e5 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -386,7 +386,7 @@ directory.") (define-public sdl2-ttf (package (inherit sdl-ttf) (name "sdl2-ttf") - (version "2.0.14") + (version "2.0.15") (source (origin (method url-fetch) (uri @@ -399,7 +399,7 @@ directory.") #t)) (sha256 (base32 - "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl")))) + "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-ttf)))) From d77ade87fe2bdf41627a3dc432150c64567df486 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 03:58:07 +0100 Subject: [PATCH 203/250] gnu: torsocks: Don't use NAME in source URI. * gnu/packages/tor.scm (torsocks)[source]: Hard-code name. --- gnu/packages/tor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index db3e1451e9..9b66437a64 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -95,7 +95,7 @@ the application layer) you need to install @code{torsocks}.") (source (origin (method url-fetch) (uri (string-append "https://people.torproject.org/~dgoulet/" - name "/" name "-" version ".tar.xz")) + "torsocks/torsocks-" version ".tar.xz")) (sha256 (base32 "0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19")))) From 15c661ec8ed90107690980758be6a88fe4c47061 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 13:00:37 +0100 Subject: [PATCH 204/250] gnu: torsocks: Update to 2.3.0. * gnu/packages/tor.scm (torsocks): Update to 2.3.0. [inputs]: Remove which. [arguments]: Update 'absolutize' substitutions. --- gnu/packages/tor.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 9b66437a64..ec86d7d241 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -91,27 +91,24 @@ the application layer) you need to install @code{torsocks}.") (define-public torsocks (package (name "torsocks") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append "https://people.torproject.org/~dgoulet/" "torsocks/torsocks-" version ".tar.xz")) (sha256 (base32 - "0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19")))) + "08inrkap29gikb6sdmb58z43hw4abwrfw7ny40c4xzdkss0vkwdr")))) (build-system gnu-build-system) (inputs - `(("which" ,which) - ("libcap" ,libcap))) + `(("libcap" ,libcap))) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'absolutize (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/bin/torsocks" - (("getcap=`.*`") - (string-append "getcap=" (which "getcap"))) - (("`which") - (string-append "`" (which "which")))) + (("getcap=.*") + (string-append "getcap=" (which "getcap") "\n"))) #t))))) (home-page "https://www.torproject.org/") (synopsis "Use socks-friendly applications with Tor") From 0fa63b8908dca11b88cade6b897e2ac949aac975 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 13:12:07 +0100 Subject: [PATCH 205/250] gnu: spice-protocol: Update to 0.12.15. * gnu/packages/spice.scm (spice-protocol): Update to 0.12.15. --- gnu/packages/spice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 94e6aa8438..d81f9891cf 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -96,7 +96,7 @@ system to use the host GPU to accelerate 3D rendering.") (define-public spice-protocol (package (name "spice-protocol") - (version "0.12.14") + (version "0.12.15") (source (origin (method url-fetch) (uri (string-append @@ -104,7 +104,7 @@ system to use the host GPU to accelerate 3D rendering.") "spice-protocol-" version ".tar.bz2")) (sha256 (base32 - "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90")))) + "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb")))) (build-system gnu-build-system) (synopsis "Protocol headers for the SPICE protocol") (description "SPICE (the Simple Protocol for Independent Computing From d64e514777334bf345fed782444ff6574b6575eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:26:27 +0100 Subject: [PATCH 206/250] gnu: i3blocks: Use GIT-FILE-NAME. * gnu/packages/wm.scm (i3blocks)[source]: Use GIT-FILE-NAME. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fa0e467f31..b050b05656 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -250,7 +250,7 @@ developers.") (sha256 (base32 "15rnrcajzyrmhlz1a21qqsjlj3dkib70806dlb386fliylc2kisb")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) From 1f6a970592d03b3600b483ad48e34568ae1f4e9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 19:35:24 +0100 Subject: [PATCH 207/250] gnu: florence: Don't use NAME in source URI. * gnu/packages/accessibility.scm (florence)[source]: Hard-code name. --- gnu/packages/accessibility.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 25c44fa2c0..35c8c8f19b 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -45,7 +45,7 @@ (origin (method url-fetch) (uri (string-append "mirror://sourceforge/florence/florence/" version - "/" name "-" version ".tar.bz2")) + "/florence-" version ".tar.bz2")) (sha256 (base32 "07h9qm22krlwayhzvc391lr23vicw81s48g7rirvx1fj0zyr4aa2")))) From f44eca9468cfdaa6ff32e5202c788037d960483f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 19:35:52 +0100 Subject: [PATCH 208/250] gnu: launchmon: Don't use NAME in source URI. * gnu/packages/admin.scm (launchmon)[source]: Hard-code name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 054ef3d461..07dd7ecd3c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2640,7 +2640,7 @@ late.") (method url-fetch) (uri (string-append "https://github.com/LLNL/LaunchMON/releases/download/v" - version "/" name "-v" version ".tar.gz")) + version "/launchmon-v" version ".tar.gz")) (sha256 (base32 "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")))) From 631249ddc04bac63b895c0a632ff6711b1e08104 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:58:55 +0100 Subject: [PATCH 209/250] gnu: avogadro: Don't use unstable tarball. * gnu/packages/chemistry.scm (avogadro)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chemistry.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index a493af16f5..b6345b9d27 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages boost) @@ -44,18 +46,19 @@ (package (name "avogadro") (version "1.2.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cryos/avogadro/archive/" - version ".tar.gz")) - (sha256 - (base32 - "02v4h6hi1m7ilv0apdf74a8l1cm6dxnxyqp0rdaidrp3i9pf6lv4")) - (file-name (string-append name "-" version ".tar.gz")) - (patches - (search-patches "avogadro-eigen3-update.patch" - "avogadro-python-eigen-lib.patch" - "avogadro-boost148.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cryos/avogadro.git") + (commit version))) + (sha256 + (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) + (file-name (git-file-name name version)) + (patches + (search-patches "avogadro-eigen3-update.patch" + "avogadro-python-eigen-lib.patch" + "avogadro-boost148.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f From e20796dc7ae22bb212570855931a1e8ddf714f2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:48:19 +0100 Subject: [PATCH 210/250] gnu: hungrycat: Don't use NAME in source URI. * gnu/packages/admin.scm (hungrycat)[source]: Hard-code name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 07dd7ecd3c..9515c2113e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2608,7 +2608,7 @@ application, collecting the information received.") (method url-fetch) (uri (string-append "https://github.com/jwilk/hungrycat/" "releases/download/" version "/" - name "-" version ".tar.gz")) + "hungrycat-" version ".tar.gz")) (sha256 (base32 "03fc1zsrf99lvxa7b4ps6pbi43304wbxh1f6ci4q0vkal370yfwh")))) From fe2f01664fb227e013b477fb5d7d9e03c10b28a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:27:18 +0100 Subject: [PATCH 211/250] gnu: audit: Don't use NAME in source URI. * gnu/packages/admin.scm (audit)[source]: Hard-code name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9515c2113e..4f13180a6e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1864,7 +1864,7 @@ platform-specific methods.") (version "2.8.4") (source (origin (method url-fetch) - (uri (string-append home-page name "-" version ".tar.gz")) + (uri (string-append home-page "audit-" version ".tar.gz")) (sha256 (base32 "0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454")))) From ab213bfd0471736bb9fc6ef922d26be26328599d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:14:58 +0100 Subject: [PATCH 212/250] gnu: pam-krb5: Don't use NAME in source URI. * gnu/packages/admin.scm (pam-krb5)[source]: Hard-code name. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4f13180a6e..01af6d3895 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2158,8 +2158,8 @@ shortcut syntax and completion options.") (source (origin (method url-fetch) (uri (string-append - "https://archives.eyrie.org/software/kerberos/" name "-" - version ".tar.xz")) + "https://archives.eyrie.org/software/kerberos/" + "pam-krb5-" version ".tar.xz")) (sha256 (base32 "1qjp8i1s9bz7g6kiqrkzzkxn5pfspa4sy53b6z40fqmdf9przdfb")))) From e956d76ddb6448ded1add1f74a4ed8f68e8f6029 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:47:18 +0100 Subject: [PATCH 213/250] gnu: masscan: Don't use unstable tarball. * gnu/packages/admin.scm (masscan)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 01af6d3895..bb6bcaea9b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2565,14 +2565,15 @@ on systems running the Linux kernel.") (package (name "masscan") (version "1.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/robertdavidgraham/masscan" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0wxddsgyx27z45906icdhdbfsvfj8ij805208qpqjx46i0lnjs50")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robertdavidgraham/masscan.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg")))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap))) From a0c693e17391663d7fbd5d88d96c082c0fa0f3a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:31:09 +0100 Subject: [PATCH 214/250] gnu: thefuck: Don't use unstable tarball. * gnu/packages/admin.scm (thefuck)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bb6bcaea9b..3fc9e9ef6e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2015,15 +2015,16 @@ throughput (in the same interval).") (package (name "thefuck") (version "3.28") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nvbn/thefuck/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1i11qlnbg95nx7dcf6wqvfz7b230dqr5m981md4hvyaa1qw3xj5m")) - (patches (search-patches "thefuck-test-environ.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nvbn/thefuck.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "070b2sx8r0b4hry6xg97psxlikxghmz91zicg2cm6kc1yhgz4agc")) + (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments '(#:phases From 16572d0e021d4a6caf8b3ba548ecf39883c47c24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:14:27 +0100 Subject: [PATCH 215/250] gnu: nnn: Don't use NAME in source URI. * gnu/packages/admin.scm (nnn)[source]: Hard-code name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3fc9e9ef6e..c8533bfca8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2495,7 +2495,7 @@ you are running, what theme or icon set you are using, etc.") (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" - version "/" name "-v" version ".tar.gz")) + version "/nnn-v" version ".tar.gz")) (sha256 (base32 "1d6z12y4rlg4dzhpm30irpq2ak8hjh5zykkp2n7vxnz5m4ki89zp")))) (build-system gnu-build-system) From 213114a7b1ea34dbc492335ea4f8be4874c686c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:16:05 +0100 Subject: [PATCH 216/250] gnu: daemontools: Don't assume sources match NAME. * gnu/packages/admin.scm (daemontools)[source, argumenst]: Hard-code name. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c8533bfca8..576b242756 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -219,8 +219,8 @@ interface and is based on GNU Guile.") (source (origin (method url-fetch) (uri (string-append - "https://cr.yp.to/" name "/" - name "-" version ".tar.gz")) + "https://cr.yp.to/daemontools/" + "daemontools-" version ".tar.gz")) (sha256 (base32 "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5")))) @@ -231,7 +231,7 @@ interface and is based on GNU Guile.") (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ - (chdir ,(string-append name "-" version)) + (chdir ,(string-append "daemontools-" version)) #t)) (delete 'configure) (add-before 'build 'patch From ecb589227cc3867dc4a695a39d1417a72def0f4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:45:09 +0100 Subject: [PATCH 217/250] gnu: igt-gpu-tools: Don't use NAME in source URI. * gnu/packages/admin.scm (igt-gpu-tools)[source]: Hard-code name. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 576b242756..721d2c15e3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2365,7 +2365,7 @@ buffers.") (method url-fetch) (uri (string-append "https://cgit.freedesktop.org/xorg/app/" "intel-gpu-tools/snapshot/" - name "-" version ".tar.gz")) + "igt-gpu-tools-" version ".tar.gz")) (sha256 (base32 "0vzv2i4jfv2pkbqby5k3ap9pzidkmajwqmg3s7wnv8i1h33775iq")))) From 43eb601f76b167f487a819c2ad4b01b0f9c29dab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:41:22 +0100 Subject: [PATCH 218/250] gnu: sunxi-tools: Don't use unstable tarball. * gnu/packages/admin.scm (sunxi-tools)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 721d2c15e3..f6b70ca6db 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2206,11 +2206,12 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-sunxi/" - "sunxi-tools/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/linux-sunxi/sunxi-tools.git") + (commit (string-append "v" version)))) (sha256 - (base32 "08iqwj95qw2s7ilhrdi2lkbc8dx64zk5lzz1qk587jr0lla81x41")) + (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) (modules '((guix build utils))) (snippet ;; Remove binaries contained in the tarball which are only for the @@ -2218,7 +2219,7 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") '(begin (delete-file-recursively "bin") #t)) - (file-name (string-append name "-" version ".tar.gz")))) + (file-name (git-file-name name version)))) (native-inputs `(("pkg-config" ,pkg-config) ("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" From fc204d24be83a9b822145f3a232491f52304a5b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:15:50 +0100 Subject: [PATCH 219/250] gnu: dstat: Don't use unstable tarball. * gnu/packages/admin.scm (dstat)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f6b70ca6db..ebc893608a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1979,22 +1979,22 @@ results (ndiff), and a packet generation and response analysis tool (nping).") (package (name "dstat") (version "0.7.3") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/dagwieers/dstat/archive/" - version ".tar.gz")) - (file-name (string-append "dstat-" version ".tar.gz")) - (sha256 - (base32 - "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dagwieers/dstat.git") + (commit version))) + (file-name (git-file-name "dstat" version)) + (sha256 + (base32 "0sbpna531034gr40w4g9cwz35s2fpf9h654paznsxw9fih91rfa5")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;; no make check + `(#:tests? #f ; no make check #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) "prefix=/")) - ;; no configure script + ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("python-2" ,python-2))) (synopsis "Versatile resource statistics tool") From 4b6456ce3baf663d719e65f4e7b65fbfaa1faabd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:20:23 +0100 Subject: [PATCH 220/250] gnu: progress: Don't use unstable tarball. * gnu/packages/admin.scm (progress)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ebc893608a..b3b4dc6d42 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -148,13 +148,15 @@ usual file attributes can be checked for inconsistencies.") (package (name "progress") (version "0.14") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Xfennec/" - name "/archive/v" version ".tar.gz")) - (sha256 - (base32 "1wcanixfsi5k4i9h5vrnncgjdncalsdfqllrxibxwpgfnf20sji1")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Xfennec/progress.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -162,12 +164,12 @@ usual file attributes can be checked for inconsistencies.") (inputs `(("ncurses" ,ncurses))) (arguments - `(#:tests? #f ; There is no test suite. + `(#:tests? #f ; no test suite #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; There's no configure phase. + (delete 'configure)))) ; no configure script (home-page "https://github.com/Xfennec/progress") (synopsis "Program to view the progress of the coreutils commands") (description "A program that looks for coreutils basic commands (cp, mv, From aa372292b35264d4b3d7758b367aa25e34b23a85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:24:45 +0100 Subject: [PATCH 221/250] gnu: cpulimit: Don't use unstable tarball. * gnu/packages/admin.scm (cpulimit)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b3b4dc6d42..6aebe657ae 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1705,13 +1705,13 @@ lookup to YAML Mode. You could enable the mode with @code{(add-hook (version "0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/opsengine/cpulimit/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/opsengine/cpulimit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1nn2w849xd5bw4y5sqnll29nxdwl5h0cv4smc7dwmpb9qnd2ycb4")))) + (base32 "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases From 9bc96d13ce726ef91603459dfb023d65418ad7ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:23:18 +0100 Subject: [PATCH 222/250] gnu: fdupes: Don't use unstable tarball. * gnu/packages/admin.scm (fdupes)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6aebe657ae..2b60e9136a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1541,14 +1541,13 @@ degradation and failure.") (version "1.6.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/adrianlopezroche/fdupes/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/adrianlopezroche/fdupes.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1sj9pa40pbz6xdwbxfwhdhkvhdf1xc5gvggk9mdq26c41gdnyswx")))) + (base32 "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases From 7d6e8fda61fa5c198d044ababe9f567ba1f8414e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:43:31 +0100 Subject: [PATCH 223/250] gnu: sedsed: Don't use unstable tarball. * gnu/packages/admin.scm (sedsed)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b60e9136a..2381efac94 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2303,16 +2303,16 @@ in order to be able to find it. (version "1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/aureliojargas/sedsed/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/aureliojargas/sedsed.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh")))) + (base32 "0009lsjsxhqmgaklpwq15hhd94hpiy7r4va69yy0ig3mxi6zbg2z")))) (build-system python-build-system) (arguments - `(#:tests? #f ; No tests. + `(#:tests? #f ; no tests #:python ,python-2 #:phases (modify-phases %standard-phases From 807a30999d39cb0cd7a9080f9443626739a3e04a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:38:56 +0100 Subject: [PATCH 224/250] gnu: interrobang: Use GIT-... helpers. * gnu/packages/admin.scm (interrobang)[version]: Use GIT-VERSION. [source]: Use GIT-FILE-NAME. --- gnu/packages/admin.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2381efac94..0da617b5c8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2125,22 +2125,22 @@ the status of your battery in the system tray.") (commit "896543735e1c99144765fdbd7b6e6b5afbd8b881")) (package (name "interrobang") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TrilbyWhite/interrobang") - (commit commit))) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "1n13m70p1hfba5dy3i8hfclbr6k9q3d9dai3dg4jvhdhmxcpjzdf")))) + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TrilbyWhite/interrobang.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n13m70p1hfba5dy3i8hfclbr6k9q3d9dai3dg4jvhdhmxcpjzdf")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure script + (delete 'configure)) ; no configure script #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs From d8d910e6e1d5a321e130b158f5c0782e372ceb2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:35:26 +0100 Subject: [PATCH 225/250] gnu: cbatticon: Don't use unstable tarball. * gnu/packages/admin.scm (cbatticon)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/admin.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0da617b5c8..f4c34e10fe 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2091,23 +2091,24 @@ produce uniform output across heterogeneous networks.") (package (name "cbatticon") (version "1.6.8") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/valr/" - name "/archive/" version ".tar.gz")) - (sha256 - (base32 - "185lzvaijvyq7y8r7dvizhri0rf9lpc1anfgbbn4lznr1fr3z7rn")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/valr/cbatticon.git") + (commit version))) + (sha256 + (base32 "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (delete 'configure)))) ; no configure script (inputs `(("gtk+" ,gtk+) ("gettext" ,gettext-minimal) From 8b7ac58c16a697daaa591f838025a2492541d147 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Dec 2018 04:32:49 +0100 Subject: [PATCH 226/250] gnu: ledger: Don't use unstable tarball. * gnu/packages/finance.scm (ledger)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/finance.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5ca81f3d91..62747c8f55 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Adriano Peluso ;;; Copyright © 2018, 2019 Nicolas Goaziou @@ -139,17 +139,17 @@ line client and a client based on Qt.") (package (name "ledger") (version "3.1.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ledger/ledger/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12jlv3gsjhrja25q9hrwh73cdacd2l3c2yyn8qnijav9mdhnbw4h")) - (patches (search-patches "ledger-revert-boost-python-fix.patch" - "ledger-fix-uninitialized.patch")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ledger/ledger.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp")) + (patches (search-patches "ledger-revert-boost-python-fix.patch" + "ledger-fix-uninitialized.patch")))) (build-system cmake-build-system) (arguments `(#:modules ((guix build cmake-build-system) From 1fd71120a7f908ded489f058e2390cd062679ea9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Dec 2018 04:40:20 +0100 Subject: [PATCH 227/250] gnu: geierlein: Don't use unstable tarball. * gnu/packages/finance.scm (geierlein)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/finance.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 62747c8f55..8da49a0a87 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -252,16 +252,16 @@ in ability, and easy to use.") (version "0.9.13") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/stesie/geierlein" - "/archive/V" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/stesie/geierlein.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "11jfa7mxvvf0ldhx0hsvjbx3xwvzvn2wrfjpms8c7qmrnqhwh4wp")))) + (base32 "00zpwr3lk2vdmd60fgdwdk0xxs52wvnm19ln2m75yfphydvkglic")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; would require npm, python and a lot more + `(#:tests? #f ; would require npm, python and a lot more #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script From 39a7b7206545bd1ccedeccc9ff71ca787baf19a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Dec 2018 04:51:39 +0100 Subject: [PATCH 228/250] gnu: python-trezor-agent: Don't use unstable tarball. * gnu/packages/finance.scm (python-trezor-agent)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/finance.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8da49a0a87..ce67694cfe 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -590,13 +590,13 @@ Monero GUI client.") (version "0.9.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/romanz/trezor-agent/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/romanz/trezor-agent.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0h8jb147vpjk7mqbl4za0xdh7lblhx07n9dfk80kn2plwnvrry1x")))) + (base32 "15aaqk79d9y9nbsfznf2iscz12z5ispcj8kr8v5bc0sqqj2brs12")))) (build-system python-build-system) (arguments `(#:phases @@ -604,7 +604,7 @@ Monero GUI client.") (delete 'check) (add-after 'install 'check (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Make installed package available for running the tests + ;; Make installed package available for running the tests. (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs From a4880a27356f55db5959918ef7982b48e8ecb837 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:02:03 +0100 Subject: [PATCH 229/250] gnu: microscheme: Don't use unstable tarball. * gnu/packages/avr.scm (microscheme)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/avr.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index a84b43da6a..eaa3c7d046 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -138,18 +140,19 @@ C++.") (package (name "microscheme") (version "0.9.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ryansuchocki/" - "microscheme/archive/v" version ".tar.gz")) - (sha256 - (base32 - "1n404mh7z2icy3ga1mx249lk9x091k7idj6xpcf20hnmzabd0k0x")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ryansuchocki/microscheme.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:parallel-build? #f ; fails to build otherwise - #:tests? #f ; no tests + `(#:parallel-build? #f ; fails to build otherwise + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure)) From 782b1224ecb6808a524b9f9702ae5f324f4a5562 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:24:56 +0100 Subject: [PATCH 230/250] gnu: bspwm: Don't use unstable tarball. * gnu/packages/wm.scm (bspwm)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/wm.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b050b05656..fd89df0c16 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -108,14 +108,13 @@ nested include statements).") (version "0.9.5") (source (origin - (file-name (string-append name "-" version ".tar.gz")) - (method url-fetch) - (uri (string-append - "https://github.com/baskerville/bspwm/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/baskerville/bspwm.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "10pph8wxqysgk7b2h0svs0nwacn1a4y44jnzzry32pd1ysx92d97")))) + (base32 "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb) From 9c2b56a3772ec8b06de16c6be04ae3454ac4593e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:09:22 +0100 Subject: [PATCH 231/250] gnu: compton: Don't use unstable tarball. * gnu/packages/compton.scm (compton)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/compton.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm index dec9a94eba..c5b4c4ef5f 100644 --- a/gnu/packages/compton.scm +++ b/gnu/packages/compton.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 José Miguel Sánchez García +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,7 +20,7 @@ (define-module (gnu packages compton) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -38,15 +39,16 @@ (name "compton") (version (string-filter (char-set-complement (char-set #\_)) upstream-version)) - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/chjj/" name "/archive/v" - upstream-version ".tar.gz")) - (sha256 - (base32 - "02dhlqqcwnmlf2dxg7rd4lapgqahgndzixdkbpxicq9jawmdb73v")) - (file-name (string-append name "-" version "-checkout")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chjj/compton.git") + (commit (string-append "v" upstream-version)))) + (sha256 + (base32 + "0v65viilhnd2xgvmdpzc1srxszcg8kj1vhi5gy9292j48w0s2fx1")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("dbus" ,dbus) From 64430c87b6c6d3286fa25a0d4e00e29b60a5a54b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 04:57:25 +0100 Subject: [PATCH 232/250] gnu: rdesktop: Don't use NAME in source URI. * gnu/packages/rdesktop.scm (rdesktop)[source]: Hard-code name. --- gnu/packages/rdesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 3c8444b00a..777606d77f 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -49,8 +49,8 @@ (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/" name "/" name "/" version "/" - name "-" version ".tar.gz")) + "mirror://sourceforge/rdesktop/rdesktop/" version "/" + "rdesktop-" version ".tar.gz")) (sha256 (base32 "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8")))) From 7428d1693a281ee06e918310d95543da5349153e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 10:10:55 +0100 Subject: [PATCH 233/250] gnu: abiword: Don't use NAME in source URI. * gnu/packages/abiword.scm (abiword)[source]: Hard-code name. --- gnu/packages/abiword.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 02f132f6f0..9d8c253a62 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,8 +52,8 @@ (origin (method url-fetch) (uri - (string-append "https://www.abisource.com/downloads/" name "/" version - "/source/" name "-" version ".tar.gz")) + (string-append "https://www.abisource.com/downloads/abiword/" version + "/source/abiword-" version ".tar.gz")) (sha256 (base32 "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg")) (patches From 051ae68b7a5081afa1e0cc6dfdee245220b36911 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 19:53:33 +0100 Subject: [PATCH 234/250] gnu: libraw: Update to 0.19.2. * gnu/packages/photo.scm (libraw): Update to 0.19.2. --- gnu/packages/photo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index c7bb9afe29..15857c6cad 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; ;;; This file is part of GNU Guix. @@ -70,14 +70,14 @@ (define-public libraw (package (name "libraw") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452")))) + "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From a1785cfb6d198b960dcf19866203b5e2ab808116 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 21:18:50 +0100 Subject: [PATCH 235/250] gnu: gcab: Update to 1.2. * gnu/packages/package-management.scm (gcab): Update to 1.2. [source]: Remove snippet. --- gnu/packages/package-management.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c3b195a64f..07665e3579 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu @@ -836,23 +836,14 @@ on top of GNU Guix.") (define-public gcab (package (name "gcab") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr")) - ;; gcab 1.1 has a hard dependency on git — even when building - ;; from a tarball. Remove it early so ‘guix environment gcab’ - ;; can actually build what ‘guix build --source gcab’ returns. - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "meson.build" - (("git_version = .*$") "git_version = []\n")) - #t)))) + "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums From 41eac1863a0b7fe98e632f8dd49cb77b0b547632 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 21:19:35 +0100 Subject: [PATCH 236/250] gnu: gcab: Don't use NAME in source URI. * gnu/packages/package-management.scm (gcab)[source]: Hard-code name. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 07665e3579..2e69cd151e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -839,8 +839,8 @@ on top of GNU Guix.") (version "1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://gnome/sources/gcab/" + version "/gcab-" version ".tar.xz")) (sha256 (base32 "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas")))) From a139501887ae65576a052517782af9e8b2573643 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 21:20:05 +0100 Subject: [PATCH 237/250] gnu: perl-compress-raw-bzip2: Update to 2.084. * gnu/packages/perl-compression.scm (perl-compress-raw-bzip2): Update to 2.084. --- gnu/packages/perl-compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index 477f686755..1bc70fb264 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2019 Efraim Flashner ;;; @@ -34,7 +34,7 @@ (define-public perl-compress-raw-bzip2 (package (name "perl-compress-raw-bzip2") - (version "2.081") + (version "2.084") (source (origin (method url-fetch) @@ -42,7 +42,7 @@ "Compress-Raw-Bzip2-" version ".tar.gz")) (sha256 (base32 - "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6")))) + "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx")))) (build-system perl-build-system) ;; TODO: Use our bzip2 package. (home-page "https://metacpan.org/release/Compress-Raw-Bzip2") From b2993cb1e0b30d0ce88f37d8b20c410ba8e75a8f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 21:20:17 +0100 Subject: [PATCH 238/250] gnu: perl-compress-raw-zlib: Update to 2.084. * gnu/packages/perl-compression.scm (perl-compress-raw-zlib): Update to 2.084. --- gnu/packages/perl-compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index 1bc70fb264..ce185e6552 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -54,7 +54,7 @@ compression library.") (define-public perl-compress-raw-zlib (package (name "perl-compress-raw-zlib") - (version "2.081") + (version "2.084") (source (origin (method url-fetch) @@ -62,7 +62,7 @@ compression library.") "Compress-Raw-Zlib-" version ".tar.gz")) (sha256 (base32 - "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1")))) + "0vv69a8kjx64cxhjgaccidy2yyij2j3aqlrv1r0dwa1fl9xijpim")))) (build-system perl-build-system) (inputs `(("zlib" ,zlib))) From 1482531cd7d0f1f7e565207240affb68dd822e17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Feb 2019 21:20:30 +0100 Subject: [PATCH 239/250] gnu: perl-io-compress: Update to 2.084. * gnu/packages/perl-compression.scm (perl-io-compress): Update to 2.084. --- gnu/packages/perl-compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index ce185e6552..ea71492262 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -90,7 +90,7 @@ compression library.") (define-public perl-io-compress (package (name "perl-io-compress") - (version "2.081") + (version "2.084") (source (origin (method url-fetch) @@ -98,7 +98,7 @@ compression library.") "IO-Compress-" version ".tar.gz")) (sha256 (base32 - "1na66ns1g3nni0m9q5494ym4swr21hfgpv88mw8wbj2daiswf4aj")))) + "1dbdsxhbikmbbfsdam3crv8474l8ax6d9d7r3s6safk4v8z51g8x")))) (build-system perl-build-system) (propagated-inputs `(("perl-compress-raw-zlib" ,perl-compress-raw-zlib) ; >=2.081 From 41313acebf39e04c9ddd0857b8cd8b69991c88c3 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 31 Jan 2019 23:03:35 -0600 Subject: [PATCH 240/250] gnu: openmpi: Upgrade to 4.0.0. * gnu/packages/linux.scm (psm)[arguments]: Add 'patch-sysmacros phase to fix "undefined reference to `minor'" errors while linking against libinfinipath.so. * gnu/packages/mpi.scm (openmpi): Upgrade to 4.0.0. [inputs]: Add libevent. [arguments]: Simplify configure-flags. Use system libevent. Adjust romio version strings. (%openmpi-setup): Use OMPI_MCA_rmaps_base_mapping_policy for oversubscription. --- gnu/packages/linux.scm | 7 +++++++ gnu/packages/mpi.scm | 29 +++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1dfb7f701..66a1ad4508 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4717,6 +4717,13 @@ libraries, which are often integrated directly into libfabric.") (string-append %output "/include"))) (substitute* "Makefile" (("/lib64") "/lib")) + #t)) + (add-after 'unpack 'patch-sysmacros + (lambda _ + (substitute* "ipath/ipath_proto.c" + (("#include " m) + (string-append m "\n" + "#include "))) #t))))) (synopsis "Intel Performance Scaled Messaging (PSM) Libraries") (description diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 1f69a04bc9..0a43c55b7a 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2018 Eric Bavier +;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge @@ -33,6 +33,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) #:use-module (gnu packages xorg) @@ -157,7 +158,7 @@ bind processes, and much more.") (define-public openmpi (package (name "openmpi") - (version "3.0.1") + (version "4.0.0") (source (origin (method url-fetch) @@ -166,12 +167,13 @@ bind processes, and much more.") "/downloads/openmpi-" version ".tar.bz2")) (sha256 (base32 - "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36")))) + "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg")))) (build-system gnu-build-system) (inputs `(("hwloc" ,hwloc "lib") ("gfortran" ,gfortran) ("libfabric" ,libfabric) + ("libevent" ,libevent) ,@(if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems psm))) `(("psm" ,psm)) @@ -191,16 +193,11 @@ bind processes, and much more.") `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work "--enable-memchecker" "--with-sge" - - ;; VampirTrace is obsoleted by scorep and disabling - ;; it reduces the closure size considerably. - "--disable-vt" - - ,(string-append "--with-valgrind=" - (assoc-ref %build-inputs "valgrind")) - ,(string-append "--with-hwloc=" - (assoc-ref %build-inputs "hwloc")) - + "--with-psm" + "--with-psm2" + "--with-valgrind" + "--with-hwloc=external" + "--with-libevent" ;; Enable support for SLURM's Process Manager ;; Interface (PMI). ,(string-append "--with-pmi=" @@ -219,8 +216,8 @@ bind processes, and much more.") (("_ABSOLUTE") "")) ;; Avoid valgrind (which pulls in gdb etc.). (substitute* - '("./ompi/mca/io/romio314/src/io_romio314_component.c") - (("MCA_io_romio314_COMPLETE_CONFIGURE_FLAGS") + '("./ompi/mca/io/romio321/src/io_romio321_component.c") + (("MCA_io_romio321_COMPLETE_CONFIGURE_FLAGS") "\"[elided to reduce closure]\"")) #t)) (add-before 'build 'scrub-timestamps ;reproducibility @@ -270,7 +267,7 @@ only provides @code{MPI_THREAD_FUNNELED}."))) (setenv "OMPI_MCA_plm_rsh_agent" (which "false")) ;; Allow oversubscription in case there are less physical cores available ;; in the build environment than the package wants while testing. - (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + (setenv "OMPI_MCA_rmaps_base_mapping_policy" "core:OVERSUBSCRIBE") #t)) (define-public python-mpi4py From 68a116bd561ec92b0ffdfe9add9e7c6cda222723 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 9 Feb 2019 00:45:47 -0600 Subject: [PATCH 241/250] gnu: cool-retro-term: Upgrade to 1.1.1. * gnu/packages/terminals.scm (cool-retro-term)[source]: Upgrade to 1.1.1. Remove patches. Adjust filtering in snippet for added/removed fonts. [arguments]: Return #t in 'add-alternate-name' phase. * gnu/packages/patches/cool-retro-term-dont-check-uninit-member.patch, gnu/packages/patches/cool-retro-term-fix-array-size.patch, gnu/packages/patches/cool-retro-term-memory-leak-1.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 3 -- ...-retro-term-dont-check-uninit-member.patch | 33 ------------------- .../cool-retro-term-fix-array-size.patch | 25 -------------- .../cool-retro-term-memory-leak-1.patch | 32 ------------------ gnu/packages/terminals.scm | 24 ++++++-------- 5 files changed, 10 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/cool-retro-term-dont-check-uninit-member.patch delete mode 100644 gnu/packages/patches/cool-retro-term-fix-array-size.patch delete mode 100644 gnu/packages/patches/cool-retro-term-memory-leak-1.patch diff --git a/gnu/local.mk b/gnu/local.mk index f1bcef2a68..81d2eacd78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -696,9 +696,6 @@ dist_patch_DATA = \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch \ - %D%/packages/patches/cool-retro-term-fix-array-size.patch \ - %D%/packages/patches/cool-retro-term-memory-leak-1.patch \ %D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ diff --git a/gnu/packages/patches/cool-retro-term-dont-check-uninit-member.patch b/gnu/packages/patches/cool-retro-term-dont-check-uninit-member.patch deleted file mode 100644 index c6e1d27315..0000000000 --- a/gnu/packages/patches/cool-retro-term-dont-check-uninit-member.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 126a97d1f22f7d784d392b2b7d5aadf0a4e18c0d Mon Sep 17 00:00:00 2001 -From: Petter -Date: Thu, 27 Apr 2017 20:28:02 +0200 -Subject: [PATCH] Avoid checking uninitialized member + simplify condition - ---- - qmltermwidget/lib/TerminalDisplay.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/qmltermwidget/lib/TerminalDisplay.cpp b/qmltermwidget/lib/TerminalDisplay.cpp -index 189a609..36d2cd2 100644 ---- a/qmltermwidget/lib/TerminalDisplay.cpp -+++ b/qmltermwidget/lib/TerminalDisplay.cpp -@@ -325,6 +325,7 @@ TerminalDisplay::TerminalDisplay(QQuickItem *parent) - ,_terminalSizeHint(false) - ,_terminalSizeStartup(true) - ,_bidiEnabled(false) -+,_mouseMarks(false) - ,_actSel(0) - ,_wordSelectionMode(false) - ,_lineSelectionMode(false) -@@ -1846,7 +1847,7 @@ void TerminalDisplay::mousePressEvent(QMouseEvent* ev) - } - else if ( ev->button() == Qt::MidButton ) - { -- if ( _mouseMarks || (!_mouseMarks && (ev->modifiers() & Qt::ShiftModifier)) ) -+ if ( _mouseMarks || (ev->modifiers() & Qt::ShiftModifier) ) - emitSelection(true,ev->modifiers() & Qt::ControlModifier); - else - emit mouseSignal( 1, charColumn +1, charLine +1 +_scrollBar->value() -_scrollBar->maximum() , 0); --- -2.12.2 - diff --git a/gnu/packages/patches/cool-retro-term-fix-array-size.patch b/gnu/packages/patches/cool-retro-term-fix-array-size.patch deleted file mode 100644 index 04a2a27971..0000000000 --- a/gnu/packages/patches/cool-retro-term-fix-array-size.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c91d7ae5dbb00c8392a9f93283dc56c3e296cccd Mon Sep 17 00:00:00 2001 -From: Petter -Date: Thu, 27 Apr 2017 20:19:21 +0200 -Subject: [PATCH] Fix size of the array passed to memset() - ---- - qmltermwidget/lib/History.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmltermwidget/lib/History.cpp b/qmltermwidget/lib/History.cpp -index 0f9c13f..ab6f7be 100644 ---- a/qmltermwidget/lib/History.cpp -+++ b/qmltermwidget/lib/History.cpp -@@ -515,7 +515,7 @@ void HistoryScrollBlockArray::addCells(const Character a[], int count) - // put cells in block's data - assert((count * sizeof(Character)) < ENTRIES); - -- memset(b->data, 0, ENTRIES); -+ memset(b->data, 0, sizeof(b->data)); - - memcpy(b->data, a, count * sizeof(Character)); - b->size = count * sizeof(Character); --- -2.12.2 - diff --git a/gnu/packages/patches/cool-retro-term-memory-leak-1.patch b/gnu/packages/patches/cool-retro-term-memory-leak-1.patch deleted file mode 100644 index f3fbac17de..0000000000 --- a/gnu/packages/patches/cool-retro-term-memory-leak-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 08628fda19128b75248548357e416bc373f14f91 Mon Sep 17 00:00:00 2001 -From: Yen Chi Hsuan -Date: Sat, 18 Mar 2017 02:50:34 +0800 -Subject: [PATCH] Fix memory leak in hotspot (URLs & emails) detection - ---- - qmltermwidget/lib/Filter.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/qmltermwidget/lib/Filter.cpp b/qmltermwidget/lib/Filter.cpp -index 5ca7bee..2e8d2fb 100644 ---- a/qmltermwidget/lib/Filter.cpp -+++ b/qmltermwidget/lib/Filter.cpp -@@ -26,6 +26,7 @@ - // Qt - #include - #include -+#include - #include - #include - #include -@@ -194,6 +195,7 @@ Filter::~Filter() - } - void Filter::reset() - { -+ qDeleteAll(_hotspotList); - _hotspots.clear(); - _hotspotList.clear(); - } --- -2.12.2 - diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 7f52c6efd4..1c38cb3834 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Gabriel Hondet ;;; Copyright © 2019 Rutger Helling +;;; Copyright © 2018, 2019 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -472,11 +473,11 @@ embedded kernel situations.") (license license:expat))) (define-public cool-retro-term - (let ((commit "dd799cf5c0eda92cf44f3938c0c2dcae5651a99e") - (revision "1")) + (let ((commit "1.1.1") + (revision "0")) ;not used currently (package (name "cool-retro-term") - (version (string-append "1.0.1-" revision "." (string-take commit 7))) + (version "1.1.1") (source (origin (method git-fetch) (file-name (string-append name "-" version "-checkout")) @@ -485,11 +486,7 @@ embedded kernel situations.") (commit commit) (recursive? #t))) (sha256 - (base32 "08mrvj8zk9ck15q90ipjzza1acnnsjhprv2rxg8yyck0xl9p40jd")) - (patches - (search-patches "cool-retro-term-fix-array-size.patch" - "cool-retro-term-dont-check-uninit-member.patch" - "cool-retro-term-memory-leak-1.patch")) + (base32 "0wb6anchxa5jpn9c73kr4byrf2xlj8x8qzc5x7ny6saj7kbbvp75")) (modules '((guix build utils) (srfi srfi-1) (srfi srfi-26) @@ -497,20 +494,18 @@ embedded kernel situations.") (ice-9 regex))) (snippet '(let* ((fonts '(;"1971-ibm-3278" ; BSD 3-clause - ;"1975-knight-tv" ; GPL "1977-apple2" ; Non-Free "1977-commodore-pet" ; Non-Free "1979-atari-400-800" ; Non-Free - "1982-commodore64" ; Non-Free - "1985-atari-st" ; ? - "1985-ibm-pc-vga" ; Unclear + ;"1981-ibm-pc ; CC-SA 4.0 + "1982-commodore64")) ; Non-Free + ;"1985-ibm-pc-vga" ; CC-SA 4.0 ;"modern-fixedsys-excelsior" ; Redistributable ;"modern-hermit" ; SIL ;"modern-inconsolata"; SIL ;"modern-pro-font-win-tweaked" ; X11 ;"modern-proggy-tiny"; X11 ;"modern-terminus" ; SIL - "modern-monaco")) ; Apple Non-Free (name-rx (make-regexp " *name: *\"([^\"]*)\"")) (source-rx (make-regexp " *source: \"fonts/([^/]*)[^\"]*\"")) (fontname-rx (make-regexp "\"fontName\":\"([^\"]*).*")) @@ -626,7 +621,8 @@ embedded kernel situations.") (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (symlink (string-append bin "/cool-retro-term") - (string-append bin "/crt"))))) + (string-append bin "/crt")) + #t))) (add-after 'install 'install-man (lambda* (#:key outputs #:allow-other-keys) (let ((mandir (string-append (assoc-ref outputs "out") From 722ac64cd7dc1f09fb77e2ae780427fa13c03110 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 9 Feb 2019 13:40:12 +0530 Subject: [PATCH 242/250] gnu: plantuml: Update to 1.2019.0. * gnu/packages/uml.scm (plantuml): Update to 1.2019.0. --- gnu/packages/uml.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index d598ac04c7..b49a85d932 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Theodoros Foradis +;;; Copyright © 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,15 +29,14 @@ (define-public plantuml (package (name "plantuml") - (version "8048") + (version "1.2019.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/plantuml/plantuml-" - version ".tar.gz")) + (uri (string-append "mirror://sourceforge/plantuml/" + version "/plantuml-" version ".tar.gz")) (sha256 (base32 - "1vipxd6p7isb1k1qqh4hrpfcj27hx1nll2yp0rfwpvps1w2d936i")))) + "0mws7g0w3fn0wxizccg2iqisq9ljkn95i5qf8ma07lbw3nj0h48n")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests From 0ea0452c0a36fbf6349628e5a5792a707706ec18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Dec 2018 15:00:36 +0100 Subject: [PATCH 243/250] gnu: Add xbanish. * gnu/packages/xdisorg.scm (xbanish): New public variable. --- gnu/packages/xdisorg.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4d61dd8dbc..5f01c8c6a6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2019 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Nils Gillmann @@ -641,6 +641,36 @@ to find buttons, etc, on the screen to click on.") (home-page "https://www.hoopajoo.net/projects/xautomation.html") (license license:gpl2+))) +(define-public xbanish + (package + (name "xbanish") + (version "1.6") + (home-page "https://github.com/jcs/xbanish") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("libx11" ,libx11) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxt" ,libxt))) + (synopsis "Banish the mouse cursor") + (description + "@command{xbanish} hides the mouse cursor when you start typing, and +shows it again when the mouse cursor moves or a mouse button is pressed.") + (license license:bsd-3))) + (define-public xlockmore (package (name "xlockmore") From 4a3436449b5ccfb8455c0023baaa0a1bf5fdab39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Dec 2018 23:56:12 +0100 Subject: [PATCH 244/250] gnu: offlineimap: Remove redundant wrapper. * gnu/packages/mail.scm (offlineimap)[arguments]: Remove phase 'wrap-binary'. --- gnu/packages/mail.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4f2c1c31e7..6c2f66e0ca 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -525,13 +525,6 @@ and corrections. It is based on a Bayesian filter.") (man (string-append out "/share/man"))) (install-file "docs/offlineimap.1" (string-append man "/man1")) (install-file "docs/offlineimapui.7" (string-append man "/man7")) - #t))) - (add-after 'install-documentation 'wrap-binary - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/offlineimap"))) - (wrap-program bin - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) #t)))))) (home-page "https://www.offlineimap.org") (synopsis "Sync emails between two repositories") From 037d59136763c03243e76ebe5d6e40bed6653333 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 17:15:13 +0100 Subject: [PATCH 245/250] gnu: libvpx: Update to 1.8.0. * gnu/packages/patches/gst-plugins-good-libvpx-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (libvpx): Update to 1.8.0. [source](patches): Remove obsolete patch. (libvpx-1.7): New public variable. * gnu/packages/gnuzilla.scm (icecat)[inputs]: Use LIBVPX-1.7 instead of LIBVPX. * gnu/packages/gstreamer.scm (gst-plugins-good)[source](patches): New field. [arguments]: Add #:make-flags. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 2 +- gnu/packages/gstreamer.scm | 4 +- .../gst-plugins-good-libvpx-compat.patch | 58 +++++++++++++++++++ gnu/packages/video.scm | 28 +++++++-- 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/gst-plugins-good-libvpx-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1ea8069308..cf8d29e4ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -845,6 +845,7 @@ dist_patch_DATA = \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ + %D%/packages/patches/gst-plugins-good-libvpx-compat.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-default-utf8.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ef88510a2a..1f299a2b13 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -827,7 +827,7 @@ from forcing GEXP-PROMISE." ("libxt" ,libxt) ("libffi" ,libffi) ("ffmpeg" ,ffmpeg) - ("libvpx" ,libvpx) + ("libvpx" ,libvpx-1.7) ("icu4c" ,icu4c) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 755904231b..48a4dffa46 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -216,6 +216,7 @@ for the GStreamer multimedia library.") (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) + (patches (search-patches "gst-plugins-good-libvpx-compat.patch")) (sha256 (base32 "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz")))) @@ -249,7 +250,8 @@ for the GStreamer multimedia library.") ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) (arguments - `(#:phases + `(#:make-flags '("CFLAGS=-DHAVE_VPX_1_8") ;XXX: Remove for >1.14. + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests diff --git a/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch b/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch new file mode 100644 index 0000000000..8306c79e56 --- /dev/null +++ b/gnu/packages/patches/gst-plugins-good-libvpx-compat.patch @@ -0,0 +1,58 @@ +Fix build with libvpx 1.8. + +Taken from this upstream commit: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/b6e6f1ae73375ef66a5748069843aaed1a83e6a6 + +Note: Remove the HAVE_VPX_1_8 build flag with this patch. It was added +to avoid re-creating the configure script. + +diff --git a/configure.ac b/configure.ac +index 5e4cff126..8c20e5081 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ + AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) + ], [true]) + ++ PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [ ++ AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger]) ++ ], [true]) ++ + LIBS="$OLD_LIBS" + CFLAGS="$OLD_CFLAGS" + fi +diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c +index c3f0f625f..da4322513 100644 +--- a/ext/vpx/gstvpxdec.c ++++ b/ext/vpx/gstvpxdec.c +@@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) + {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, + {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, + {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, ++#ifndef HAVE_VPX_1_8 + {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), + "Print frame information", + "visualize-frame-info"}, +@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) + {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), + "Print video rate info", + "visualize-rate-info"}, ++#endif + {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, + {0, NULL, NULL} + }; +diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build +index 6ed440728..0d2340b32 100644 +--- a/ext/vpx/meson.build ++++ b/ext/vpx/meson.build +@@ -48,6 +48,10 @@ if vpx_dep.found() + vpx_args += '-DHAVE_VPX_1_4' + endif + ++ if dependency('vpx', version : '>=1.8.0', required : false).found() ++ vpx_args += '-DHAVE_VPX_1_8' ++ endif ++ + gstvpx = library('gstvpx', + vpx_sources, + c_args : gst_plugins_good_args + vpx_args, diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f98b6e796c..c0f439ea93 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Roel Janssen -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley @@ -1301,7 +1301,7 @@ access to mpv's powerful playback capabilities.") (define-public libvpx (package (name "libvpx") - (version "1.7.0") + (version "1.8.0") (source (origin ;; XXX: Upstream does not provide tarballs for > 1.6.1. (method git-fetch) @@ -1311,9 +1311,8 @@ access to mpv's powerful playback capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches (search-patches "libvpx-use-after-free-in-postproc.patch" - "libvpx-CVE-2016-2818.patch")))) + "079pb80am08lj8y5rx99vdr99mdqis9067f172zq12alkz849n93")) + (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-shared" @@ -1338,6 +1337,25 @@ access to mpv's powerful playback capabilities.") (license license:bsd-3) (home-page "https://www.webmproject.org/"))) +;; GNU IceCat fails to build against 1.8.0, so keep this version for now. +(define-public libvpx-1.7 + (package + (inherit libvpx) + (version "1.7.0") + (source (origin + (inherit (package-source libvpx)) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit (string-append "v" version)))) + (file-name (git-file-name "libvpx" version)) + (sha256 + (base32 + "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) + (patches + (append + (origin-patches (package-source libvpx)) + (search-patches "libvpx-use-after-free-in-postproc.patch"))))))) + (define-public youtube-dl (package (name "youtube-dl") From 9d51a978099aabcd406157ee3495fdb8c3f4fb84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 17:22:11 +0100 Subject: [PATCH 246/250] gnu: webkitgtk: Update to 2.22.6. * gnu/packages/webkit.scm (webkitgtk-2.22): Update to 2.22.6. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 73cd510981..91c6c7d02a 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -168,14 +168,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.22 (package/inherit webkitgtk (name "webkitgtk") - (version "2.22.5") + (version "2.22.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "04ybyvaz5xhfkd2k65pc0sqizngjvd82j1p56wz3lz4a84zqdlwr")))) + "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) From 44ed6284669d65307d90ac6dea90cf5067def3e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 20:21:01 +0100 Subject: [PATCH 247/250] gnu: tracker: Build against the regular SQLite. FTS5 is enabled by default in the current version. * gnu/packages/sqlite.scm (sqlite-with-fts5): Remove variable. * gnu/packages/gnome.scm (tracker)[inputs]: Change from that to SQLITE. --- gnu/packages/gnome.scm | 2 +- gnu/packages/sqlite.scm | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3ea1cf5978..850bfcf5e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5747,7 +5747,7 @@ easy, safe, and automatic.") ("dbus" ,dbus) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("sqlite" ,sqlite-with-fts5) + ("sqlite" ,sqlite) ("nettle" ,nettle) ; XXX why is this needed? ("poppler" ,poppler) ("libgsf" ,libgsf) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 5e5bbd8fb6..05d7ce6b92 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -103,15 +103,6 @@ is in the public domain.") (base32 "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))))) -;; This is used by Tracker. -(define-public sqlite-with-fts5 - (package/inherit sqlite - (name "sqlite-with-fts5") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(cons "--enable-fts5" ,flags)))))) - ;; This is used by Qt. (define-public sqlite-with-column-metadata (package/inherit sqlite From 2c7a28ecce73b70fd137733b8be5d4f1d13a4c21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 20:48:13 +0100 Subject: [PATCH 248/250] gnu: notmuch: Update to 0.28.1. * gnu/packages/mail.scm (notmuch): Update to 0.28.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6c2f66e0ca..8ae069ba52 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -757,14 +757,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.28") + (version "0.28.1") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.gz")) (sha256 (base32 - "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc")))) + "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) From 809f003f1595d3486ca24f1955b4b0fd0b05fcc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:35:02 +0100 Subject: [PATCH 249/250] gnu: python-configparser: Update home page. * gnu/packages/python-xyz.scm (python-configparser)[home-page]: Set to source repository. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2b348942d..f047a5c316 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11400,7 +11400,7 @@ of @code{functools.lru_cache} from python 3.3.") (base32 "0waq40as14abwzbb321hfz4vr1fi363nscy32ga14qvfygrg96wa")))) (build-system python-build-system) - (home-page "http://docs.python.org/py3k/library/configparser.html") + (home-page "https://github.com/jaraco/configparser/") (synopsis "Backport of configparser from python 3.5") (description "@code{python-configparser} is a backport of @code{configparser} from Python 3.5 so that it can be used directly From aefa29123feaf4202010675eae0a563b3ee90cf1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 19:50:07 +0100 Subject: [PATCH 250/250] gnu: python-pytest: Update home page. * gnu/packages/check.scm (python-pytest)[home-page]: Follow redirects to https://docs.pytest.org/en/latest/. --- gnu/packages/check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 64af7ea097..7550586c1f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -672,7 +672,7 @@ standard library.") ("python-mock" ,python-mock) ("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "http://pytest.org") + (home-page "https://docs.pytest.org/en/latest/") (synopsis "Python testing library") (description "Pytest is a testing tool that provides auto-discovery of test modules