diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
| commit | 5bace4c8ad981b66b5c0769b885d0bb0db91a029 (patch) | |
| tree | 0f2fb95c23d7990d26aeed71590bb94a3f2e17fe /gnu/packages/linux.scm | |
| parent | 653569e878f39345b05110b998f10db3b520ccfe (diff) | |
| parent | 20d87dfb453cf27f95c5ef3858e8d096278e1702 (diff) | |
| download | guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index afddc8ed7a..d41dd7dc9e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -900,14 +900,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-utils (package (name "alsa-utils") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "0z0nnqp1707bm02dys2d16m88lsg5nd26bqaf14rl3za9sjifwhj")))) + "17cxih9ibjp1193dyd79j50pyfa9dvrs6r9kpwrvzicjvr2110x7")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -947,14 +947,14 @@ MIDI functionality to the Linux-based operating system.") (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.1.1") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "1w81z5jlwqhd1l2m7qrq69lc4k9dnrg1wn52jsl2hrf3hbhd394f")))) + "12hsvm6rpinjkg06pa9hzndkdrbfw6wk6yk00cm8y1gbv8xiq3ak")))) (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. |