From: Efraim Flashner Date: Wed, 9 Jan 2019 08:48:42 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into staging X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/0e289672503a4e1599ef826d49f2fa5575081942 Merge remote-tracking branch 'origin/master' into staging --- 0e289672503a4e1599ef826d49f2fa5575081942 diff --cc gnu/local.mk index 4d8813a9b8,bc54b61c21..e4c5561de5 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -1162,8 -1181,8 +1175,9 @@@ dist_patch_DATA = %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ - %D%/packages/patches/sssd-curl-compat.patch \ ++ %D%/packages/patches/sssd-curl-compat.patch \ %D%/packages/patches/steghide-fixes.patch \ + %D%/packages/patches/streamlink-update-test.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ diff --cc gnu/packages/gl.scm index 2c64b0bc9c,39b3c52301..5fff383eb1 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@@ -50,10 -50,8 +50,9 @@@ #:use-module (gnu packages xorg) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)