From e7a5d40e243c0e8e93851cf99a4e4582bfbed46e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:04:10 +0100 Subject: gnu: gtk+: Update to 3.22.29. * gnu/packages/gtk.scm (gtk+): Update to 3.22.29. --- 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 f279c5c245..9a25d848a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -659,7 +659,7 @@ (define-public gtk+ (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.22.28") + (version "3.22.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -667,7 +667,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "07syy63d2q12b7mkbhqpirq270365fsql5l9qsrdgzlc04mn36fj")) + "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From 457f6f262b00d56b8d0407bbc4e2cef3e925c081 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:08:53 +0100 Subject: gnu: libxkbcommon: Update to 0.8.0. * gnu/packages/xdisorg.scm (libxkbcommon): Update to 0.8.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 6663a0e746..0ea8c9c2a6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -157,14 +157,14 @@ (define-public xclip (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "12z6hih3n1r0asp2hzp9qsiwdfkfz46jwp06x8kprr0r5rfk0nds")))) + "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 12c77137ebeb14a33aed34939d91e3d8f31644ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:10:01 +0100 Subject: gnu: mesa: Update to 17.3.7. * gnu/packages/gl.scm (mesa): Update to 17.3.7. --- 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 79cbf71168..6eb6737541 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.3.6") + (version "17.3.7") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1y7vawz2sbpzdqk4b60w8kfrxb2rfkdjkifyxxfx1jaasj05d4g5")) + "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) -- cgit v1.2.3 From bbdf2761f595da7830570fb93dca6aaca1815e90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:17:04 +0100 Subject: gnu: meson: Update to 0.45.1. * gnu/packages/build-tools.scm (meson): Update to 0.45.1. --- 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 b1534e09a4..a09b3b3fb4 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -71,7 +71,7 @@ (define-public bam (define-public meson (package (name "meson") - (version "0.45.0") + (version "0.45.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -79,7 +79,7 @@ (define-public meson version ".tar.gz")) (sha256 (base32 - "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l")))) + "1yqa4337nb8w92bvr91rsxmn0xkf7pmdybq9ljvnqmdvn7dv02sd")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From a53f4311a1e9bf2f1e863a5d49ae2316b96fe469 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Mar 2018 15:41:11 +0100 Subject: gnu: gstreamer: Update to 1.14.0. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.14.0. (gst-plugins-base): Likewise. [inputs]: Move ORC ... [propagated-inputs]: ... here. Add GLIB. --- gnu/packages/gstreamer.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4ec5765bb1..d91657076b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -100,7 +100,7 @@ (define-public orc (define-public gstreamer (package (name "gstreamer") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -109,7 +109,7 @@ (define-public gstreamer version ".tar.xz")) (sha256 (base32 - "0x06jxmc5fhlz7cr1pl5lp0hm1jgz519jjic37d09srf9jm091ss")))) + "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -148,7 +148,7 @@ (define-public gstreamer (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -156,15 +156,16 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "10i255q7i8an1hxz3szb36x1jcs9nfdy511pj2wg24h2vw1nnc2c")))) + "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs - `(("gstreamer" ,gstreamer))) ; required by gstreamer-plugins-base-1.0.pc + `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc + ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc + ("orc" ,orc))) ;required by gstreamer-audio-1.0.pc (inputs `(("cdparanoia" ,cdparanoia) ("opus" ,opus) - ("orc" ,orc) ("pango" ,pango) ("libogg" ,libogg) ("libtheora" ,libtheora) @@ -176,7 +177,7 @@ (define-public gst-plugins-base ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments @@ -199,11 +200,10 @@ (define-public gst-plugins-base for the GStreamer multimedia library.") (license license:lgpl2.0+))) - (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -212,7 +212,7 @@ (define-public gst-plugins-good name "-" version ".tar.xz")) (sha256 (base32 - "0mxrbrqrfq1946gn9im19maj7ivld4k946vkwrzd94h8qsz4k7v4")))) + "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -262,18 +262,18 @@ (define-public gst-plugins-good (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "021d3q81m968lpnah517sfclagadcqwd6jz3lqdmqvb82sz5fy0c")))) + "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments - '(#:tests? #f ; XXX: 18 of 65 tests fail + '(#:tests? #f ; XXX: 13 of 53 tests fail #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") @@ -338,7 +338,7 @@ (define-public gst-plugins-bad (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) @@ -346,7 +346,7 @@ (define-public gst-plugins-ugly name "/" name "-" version ".tar.xz")) (sha256 (base32 - "08p5kggk1szvr76cdbx3q3yfc235w1przb76v2n51lwfi26mn5hw")))) + "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -377,7 +377,7 @@ (define-public gst-plugins-ugly (define-public gst-libav (package (name "gst-libav") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append @@ -385,7 +385,7 @@ (define-public gst-libav name "-" version ".tar.xz")) (sha256 (base32 - "0qly3lgamm36xql9q7wg5751gi6j2d3ifzz1pkr15ncc5mfslmia")))) + "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") @@ -415,7 +415,7 @@ (define-public gst-libav (define-public python-gst (package (name "python-gst") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append @@ -423,7 +423,7 @@ (define-public python-gst "gst-python-" version ".tar.xz")) (sha256 (base32 - "1sm3dy10klf6i3w6a6mz0rnm29l2lxci5hr8346496jwc7v6mki0")))) + "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. -- cgit v1.2.3 From 3a7597e4147235781d43ba9cef7a52ced9ea5e7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 22:06:22 +0200 Subject: build-system/meson: Use 'target-arm32?' for armhf-linux case. * guix/build-system/meson.scm (lower, meson-build): Replace armhf-linux detection with 'target-arm32?' macro. --- guix/build-system/meson.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 529a2b8b0f..88a7b58286 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -86,8 +86,7 @@ (define private-keywords ;; to avoid superfluous entries in RUNPATH as described ;; in , so armhf may now ;; have different runtime dependencies from other arches. - ,@(if (not (string-prefix? "arm" (or (%current-target-system) - (%current-system)))) + ,@(if (not (target-arm32?)) `(("patchelf" ,(default-patchelf))) '()) ,@native-inputs)) @@ -148,8 +147,7 @@ (define builder #:search-paths ',(map search-path-specification->sexp search-paths) #:phases - (if (string-prefix? "arm" ,(or (%current-target-system) - (%current-system))) + (if (target-arm32?) (modify-phases build-phases (delete 'fix-runpath)) build-phases) #:configure-flags ,configure-flags -- cgit v1.2.3 From 919034068ecca6cd16b110fa44246bfe758f984e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Mar 2018 20:32:48 +0200 Subject: Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case." This reverts commit 3a7597e4147235781d43ba9cef7a52ced9ea5e7a. --- guix/build-system/meson.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 88a7b58286..529a2b8b0f 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -86,7 +86,8 @@ (define private-keywords ;; to avoid superfluous entries in RUNPATH as described ;; in , so armhf may now ;; have different runtime dependencies from other arches. - ,@(if (not (target-arm32?)) + ,@(if (not (string-prefix? "arm" (or (%current-target-system) + (%current-system)))) `(("patchelf" ,(default-patchelf))) '()) ,@native-inputs)) @@ -147,7 +148,8 @@ (define builder #:search-paths ',(map search-path-specification->sexp search-paths) #:phases - (if (target-arm32?) + (if (string-prefix? "arm" ,(or (%current-target-system) + (%current-system))) (modify-phases build-phases (delete 'fix-runpath)) build-phases) #:configure-flags ,configure-flags -- cgit v1.2.3 From c5154b37ac93268a8acfc68688e9858a8af44a00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:14:29 +0200 Subject: gnu: nss, nss-certs: Update to 3.36.1. * gnu/packages/gnuzilla.scm (nss): Update to 3.36.1. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 3cbf9202f9..b4c09c7750 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -75,7 +75,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.36") + (version "3.36.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -86,7 +86,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")))) + "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7d2ecd27d7..4a8f18a2e4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.36") + (version "3.36.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -297,7 +297,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")) + "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3 From ed471e68487062c9cba8657eea9fdeafe64de35d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:17:23 +0200 Subject: gnu: mesa: Update to 17.3.8. * gnu/packages/gl.scm (mesa): Update to 17.3.8. --- 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 6eb6737541..db02d798f5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "17.3.7") + (version "17.3.8") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585")) + "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) -- cgit v1.2.3 From 45c053ac763d8a14454d5478de9962f6bbe87676 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:20:07 +0200 Subject: gnu: alsa-lib: Update to 1.1.6. * gnu/packages/linux.scm (alsa-lib): Update to 1.1.6. --- 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 5193385414..ae5dbdc1ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -986,7 +986,7 @@ (define-public ltrace (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append @@ -994,7 +994,7 @@ (define-public alsa-lib version ".tar.bz2")) (sha256 (base32 - "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl")))) + "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z")))) (build-system gnu-build-system) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") -- cgit v1.2.3 From 7ff0577020ea2bca0c34ea461dc6b730e6e74055 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:22:04 +0200 Subject: gnu: alsa-utils: Update to 1.1.6. * gnu/packages/linux.scm (alsa-utils): Update to 1.1.6. --- 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 ae5dbdc1ce..c91e8ca8b3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1006,14 +1006,14 @@ (define-public alsa-lib (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj")))) + "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. -- cgit v1.2.3 From 6c69d24daf90966149f981dae360e4c191683de8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:22:26 +0200 Subject: gnu: alsa-plugins: Update to 1.1.6. * gnu/packages/linux.scm (alsa-plugins): Update to 1.1.6. --- 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 c91e8ca8b3..5790527c84 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1053,14 +1053,14 @@ (define-public alsa-utils (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr")))) + "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg")))) (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. -- cgit v1.2.3 From f6a6a050eae08df1fc39c2ecc9733aacf054356f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:27:44 +0200 Subject: gnu: atk: Update to 2.28.1. * gnu/packages/gtk.scm (atk): Update to 2.28.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 9a25d848a4..001c149f17 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -77,7 +77,7 @@ (define-module (gnu packages gtk) (define-public atk (package (name "atk") - (version "2.26.1") + (version "2.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -85,7 +85,7 @@ (define-public atk name "-" version ".tar.xz")) (sha256 (base32 - "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g")))) + "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 538d6d025cf40f890ea46131e917101cf1a7128b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 1 Apr 2018 12:37:15 +0200 Subject: build-system/meson: Don't override LDFLAGS if already set. * guix/build/meson-build-system.scm (configure): Test for LDFLAGS before adding ours. (cherry picked from commit 611c27db2aec8c2f72bc0c1e5c7d126dc95b39b2) --- guix/build/meson-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e8cb5440eb..e7690a4c37 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -53,7 +53,8 @@ (define* (configure #:key outputs configure-flags build-type ;; * ;; * ;; * - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) + (unless (getenv "LDFLAGS") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))) (mkdir build-dir) (chdir build-dir) -- cgit v1.2.3 From 73a118bdc529c9d65e2d1c7c072880c9d6624a00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:42:09 +0200 Subject: gnu: gdk-pixbuf: Update to 2.36.12. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.12. --- 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 001c149f17..96bc27deac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -433,7 +433,7 @@ (define-public gtksourceview (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.11") + (version "2.36.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -441,7 +441,7 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf")))) + "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") -- cgit v1.2.3 From a430b1e7f7a5f9580fc1163a1ba52cd93979b884 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 16 Apr 2018 09:58:29 +0200 Subject: gnu: wayland: Update to 1.15.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.15.0. --- 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 91eb37fb7a..b196cb71b2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -432,14 +432,14 @@ (define-public python2-pyxdg (define-public wayland (package (name "wayland") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d")))) + "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) -- cgit v1.2.3 From 16ff8d6aeb3b6ac58e857cd8e38d5877e7f3fd82 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 16 Apr 2018 10:01:11 +0200 Subject: gnu: wayland-protocols: Update to 1.13. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.13. --- 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 b196cb71b2..456f75d18f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -468,7 +468,7 @@ (define-public wayland (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (string-append @@ -476,7 +476,7 @@ (define-public wayland-protocols "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1cn8ny4zr9xlcdh8qi1qnkmvia8cp4ixnsbhd9sp9571w6lyh69v")))) + "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit v1.2.3 From 55e76e420d66722d8d3b0895d99e68f9b5be3af6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 16:23:40 +0200 Subject: gnu: libinput: Update to 1.10.3. * gnu/packages/freedesktop.scm (libinput): Update to 1.10.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 456f75d18f..867e2398cb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -146,14 +146,14 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.10.2") + (version "1.10.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m")))) + "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From bab5f3a7f62150ae009e78d03c4b1f5b1646104c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 16:12:27 +0200 Subject: gnu: eudev: Update to 3.2.5. * gnu/packages/linux.scm (eudev): Update to 3.2.5. [source](uri): Use tarball instead of zipball. [source](file-name): Adjust accordingly. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5790527c84..0ae61c41e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2007,15 +2007,15 @@ (define-public eudev ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/gentoo/eudev/archive/v" - version ".zip")) - (file-name (string-append name "-" version ".zip")) + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1r1ag0snarygrj5qqxi2xdq9w6g3sfjd5jx1b0fl7zmqlsz3vvxx")) + "0dlkcgy7j4fdcksqrpc373zfybiif1bal3n6lpy1kfc5280j02c7")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a9fda571c3e702ccd6b40f7ee320e55fd2e83d19 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 10 Apr 2018 12:54:09 +0530 Subject: gnu: texlive-bin: Use ghostscript executable "gs" in ps2eps. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add fix-unix-detection phase. Replace system* with invoke in postint phase. --- gnu/packages/tex.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index db1f120ce6..2b35250dd0 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -175,6 +176,15 @@ (define-public texlive-bin (string-prefix? "mips64" s)))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-unix-detection + ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, + ;; and the "gs" ghostscript executable on Unix. It detects Unix by + ;; checking for the existence of the /usr/bin directory. Since + ;; GuixSD does not have /usr/bin, it is also detected as Windows. + (lambda _ + (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" + (("gswin32c") "gs")) + #t)) (add-after 'install 'postint (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let* ((out (assoc-ref outputs "out")) @@ -196,7 +206,7 @@ (define-public texlive-bin (with-directory-excursion "texlive-extra" (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) - (system* "mv" "tlpkg" share)))))))) + (invoke "mv" "tlpkg" share)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. -- cgit v1.2.3 From b02b6f32a56a259873e8368ac0be2aed9eca76aa Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 11 Apr 2018 10:34:23 +0530 Subject: gnu: texlive-bin: Patch texlua shebangs. * gnu/packages/tex.scm (texlive-bin)[arguments]: Patch texlua shebangs in postint phase. --- gnu/packages/tex.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2b35250dd0..35b6b3f8d4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -206,7 +206,13 @@ (define-public texlive-bin (with-directory-excursion "texlive-extra" (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) - (invoke "mv" "tlpkg" share)))))))) + (invoke "mv" "tlpkg" share)) + ;; texlua shebangs are not patched by the patch-source-shebangs + ;; phase because the texlua executable does not exist at that + ;; time. + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) + (with-directory-excursion out + (patch-source-shebangs)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. -- cgit v1.2.3 From 68c4759baa4c1bb87e1c7c5568d5cdf4e1434fb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 19:07:41 +0200 Subject: gnu: gstreamer: Downgrade to 1.12.5. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Downgrade to 1.12.5. --- 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 0871533934..a65a43b5cf 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -101,7 +101,7 @@ (define-public orc (define-public gstreamer (package (name "gstreamer") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -110,7 +110,7 @@ (define-public gstreamer version ".tar.xz")) (sha256 (base32 - "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw")))) + "0slwqav7bqasg4a9f033kv6ki3yz0wyr3k0w9jr80s1jba20sxcz")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -149,7 +149,7 @@ (define-public gstreamer (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y")))) + "0bkikdax4v3iv9sqrrwbavqw7kg7lh0vas08ad1nya7kcmdz5ncg")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -204,7 +204,7 @@ (define-public gst-plugins-base (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -213,7 +213,7 @@ (define-public gst-plugins-good name "-" version ".tar.xz")) (sha256 (base32 - "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka")))) + "0mam03i38j6iws815fky9sm1ayik1d9a8pnfvschrr06pqxv511c")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -263,14 +263,14 @@ (define-public gst-plugins-good (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd")))) + "10bx1h996nn45r3d53bgkfx0rfa3hqz0f4zx634wz3nffnkjzy20")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -339,7 +339,7 @@ (define-public gst-plugins-bad (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) @@ -347,7 +347,7 @@ (define-public gst-plugins-ugly name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z")))) + "0vpr1rv99v7k2s78k15prdw453nq1va4rkli46yhm6s3i00lnwk7")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -378,7 +378,7 @@ (define-public gst-plugins-ugly (define-public gst-libav (package (name "gst-libav") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append @@ -386,7 +386,7 @@ (define-public gst-libav name "-" version ".tar.xz")) (sha256 (base32 - "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv")))) + "0y1qawf21407smvpc6kc2q6f17y9hdki4skn1yrwbl1n75gqcaw1")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") @@ -416,7 +416,7 @@ (define-public gst-libav (define-public python-gst (package (name "python-gst") - (version "1.14.0") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append @@ -424,7 +424,7 @@ (define-public python-gst "gst-python-" version ".tar.xz")) (sha256 (base32 - "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0")))) + "1x8g9mdkf6hzhlkx6nhrrp607p8g4zkhl3crs8vh504zpbbf71ip")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. -- cgit v1.2.3 From 6e9e598954484457395e1ce192b9e1e6b48ad103 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 30 Apr 2018 06:55:44 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.7. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.7. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index beef52d0da..760d4b7f8b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -221,7 +221,7 @@ (define-public wine64 (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.6") + (version "3.7") (source (origin (method url-fetch) @@ -230,7 +230,7 @@ (define-public wine-staging-patchset-data (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1q5mgq7lk3sh82im65g51yk110ci9afl5wgqs2q6i8qd2nj5pv7d")))) + "112sy32sja4cc3rv8x6v4cdi3jfxdgzwfra8f78hzdf8a2wrjqz6")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From fc6dace31dcaedb1c7721473a926cd0c46b9e801 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 30 Apr 2018 06:56:20 +0200 Subject: gnu: wine-staging: Update to 3.7. * gnu/packages/wine.scm (wine-staging): Update to 3.7. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 760d4b7f8b..b92af46135 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -276,7 +276,7 @@ (define-public wine-staging (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0p4h0ynb5yf8rx5badpxg7b6vsrqdqafwszn5qm0shv0kb3jsl3q")))) + "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From d95e4864bac7ceccbb0d41cf961cd1e3c3380138 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 30 Apr 2018 10:26:39 +0200 Subject: gnu: wine: Add Kerberos support. * gnu/packages/wine.scm (wine)[inputs]: Add mit-krb5. --- gnu/packages/wine.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b92af46135..914b70d0c8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -46,6 +46,7 @@ (define-module (gnu packages wine) #:use-module (gnu packages glib) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -115,6 +116,7 @@ (define-public wine ("libXinerama" ,libxinerama) ("libXxf86vm" ,libxxf86vm) ("libXcomposite" ,libxcomposite) + ("mit-krb5" ,mit-krb5) ("ncurses" ,ncurses) ("openal" ,openal) ("pulseaudio" ,pulseaudio) -- cgit v1.2.3 From 70ab130a49678071c3412f78793a8bd0b677714f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 30 Apr 2018 10:37:28 +0200 Subject: services: Re-export static-networking-service, static-networking-service-type. * gnu/services/networking.scm: Re-export static-networking-service, static-networking-service-type. --- gnu/services/networking.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 67674e895e..0c9c69eef5 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -46,6 +46,8 @@ (define-module (gnu services networking) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (ice-9 match) + #:re-export (static-networking-service + static-networking-service-type) #:export (%facebook-host-aliases dhcp-client-service -- cgit v1.2.3 From 3edbe539240ad508e35ac1add3b44e8d849b2c5a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Apr 2018 11:56:14 +0200 Subject: gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2. * gnu/packages/skribilo.scm (skribilo): Update to 0.9.4. [arguments]: Remove #:configure-flags. Adjust -C flag added to 'skribilo.in' in 'pre-configure' phase. [inputs]: Switch to GUILE-2.2. [native-inputs]: Switch to GUILE-LIB and GUILE-READER. --- gnu/packages/skribilo.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm index f10acaec70..12bdd1a2fa 100644 --- a/gnu/packages/skribilo.scm +++ b/gnu/packages/skribilo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,22 +31,18 @@ (define-module (gnu packages skribilo) (define-public skribilo (package (name "skribilo") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/skribilo/skribilo-" version ".tar.gz")) (sha256 (base32 - "04d8xa76jvlz25jnc6p1gzsplwcwcqrmi3f7ixdhddhl1chyz66y")))) + "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf")))) (build-system gnu-build-system) (arguments ;; Make the modules available under the usual location. - '(#:configure-flags (list (string-append "--with-guilemoduledir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - - #:phases + '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) @@ -57,8 +53,8 @@ (define-public skribilo (substitute* "src/skribilo.in" (("^exec (.*) -c" _ things) (string-append "exec " things - " -L " reader "/share/guile/site/2.0" - " -C " reader "/share/guile/site/2.0" + " -L " reader "/share/guile/site/2.2" + " -C " reader "/lib/guile/2.2/site-ccache" " -c")))) #t))) @@ -66,7 +62,7 @@ (define-public skribilo (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("imagemagick" ,imagemagick) ("ghostscript" ,ghostscript) ; for 'convert' ("ploticus" ,ploticus) @@ -74,8 +70,8 @@ (define-public skribilo ;; The 'skribilo' command needs them, and for people using Skribilo as a ;; library, these inputs are needed as well. - (propagated-inputs `(("guile-reader" ,guile2.0-reader) - ("guile-lib" ,guile2.0-lib))) + (propagated-inputs `(("guile-reader" ,guile-reader) + ("guile-lib" ,guile-lib))) (home-page "https://www.nongnu.org/skribilo/") (synopsis "Document production tool written in Guile Scheme") -- cgit v1.2.3 From f675d8b97d2f2acd5277088940601cf5f2eb43db Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Apr 2018 12:00:21 +0200 Subject: gnu: Remove a couple of old deprecated package aliases. * gnu/packages/emacs.scm (geiser-next, paredit/old-name): Remove. --- gnu/packages/emacs.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8112ec9715..4738310320 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -351,10 +351,6 @@ (define-public geiser metadata.") (license license:bsd-3))) -(define-public geiser-next - ;; This has become "geiser". - (deprecated-package "geiser-next" geiser)) - (define-public paredit (package (name "emacs-paredit") @@ -380,9 +376,6 @@ (define-public paredit when typing parentheses directly or commenting out code line by line.") (license license:gpl3+))) -(define-public paredit/old-name - (deprecated-package "paredit" paredit)) - (define-public git-modes (package (name "emacs-git-modes") -- cgit v1.2.3 From 6ac8b7359a1ac80e558f41dd37004ffa727dd3c6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Apr 2018 12:57:23 +0200 Subject: guix system: search: Display default Shepherd service names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Clément Lassieur . * guix/scripts/system/search.scm (service-type-default-shepherd-services) (service-type-shepherd-names): New procedures. (service-type->recutils): Use it. * tests/guix-system.sh: Add test. --- guix/scripts/system/search.scm | 37 ++++++++++++++++++++++++++++++++++++- tests/guix-system.sh | 3 ++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index b4f790c9bf..7229c60a02 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +20,11 @@ (define-module (guix scripts system search) #:use-module (guix ui) #:use-module (guix utils) #:use-module (gnu services) + #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) #:use-module (ice-9 regex) #:use-module (ice-9 match) #:export (service-type->recutils @@ -39,6 +41,29 @@ (define-module (guix scripts system search) (define service-type-name* (compose symbol->string service-type-name)) +(define (service-type-default-shepherd-services type) + "Return the list of Shepherd services created by default instances of TYPE, +provided TYPE has a default value." + (match (guard (c ((service-error? c) #f)) + (service type)) + (#f '()) + ((? service? service) + (let* ((extension (find (lambda (extension) + (eq? (service-extension-target extension) + shepherd-root-service-type)) + (service-type-extensions type))) + (compute (and extension (service-extension-compute extension)))) + (if compute + (compute (service-value service)) + '()))))) + +(define (service-type-shepherd-names type) + "Return the default names of Shepherd services created for TYPE." + (match (map shepherd-service-provision + (service-type-default-shepherd-services type)) + (((names . _) ...) + names))) + (define* (service-type->recutils type port #:optional (width (%text-width)) #:key (extra-fields '())) @@ -66,6 +91,16 @@ (define (extensions->recutils extensions) (format port "extends: ~a~%" (extensions->recutils (service-type-extensions type))) + ;; If possible, display the list of *default* Shepherd service names. Note + ;; that we may not always be able to do this (e.g., if the service type + ;; lacks a default value); furthermore, it could be that the service + ;; generates Shepherd services with different names if we give it different + ;; parameters (this is the case, for instance, for + ;; 'console-font-service-type'.) + (match (service-type-shepherd-names type) + (() #f) + (names (format port "shepherdnames:~{ ~a~}~%" names))) + (when (service-type-description type) (format port "~a~%" (string->recutils diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 211c26f43d..ff9114ab74 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +# Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès # Copyright © 2017 Tobias Geerinckx-Rice # Copyright © 2018 Chris Marusich # @@ -267,6 +267,7 @@ guix system build "$tmpdir/config.scm" -n # Searching. guix system search tor | grep "^name: tor" +guix system search tor | grep "^shepherdnames: tor" guix system search anonym network | grep "^name: tor" # Below, use -n (--dry-run) for the tests because if we actually tried to -- cgit v1.2.3 From 5986e94118b114319feadbd2431d6efbf870a5e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 Apr 2018 14:07:34 +0200 Subject: services: gpm: Provide a default value and document 'gpm-service-type'. * gnu/services/base.scm (%default-gpm-options): New variable. ()[gpm, options]: Add default values. (gpm-service-type)[default-value]: New field. (gpm-service): Use %DEFAULT-GPM-OPTIONS and mark as deprecated. * doc/guix.texi (Base Services): Document 'gpm-service-type' and 'gpm-configuration'. Remove 'gpm-service'. --- doc/guix.texi | 34 +++++++++++++++++++++++++--------- gnu/services/base.scm | 15 +++++++++++---- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 58c3688c03..87892fc892 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10383,15 +10383,31 @@ See @code{man loadkeys} for details. @cindex mouse @cindex gpm -@deffn {Scheme Procedure} gpm-service [#:gpm @var{gpm}] @ - [#:options] -Run @var{gpm}, the general-purpose mouse daemon, with the given -command-line @var{options}. GPM allows users to use the mouse in the console, -notably to select, copy, and paste text. The default value of @var{options} -uses the @code{ps2} protocol, which works for both USB and PS/2 mice. - -This service is not part of @var{%base-services}. -@end deffn +@defvr {Scheme Variable} gpm-service-type +This is the type of the service that runs GPM, the @dfn{general-purpose +mouse daemon}, which provides mouse support to the Linux console. GPM +allows users to use the mouse in the console, notably to select, copy, +and paste text. + +The value for services of this type must be a @code{gpm-configuration} +(see below). This service is not part of @var{%base-services}. +@end defvr + +@deftp {Data Type} gpm-configuration +Data type representing the configuration of GPM. + +@table @asis +@item @code{options} (default: @code{%default-gpm-options}) +Command-line options passed to @command{gpm}. The default set of +options instruct @command{gpm} to listen to mouse events on +@file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, for +more information. + +@item @code{gpm} (default: @code{gpm}) +The GPM package to use. + +@end table +@end deftp @anchor{guix-publish-service-type} @deffn {Scheme Variable} guix-publish-service-type diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 694aab882e..eb82b2ddcf 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1962,10 +1962,16 @@ (define (swap-service device) "Return a service that uses @var{device} as a swap device." (service swap-service-type device)) +(define %default-gpm-options + ;; Default options for GPM. + '("-m" "/dev/input/mice" "-t" "ps2")) + (define-record-type* gpm-configuration make-gpm-configuration gpm-configuration? - (gpm gpm-configuration-gpm) ;package - (options gpm-configuration-options)) ;list of strings + (gpm gpm-configuration-gpm ;package + (default gpm)) + (options gpm-configuration-options ;list of strings + (default %default-gpm-options))) (define gpm-shepherd-service (match-lambda @@ -2000,14 +2006,15 @@ (define gpm-service-type (extensions (list (service-extension shepherd-root-service-type gpm-shepherd-service))) + (default-value (gpm-configuration)) (description "Run GPM, the general-purpose mouse daemon, with the given command-line options. GPM allows users to use the mouse in the console, notably to select, copy, and paste text. The default options use the @code{ps2} protocol, which works for both USB and PS/2 mice."))) -(define* (gpm-service #:key (gpm gpm) - (options '("-m" "/dev/input/mice" "-t" "ps2"))) +(define* (gpm-service #:key (gpm gpm) ;deprecated + (options %default-gpm-options)) "Run @var{gpm}, the general-purpose mouse daemon, with the given command-line @var{options}. GPM allows users to use the mouse in the console, notably to select, copy, and paste text. The default value of @var{options} -- cgit v1.2.3 From 8b2597d54286ccf140592ea352fd19c7323f7746 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Fri, 27 Apr 2018 06:58:04 +0000 Subject: gnu: Add python-parso. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-parso, python2-parso): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 04ab52eb9f..f23deb57e6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13145,3 +13145,27 @@ (define-public python-onetimepass (description "Python one-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords.") (license license:expat))) + +(define-public python-parso + (package + (name "python-parso") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "parso" version)) + (sha256 + (base32 + "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2")))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (build-system python-build-system) + (home-page "https://github.com/davidhalter/parso") + (synopsis "Python Parser") + (description "Parso is a Python parser that supports error recovery and +round-trip parsing for different Python versions (in multiple Python versions). +Parso is also able to list multiple syntax errors in your Python file.") + (license license:expat))) + +(define-public python2-parso + (package-with-python2 python-parso)) -- cgit v1.2.3 From fb8966abc43415ca6d1f141c44ebf0c563cea4d2 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Fri, 27 Apr 2018 07:03:24 +0000 Subject: gnu: python-jedi: Update to 0.12.0, enable tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (jedi): Update to 0.12.0, enable tests. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f23deb57e6..a359eebd12 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9357,25 +9357,30 @@ (define-public python2-prompt-toolkit (define-public python-jedi (package (name "python-jedi") - (version "0.9.0") + (version "0.12.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "jedi" version)) - (sha256 - (base32 - "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v")))) + (origin + (method url-fetch) + (uri (pypi-uri "jedi" version)) + (sha256 + (base32 + "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr")))) (build-system python-build-system) (arguments - ;; FIXME: One test fails (use "py.test" instead of 'setup.py test'). - '(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (replace 'check (lambda _ + (invoke "py.test" "-vv")))))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-parso" ,python-parso) + ("python-docopt" ,python-docopt))) (home-page "https://github.com/davidhalter/jedi") (synopsis - "Autocompletion for Python that can be used for text editors") + "Autocompletion for Python that can be used for text editors") (description - "Jedi is an autocompletion tool for Python that can be used for text editors.") + "Jedi is an autocompletion tool for Python that can be used for text + editors.") (license license:expat))) (define-public python2-jedi -- cgit v1.2.3 From d0e888c39dde9459434dbfe9461faca0dcfb9f24 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Apr 2018 14:12:14 -0400 Subject: gnu: xournal: Update to 0.4.8.2016. * gnu/packages/pdf.scm (xournal): Update to 0.4.8.2016. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 84b53b00b4..7762b06ff7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -673,7 +673,7 @@ (define-public qpdf (define-public xournal (package (name "xournal") - (version "0.4.8") + (version "0.4.8.2016") (source (origin (method url-fetch) @@ -681,7 +681,7 @@ (define-public xournal "/xournal-" version ".tar.gz")) (sha256 (base32 - "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13")))) + "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j")))) (build-system gnu-build-system) (inputs `(("gtk" ,gtk+-2) -- cgit v1.2.3 From 4b6e2a19afb1280bc6c8840008eac57d8e33e237 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 30 Apr 2018 21:20:17 +0200 Subject: gnu: python-nbxmpp: Update to 0.6.5. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.5. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fd1c330cea..a3192a996e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -485,14 +485,14 @@ (define-public znc (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.4") + (version "0.6.5") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "12rfmp613alh3mi8f94008sx7x1a8c1izs3icrvw7bf4gnf2pi31")))) + "162dk6q4g61riam1p78bxwddwy4y2x1si34g5j9jv3rlc9xmhdcv")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From 539a8d29319de87b85eb8919346063e5d0bb0f5c Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 30 Apr 2018 21:20:54 +0200 Subject: gnu: gajim: Update to 1.0.2. * gnu/packages/messaging.scm (gajim): Update to 1.0.2. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a3192a996e..e2b4b5bec6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -510,7 +510,7 @@ (define-public python2-nbxmpp (define-public gajim (package (name "gajim") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -518,7 +518,7 @@ (define-public gajim "/gajim-" version ".tar.bz2")) (sha256 (base32 - "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c")))) + "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 53bed20918db76e021d39d6b82ac95a095893298 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 21:09:59 +0200 Subject: gnu: rhash: Update to 1.3.6. * gnu/packages/crypto.scm (rhash): Update to 1.3.6. [arguments]: Adjust to extensive build system changes. --- gnu/packages/crypto.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 9a786def32..f96fe04900 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -671,7 +671,7 @@ (define-public libb2 (define-public rhash (package (name "rhash") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) @@ -680,32 +680,27 @@ (define-public rhash (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q")))) + "14ngzfgmd1lfp7m78sn49x8ymf2s37nrr67c6p5vas85nrrgjkcn")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) - #:test-target "test" + `(#:make-flags + ;; The binaries in /bin need some help finding librhash.so.0. + (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:test-target "test" ; ‘make check’ just checks the sources #:phases (modify-phases %standard-phases (replace 'configure + ;; ./configure is not GNU autotools' and doesn't gracefully handle + ;; unrecognized options, so we must call it manually. (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("\\$\\(DESTDIR\\)/etc") - (string-append (assoc-ref outputs "out") "/etc"))) - #t)) - (add-after 'build 'build-library + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))))) + (add-after 'install 'install-library-extras (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "lib-shared" make-flags))) - (add-after 'install 'install-library - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-lib-shared" make-flags) (apply invoke - "make" "-C" "librhash" "install-headers" - "install-so-link" make-flags))) - (add-after 'check 'check-library - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "test-shared-lib" make-flags)))))) + "make" "-C" "librhash" + "install-headers" "install-so-link" + make-flags)))))) (home-page "https://sourceforge.net/projects/rhash/") (synopsis "Utility for computing hash sums") (description "RHash is a console utility for calculation and verification -- cgit v1.2.3 From 443c432e90691f0a81bca6feb70322dc92706627 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 16:03:39 +0200 Subject: gnu: reposurgeon: End all phases in truth. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (reposurgeon)[arguments]: Return #t from the ‘install-emacs-data’ phase, instead of COPY-FILE's undefined result. --- gnu/packages/version-control.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b82abaf9ed..848660bdd7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1468,7 +1468,8 @@ (define-public reposurgeon (lambda* (#:key outputs #:allow-other-keys) (install-file "reposurgeon-mode.el" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))))))) + "/share/emacs/site-lisp")) + #t))))) (inputs `(("python" ,python-wrapper) ("tzdata" ,tzdata))) -- cgit v1.2.3 From e56feffec0cc1b585aca40a2a9f81571c0374d9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 20:09:28 +0200 Subject: gnu: acpica: Update to 20180427. * gnu/packages/admin.scm (acpica): Update to 20180427. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b9b43bc50..b0fb4319cb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1255,7 +1255,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20180313") + (version "20180427") (source (origin (method url-fetch) (uri (string-append @@ -1263,7 +1263,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "16galaadmr37q2pvk2gyxrm8d1xldzk31djfxfq9v1c9yq4i425h")))) + "1hfdzyzzznh9h8yjlz54p02zwwxyp5k7fgzxlb9phhj3kalp60md")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) @@ -1272,7 +1272,7 @@ (define-public acpica "CC=gcc" "HOST=_LINUX" "OPT_CFLAGS=-Wall -fno-strict-aliasing") - #:tests? #f ; no 'check' target. + #:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://acpica.org/") (synopsis "Tools for the development and debug of ACPI tables") @@ -1284,7 +1284,7 @@ (define-public acpica subsystem, and a small set of tools to assist in developing and debugging ACPI tables. This package contains only the user-space tools needed for ACPI table development, not the kernel implementation of ACPI.") - (license license:gpl2))) ; Dual GPLv2/ACPICA Licence + (license license:gpl2))) ; dual GPLv2/ACPICA Licence (define-public stress (package -- cgit v1.2.3 From 435897c0f2bf459ecd5a25e3d32847ff47b299d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 20:32:25 +0200 Subject: gnu: perl-dbix-class: Update to 0.082841. * gnu/packages/databases.scm (perl-dbix-class): Update to 0.082841. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f54fec6420..f036b51c33 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1124,7 +1124,7 @@ (define-public perl-dbi (define-public perl-dbix-class (package (name "perl-dbix-class") - (version "0.082840") + (version "0.082841") (source (origin (method url-fetch) @@ -1132,7 +1132,7 @@ (define-public perl-dbix-class "DBIx-Class-" version ".tar.gz")) (sha256 (base32 - "1vw1f756g8m5hq11nqf5dk2cw2y4mqq91ca5p75fn5g3fp8syja0")))) + "1gf3hgv8f9rnr8bl4ljgsqk4aliphmvljhsk4282kvdc4mcgh1fp")))) (build-system perl-build-system) (native-inputs `(("perl-dbd-sqlite" ,perl-dbd-sqlite) -- cgit v1.2.3 From 1672e7e71482b68192f3a4625cff27fb7c25bd52 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 20:36:47 +0200 Subject: gnu: perl-dbix-class-schema-loader: Update to 0.07049. * gnu/packages/databases.scm (perl-dbix-class-schema-loader): Update to 0.07049. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f036b51c33..51b0d7e253 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1232,7 +1232,7 @@ (define-public perl-dbix-class-introspectablem2m (define-public perl-dbix-class-schema-loader (package (name "perl-dbix-class-schema-loader") - (version "0.07047") + (version "0.07049") (source (origin (method url-fetch) @@ -1240,7 +1240,7 @@ (define-public perl-dbix-class-schema-loader "DBIx-Class-Schema-Loader-" version ".tar.gz")) (sha256 (base32 - "06s2q6xj95600sdlfph57spjk2z1gjs4zwq5b7mz7d5izcxgnwb6")))) + "0r57fv71ypxafb85cpxph1hdqii7ipjwvc19yb6fpkvq2ggcssg8")))) (build-system perl-build-system) (native-inputs `(("perl-config-any" ,perl-config-any) -- cgit v1.2.3 From 59bc15cf88cfe50ed14363d81dd63693109c8cf2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 30 Apr 2018 12:53:22 -0400 Subject: gnu: icecat: Add more fixes from upstream mozilla-esr52. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the upstream mozilla-esr52 repository. * gnu/packages/patches/icecat-bug-1452075.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 9 +- gnu/packages/patches/icecat-bug-1452075.patch | 441 ++++++++++++++++++++++++++ 3 files changed, 450 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/icecat-bug-1452075.patch diff --git a/gnu/local.mk b/gnu/local.mk index ec11b26632..5be445f908 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -785,6 +785,7 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-bug-1452075.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1d053152d7..d7f80014be 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -467,7 +467,14 @@ (define-public icecat (mozilla-patch "icecat-bug-1388020.patch" "ad9a885b0df4" "1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4") (mozilla-patch "icecat-bug-1452416.patch" "f89ab96a2532" "1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv") (mozilla-patch "icecat-bug-1451376.patch" "af885a1bd293" "1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3") - (mozilla-patch "icecat-bug-1444668.patch" "666fc84ec72d" "0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v"))) + (mozilla-patch "icecat-bug-1444668.patch" "666fc84ec72d" "0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v") + (search-patch "icecat-bug-1452075.patch") + (mozilla-patch "icecat-bug-1393367.patch" "1ab40761a856" "1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7") + (mozilla-patch "icecat-bug-1453339.patch" "0edb8dca7087" "0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm") + (mozilla-patch "icecat-bug-1452202.patch" "134c728799c1" "16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam") + (mozilla-patch "icecat-bug-1411415.patch" "14eab155eaa8" "0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd") + (mozilla-patch "icecat-bug-1452619.patch" "2b75d55ccf0e" "1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i") + (mozilla-patch "icecat-bug-1453127.patch" "89857f35df29" "0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/icecat-bug-1452075.patch b/gnu/packages/patches/icecat-bug-1452075.patch new file mode 100644 index 0000000000..b776640133 --- /dev/null +++ b/gnu/packages/patches/icecat-bug-1452075.patch @@ -0,0 +1,441 @@ +Based on +Adapted to apply cleanly to GNU IceCat. + +# HG changeset patch +# User Ryan VanderMeulen +# Date 1523630807 14400 +# Node ID 608e76ec5ba25cec2271d2b400c7bce2d4c5ef79 +# Parent 10b7f43b536f93151201d44d304c991aa9af5d0c +Bug 1452075 - Backport some upstream pdf.js fixes to ESR52. r=bdahl, r=yury, a=RyanVM + +diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +--- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm ++++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +@@ -24,17 +24,18 @@ const Cc = Components.classes; + const Ci = Components.interfaces; + const Cr = Components.results; + const Cu = Components.utils; + // True only if this is the version of pdf.js that is included with icecat. + const MOZ_CENTRAL = JSON.parse('true'); + const PDFJS_EVENT_ID = 'pdf.js.message'; + const PDF_CONTENT_TYPE = 'application/pdf'; + const PREF_PREFIX = 'pdfjs'; +-const PDF_VIEWER_WEB_PAGE = 'resource://pdf.js/web/viewer.html'; ++const PDF_VIEWER_ORIGIN = "resource://pdf.js"; ++const PDF_VIEWER_WEB_PAGE = "resource://pdf.js/web/viewer.html"; + const MAX_NUMBER_OF_PREFS = 50; + const MAX_STRING_PREF_LENGTH = 128; + + Cu.import('resource://gre/modules/XPCOMUtils.jsm'); + Cu.import('resource://gre/modules/Services.jsm'); + Cu.import('resource://gre/modules/NetUtil.jsm'); + + XPCOMUtils.defineLazyModuleGetter(this, 'NetworkManager', +@@ -105,21 +106,25 @@ function log(aMsg) { + if (!getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false)) { + return; + } + var msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg); + Services.console.logStringMessage(msg); + dump(msg + '\n'); + } + +-function getDOMWindow(aChannel) { ++function getDOMWindow(aChannel, aPrincipal) { + var requestor = aChannel.notificationCallbacks ? + aChannel.notificationCallbacks : + aChannel.loadGroup.notificationCallbacks; + var win = requestor.getInterface(Components.interfaces.nsIDOMWindow); ++ // Ensure the window wasn't navigated to something that is not PDF.js. ++ if (!win.document.nodePrincipal.equals(aPrincipal)) { ++ return null; ++ } + return win; + } + + function getLocalizedStrings(path) { + var stringBundle = Cc['@mozilla.org/intl/stringbundle;1']. + getService(Ci.nsIStringBundleService). + createBundle('chrome://pdf.js/locale/' + path); + +@@ -627,31 +632,31 @@ var RangedChromeActions = (function Rang + data = this.dataListener.readData(); + + this.dataListener.onprogress = function (loaded, total) { + self.domWindow.postMessage({ + pdfjsLoadAction: 'progressiveRead', + loaded: loaded, + total: total, + chunk: self.dataListener.readData() +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + }; + this.dataListener.oncomplete = function () { + self.dataListener = null; + }; + } + + this.domWindow.postMessage({ + pdfjsLoadAction: 'supportsRangedLoading', + rangeEnabled: this.rangeEnabled, + streamingEnabled: this.streamingEnabled, + pdfUrl: this.pdfUrl, + length: this.contentLength, + data: data +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + + return true; + }; + + proto.requestDataRange = function RangedChromeActions_requestDataRange(args) { + if (!this.rangeEnabled) { + return; + } +@@ -663,23 +668,23 @@ var RangedChromeActions = (function Rang + // errors from chrome code for non-range requests, so this doesn't + // seem high-pri + this.networkManager.requestRange(begin, end, { + onDone: function RangedChromeActions_onDone(args) { + domWindow.postMessage({ + pdfjsLoadAction: 'range', + begin: args.begin, + chunk: args.chunk +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + }, + onProgress: function RangedChromeActions_onProgress(evt) { + domWindow.postMessage({ + pdfjsLoadAction: 'rangeProgress', + loaded: evt.loaded, +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + } + }); + }; + + proto.abortLoading = function RangedChromeActions_abortLoading() { + this.networkManager.abortAllRequests(); + if (this.originalRequest) { + this.originalRequest.cancel(Cr.NS_BINDING_ABORTED); +@@ -718,26 +723,26 @@ var StandardChromeActions = (function St + var self = this; + + this.dataListener.onprogress = function ChromeActions_dataListenerProgress( + loaded, total) { + self.domWindow.postMessage({ + pdfjsLoadAction: 'progress', + loaded: loaded, + total: total +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + }; + + this.dataListener.oncomplete = + function StandardChromeActions_dataListenerComplete(data, errorCode) { + self.domWindow.postMessage({ + pdfjsLoadAction: 'complete', + data: data, + errorCode: errorCode +- }, '*'); ++ }, PDF_VIEWER_ORIGIN); + + self.dataListener = null; + self.originalRequest = null; + }; + + return true; + }; + +@@ -972,31 +977,35 @@ PdfStreamConverter.prototype = { + var proxy = { + onStartRequest: function(request, context) { + listener.onStartRequest(aRequest, aContext); + }, + onDataAvailable: function(request, context, inputStream, offset, count) { + listener.onDataAvailable(aRequest, aContext, inputStream, + offset, count); + }, +- onStopRequest: function(request, context, statusCode) { +- // We get the DOM window here instead of before the request since it +- // may have changed during a redirect. +- var domWindow = getDOMWindow(channel); ++ onStopRequest(request, context, statusCode) { ++ var domWindow = getDOMWindow(channel, resourcePrincipal); ++ if (!Components.isSuccessCode(statusCode) || !domWindow) { ++ // The request may have been aborted and the document may have been ++ // replaced with something that is not PDF.js, abort attaching. ++ listener.onStopRequest(aRequest, context, statusCode); ++ return; ++ } + var actions; + if (rangeRequest || streamRequest) { + actions = new RangedChromeActions( + domWindow, contentDispositionFilename, aRequest, + rangeRequest, streamRequest, dataListener); + } else { + actions = new StandardChromeActions( + domWindow, contentDispositionFilename, aRequest, dataListener); + } + var requestListener = new RequestListener(actions); +- domWindow.addEventListener(PDFJS_EVENT_ID, function(event) { ++ domWindow.document.addEventListener(PDFJS_EVENT_ID, function(event) { + requestListener.receive(event); + }, false, true); + if (actions.supportsIntegratedFind()) { + var findEventManager = new FindEventManager(domWindow); + findEventManager.bind(); + } + listener.onStopRequest(aRequest, aContext, statusCode); + +diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js +--- a/browser/extensions/pdfjs/content/build/pdf.worker.js ++++ b/browser/extensions/pdfjs/content/build/pdf.worker.js +@@ -41648,16 +41648,32 @@ + var error = sharedUtil.error; + var info = sharedUtil.info; + var isArray = sharedUtil.isArray; + var isBool = sharedUtil.isBool; + var isDict = corePrimitives.isDict; + var isStream = corePrimitives.isStream; + var PostScriptLexer = corePsParser.PostScriptLexer; + var PostScriptParser = corePsParser.PostScriptParser; ++ function toNumberArray(arr) { ++ if (!Array.isArray(arr)) { ++ return null; ++ } ++ var length = arr.length; ++ for (var i = 0; i < length; i++) { ++ if (typeof arr[i] !== 'number') { ++ var result = new Array(length); ++ for (var j = 0; j < length; j++) { ++ result[j] = +arr[j]; ++ } ++ return result; ++ } ++ } ++ return arr; ++ } + var PDFFunction = function PDFFunctionClosure() { + var CONSTRUCT_SAMPLED = 0; + var CONSTRUCT_INTERPOLATED = 2; + var CONSTRUCT_STICHED = 3; + var CONSTRUCT_POSTSCRIPT = 4; + return { + getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps, str) { + var i, ii; +@@ -41747,43 +41763,43 @@ + out[index] = [ + arr[i], + arr[i + 1] + ]; + ++index; + } + return out; + } +- var domain = dict.getArray('Domain'); +- var range = dict.getArray('Range'); ++ var domain = toNumberArray(dict.getArray('Domain')); ++ var range = toNumberArray(dict.getArray('Range')); + if (!domain || !range) { + error('No domain or range'); + } + var inputSize = domain.length / 2; + var outputSize = range.length / 2; + domain = toMultiArray(domain); + range = toMultiArray(range); +- var size = dict.get('Size'); ++ var size = toNumberArray(dict.get('Size')); + var bps = dict.get('BitsPerSample'); + var order = dict.get('Order') || 1; + if (order !== 1) { + // No description how cubic spline interpolation works in PDF32000:2008 + // As in poppler, ignoring order, linear interpolation may work as good + info('No support for cubic spline interpolation: ' + order); + } +- var encode = dict.getArray('Encode'); ++ var encode = toNumberArray(dict.getArray('Encode')); + if (!encode) { + encode = []; + for (var i = 0; i < inputSize; ++i) { +- encode.push(0); +- encode.push(size[i] - 1); +- } +- } +- encode = toMultiArray(encode); +- var decode = dict.getArray('Decode'); ++ encode.push([0, size[i] - 1]); ++ } ++ } else { ++ encode = toMultiArray(encode); ++ } ++ var decode = toNumberArray(dict.getArray('Decode')); + if (!decode) { + decode = range; + } else { + decode = toMultiArray(decode); + } + var samples = this.getSampleArray(size, outputSize, bps, str); + return [ + CONSTRUCT_SAMPLED, +@@ -41868,22 +41884,19 @@ + // Decode_2j, Decode_2j+1) + rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]); + // y_j = min(max(r_j, range_2j), range_2j+1) + dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]); + } + }; + }, + constructInterpolated: function PDFFunction_constructInterpolated(str, dict) { +- var c0 = dict.getArray('C0') || [0]; +- var c1 = dict.getArray('C1') || [1]; ++ var c0 = toNumberArray(dict.getArray('C0')) || [0]; ++ var c1 = toNumberArray(dict.getArray('C1')) || [1]; + var n = dict.get('N'); +- if (!isArray(c0) || !isArray(c1)) { +- error('Illegal dictionary for interpolated function'); +- } + var length = c0.length; + var diff = []; + for (var i = 0; i < length; ++i) { + diff.push(c1[i] - c0[i]); + } + return [ + CONSTRUCT_INTERPOLATED, + c0, +@@ -41899,49 +41912,45 @@ + return function constructInterpolatedFromIRResult(src, srcOffset, dest, destOffset) { + var x = n === 1 ? src[srcOffset] : Math.pow(src[srcOffset], n); + for (var j = 0; j < length; ++j) { + dest[destOffset + j] = c0[j] + x * diff[j]; + } + }; + }, + constructStiched: function PDFFunction_constructStiched(fn, dict, xref) { +- var domain = dict.getArray('Domain'); ++ var domain = toNumberArray(dict.getArray('Domain')); + if (!domain) { + error('No domain'); + } + var inputSize = domain.length / 2; + if (inputSize !== 1) { + error('Bad domain for stiched function'); + } + var fnRefs = dict.get('Functions'); + var fns = []; + for (var i = 0, ii = fnRefs.length; i < ii; ++i) { +- fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i]))); +- } +- var bounds = dict.getArray('Bounds'); +- var encode = dict.getArray('Encode'); ++ fns.push(PDFFunction.parse(xref, xref.fetchIfRef(fnRefs[i]))); ++ } ++ var bounds = toNumberArray(dict.getArray('Bounds')); ++ var encode = toNumberArray(dict.getArray('Encode')); + return [ + CONSTRUCT_STICHED, + domain, + bounds, + encode, + fns + ]; + }, + constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) { + var domain = IR[1]; + var bounds = IR[2]; + var encode = IR[3]; +- var fnsIR = IR[4]; +- var fns = []; ++ var fns = IR[4]; + var tmpBuf = new Float32Array(1); +- for (var i = 0, ii = fnsIR.length; i < ii; i++) { +- fns.push(PDFFunction.fromIR(fnsIR[i])); +- } + return function constructStichedFromIRResult(src, srcOffset, dest, destOffset) { + var clip = function constructStichedFromIRClip(v, min, max) { + if (v > max) { + v = max; + } else if (v < min) { + v = min; + } + return v; +@@ -41968,18 +41977,18 @@ + // Prevent the value from becoming NaN as a result + // of division by zero (fixes issue6113.pdf). + tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin); + // call the appropriate function + fns[i](tmpBuf, 0, dest, destOffset); + }; + }, + constructPostScript: function PDFFunction_constructPostScript(fn, dict, xref) { +- var domain = dict.getArray('Domain'); +- var range = dict.getArray('Range'); ++ var domain = toNumberArray(dict.getArray('Domain')); ++ var range = toNumberArray(dict.getArray('Range')); + if (!domain) { + error('No domain.'); + } + if (!range) { + error('No range.'); + } + var lexer = new PostScriptLexer(fn); + var parser = new PostScriptParser(lexer); +@@ -42928,18 +42937,18 @@ + case 'IndexedCS': + var baseIndexedCS = IR[1]; + var hiVal = IR[2]; + var lookup = IR[3]; + return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup); + case 'AlternateCS': + var numComps = IR[1]; + var alt = IR[2]; +- var tintFnIR = IR[3]; +- return new AlternateCS(numComps, ColorSpace.fromIR(alt), PDFFunction.fromIR(tintFnIR)); ++ var tintFn = IR[3]; ++ return new AlternateCS(numComps, ColorSpace.fromIR(alt), tintFn); + case 'LabCS': + whitePoint = IR[1]; + blackPoint = IR[2]; + var range = IR[3]; + return new LabCS(whitePoint, blackPoint, range); + default: + error('Unknown name ' + name); + } +@@ -43067,22 +43076,22 @@ + var name = xref.fetchIfRef(cs[1]); + numComps = 1; + if (isName(name)) { + numComps = 1; + } else if (isArray(name)) { + numComps = name.length; + } + alt = ColorSpace.parseToIR(cs[2], xref, res); +- var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3])); ++ var tintFn = PDFFunction.parse(xref, xref.fetchIfRef(cs[3])); + return [ + 'AlternateCS', + numComps, + alt, +- tintFnIR ++ tintFn + ]; + case 'Lab': + params = xref.fetchIfRef(cs[1]); + whitePoint = params.getArray('WhitePoint'); + blackPoint = params.getArray('BlackPoint'); + var range = params.getArray('Range'); + return [ + 'LabCS', +@@ -52483,9 +52492,9 @@ + initializeWorker(); + } + exports.setPDFNetworkStreamClass = setPDFNetworkStreamClass; + exports.WorkerTask = WorkerTask; + exports.WorkerMessageHandler = WorkerMessageHandler; + })); + }.call(pdfjsLibs)); + exports.WorkerMessageHandler = pdfjsLibs.pdfjsCoreWorker.WorkerMessageHandler; +-})); +\ No newline at end of file ++})); + -- cgit v1.2.3