diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-04-30 19:26:03 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-30 19:26:03 +0200 |
commit | a66853810e75055091e9ab5c2fc341fa1811cda4 (patch) | |
tree | 2e5067741284ce5441e91b86de8f8113aa828343 | |
parent | fb8966abc43415ca6d1f141c44ebf0c563cea4d2 (diff) | |
parent | a9fe3882b9400d6a49ca95e136e78477b3e81a07 (diff) | |
download | guix-a66853810e75055091e9ab5c2fc341fa1811cda4.tar.gz |
Merge branch 'staging'
-rw-r--r-- | gnu/packages/build-tools.scm | 4 | ||||
-rw-r--r-- | gnu/packages/certs.scm | 4 | ||||
-rw-r--r-- | gnu/packages/freedesktop.scm | 12 | ||||
-rw-r--r-- | gnu/packages/gl.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gnuzilla.scm | 4 | ||||
-rw-r--r-- | gnu/packages/gstreamer.scm | 34 | ||||
-rw-r--r-- | gnu/packages/gtk.scm | 12 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 20 | ||||
-rw-r--r-- | gnu/packages/tex.scm | 18 | ||||
-rw-r--r-- | gnu/packages/xdisorg.scm | 4 | ||||
-rw-r--r-- | guix/build/meson-build-system.scm | 3 |
11 files changed, 68 insertions, 51 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 09cb7c9e97..4b078e78ed 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -98,7 +98,7 @@ generate such a compilation database.") (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/" @@ -106,7 +106,7 @@ generate such a compilation database.") version ".tar.gz")) (sha256 (base32 - "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l")))) + "1yqa4337nb8w92bvr91rsxmn0xkf7pmdybq9ljvnqmdvn7dv02sd")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH 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-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 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "1580qc0a4s8v3k3vg7zz4xly4alkjrw7qq9zy2nf6p4v56wcfg53")))) + "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7d94053ed3..05b12789af 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.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"))) @@ -432,14 +432,14 @@ Python.") (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)) @@ -468,7 +468,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (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 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "1cn8ny4zr9xlcdh8qi1qnkmvia8cp4ixnsbhd9sp9571w6lyh69v")))) + "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 79cbf71168..db02d798f5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "17.3.6") + (version "17.3.8") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1y7vawz2sbpzdqk4b60w8kfrxb2rfkdjkifyxxfx1jaasj05d4g5")) + "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch" "mesa-skip-disk-cache-test.patch")))) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index fe751f1b01..1d053152d7 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -286,7 +286,7 @@ in the Mozilla clients.") (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 @@ in the Mozilla clients.") "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")))) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4eef9e741d..da130d88ff 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -101,7 +101,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) @@ -110,7 +110,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "0x06jxmc5fhlz7cr1pl5lp0hm1jgz519jjic37d09srf9jm091ss")))) + "0slwqav7bqasg4a9f033kv6ki3yz0wyr3k0w9jr80s1jba20sxcz")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -149,7 +149,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) @@ -157,15 +157,16 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "10i255q7i8an1hxz3szb36x1jcs9nfdy511pj2wg24h2vw1nnc2c")))) + "0bkikdax4v3iv9sqrrwbavqw7kg7lh0vas08ad1nya7kcmdz5ncg")))) (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) @@ -177,7 +178,7 @@ This package provides the core library and elements.") ("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 @@ -200,11 +201,10 @@ This package provides the core library and elements.") 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.12.5") (source (origin (method url-fetch) @@ -213,7 +213,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0mxrbrqrfq1946gn9im19maj7ivld4k946vkwrzd94h8qsz4k7v4")))) + "0mam03i38j6iws815fky9sm1ayik1d9a8pnfvschrr06pqxv511c")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -263,18 +263,18 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "021d3q81m968lpnah517sfclagadcqwd6jz3lqdmqvb82sz5fy0c")))) + "10bx1h996nn45r3d53bgkfx0rfa3hqz0f4zx634wz3nffnkjzy20")))) (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") @@ -339,7 +339,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) @@ -347,7 +347,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "08p5kggk1szvr76cdbx3q3yfc235w1przb76v2n51lwfi26mn5hw")))) + "0vpr1rv99v7k2s78k15prdw453nq1va4rkli46yhm6s3i00lnwk7")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -378,7 +378,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append @@ -386,7 +386,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "0qly3lgamm36xql9q7wg5751gi6j2d3ifzz1pkr15ncc5mfslmia")))) + "0y1qawf21407smvpc6kc2q6f17y9hdki4skn1yrwbl1n75gqcaw1")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-system-libav") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dd722aa5aa..97fccdc917 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -77,7 +77,7 @@ (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 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g")))) + "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -433,7 +433,7 @@ highlighting and other features typical of a source code editor.") (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 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf")))) + "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") @@ -659,7 +659,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.22.28") + (version "3.22.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -667,7 +667,7 @@ application suites.") 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")) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 196cc7785f..4ebdca3b57 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -995,7 +995,7 @@ intercept and print the system calls executed by the program.") (define-public alsa-lib (package (name "alsa-lib") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append @@ -1003,7 +1003,7 @@ intercept and print the system calls executed by the program.") 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") @@ -1015,14 +1015,14 @@ MIDI functionality to the Linux-based operating system.") (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. @@ -1062,14 +1062,14 @@ MIDI functionality to the Linux-based operating system.") (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. @@ -2015,15 +2015,15 @@ from the module-init-tools project.") ;; 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 diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index db1f120ce6..35b6b3f8d4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> +;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -175,6 +176,15 @@ (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,13 @@ (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)) + ;; 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. diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8c0ca25972..2309596f6b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -158,14 +158,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (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) 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 @@ ;; * <https://github.com/mesonbuild/meson/issues/314> ;; * <https://github.com/mesonbuild/meson/issues/3038> ;; * <https://github.com/NixOS/nixpkgs/issues/31222> - (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) |