amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into core-updates

Browse source 
Conflicts:
	gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
	commit log really confused me here... It's from 8c6b077bfa (staging).
	gnu/packages/xorg.scm: xkeyboard-config updated both places.
This commit is contained in:
Marius Bakke 2017-02-21 14:31:36 +01:00
commit 8505eb19a4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
12 changed files with 80 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/xiph.scm
View file

@ -127,7 +127,7 @@ compressed video format.")
(define speex
(package
(name "speex")
(version "1.2rc1")
(version "1.2.0")
(source
(origin
(method url-fetch)
@ -135,7 +135,7 @@ compressed video format.")
version ".tar.gz"))
(sha256
(base32
"19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl"))))
"150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa"))))
(build-system gnu-build-system)
(inputs `(("libogg" ,libogg)))
(home-page "https://gnu.org/software/speex")
@ -202,14 +202,14 @@ It currently supports:
(define flac
(package
(name "flac")
(version "1.3.1")
(version "1.3.2")
(source (origin
(method url-fetch)
(uri (string-append "http://downloads.xiph.org/releases/flac/flac-"
version ".tar.xz"))
(sha256
(base32
"0v65w7ph6ldwp5a8fbhp0a3w8f737ck468fr7yb7sxmskl4w0ws7"))))
"0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f))