nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2018-05-30 02:21:29 -04:00
parent b3e23b0216 a21bcd7079
commit 341a36b32c
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
5 changed files with 6 additions and 1128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1105,7 +1105,6 @@ dist_patch_DATA = \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/strace-kernel-4.16.patch \ %D%/packages/patches/strace-kernel-4.16.patch \
%D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \
%D%/packages/patches/swig-octave-patches.patch \
%D%/packages/patches/swish-e-search.patch \ %D%/packages/patches/swish-e-search.patch \
%D%/packages/patches/swish-e-format-security.patch \ %D%/packages/patches/swish-e-format-security.patch \
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \ %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \

4
gnu/packages/linux.scm
View File

@ -426,8 +426,8 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-4.1 (define-public linux-libre-4.1
(make-linux-libre "4.1.51" (make-linux-libre "4.1.52"
"0l8lpwjpckp44hjyx5qrxqdwwi97gyyc1n6pmk66cr3fpdhnk540" "0a2flzf79kz9c1y9zpxdclsfivp38d2sgnwifg4gvyqixdy63sk9"
%intel-compatible-systems %intel-compatible-systems
#:configuration-file kernel-config)) #:configuration-file kernel-config))

1119
gnu/packages/patches/swig-octave-patches.patch
View File

File diff suppressed because it is too large Load Diff

5
gnu/packages/swig.scm
View File

@ -22,7 +22,6 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
@ -40,9 +39,7 @@
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw")) "0kf99ygrjs5616gsqhz1l7bib3a12izmxi7g48bwblbymr3z9ybw"))))
(patches
(search-patches "swig-octave-patches.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases

5
gnu/packages/xorg.scm
View File

@ -5899,7 +5899,7 @@ basic eye-candy effects.")
(define-public xpra (define-public xpra
(package (package
(name "xpra") (name "xpra")
(version "2.3") (version "2.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -5907,7 +5907,7 @@ basic eye-candy effects.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kq0ambpy8r7m3wxdp79cgxgnl9yfmr19lv88f617gnv0sp0aarp")))) "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry"))))
(build-system python-build-system) (build-system python-build-system)
(inputs `(("ffmpeg" ,ffmpeg) (inputs `(("ffmpeg" ,ffmpeg)
("flac" ,flac) ("flac" ,flac)
@ -5918,6 +5918,7 @@ basic eye-candy effects.")
("libx264" ,libx264) ("libx264" ,libx264)
("libxcomposite" ,libxcomposite) ("libxcomposite" ,libxcomposite)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("libxi" ,libxi)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxtst" ,libxtst) ("libxtst" ,libxtst)