diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-06-20 23:44:42 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-20 23:44:42 +0200 |
commit | f513527a8ed3faa0ed45f027430c69be97d9ca02 (patch) | |
tree | a23ecdebf45d6afcad7f09e853e90c159888cdc5 /gnu/packages/linux.scm | |
parent | 2eea253f4ddefa12a476f22d52928227d971a7fa (diff) | |
parent | 00fe93338d5cd29b4d565749b5842a7477d0477c (diff) | |
download | guix-patches-f513527a8ed3faa0ed45f027430c69be97d9ca02.tar guix-patches-f513527a8ed3faa0ed45f027430c69be97d9ca02.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 518b0e41b9..fb942cb68f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -156,7 +156,7 @@ (license gpl2+))) (define-public linux-libre - (let* ((version "3.13.7") + (let* ((version "3.15") (build-phase '(lambda* (#:key system #:allow-other-keys #:rest args) (let ((arch (car (string-split system #\-)))) @@ -219,7 +219,7 @@ (uri (linux-libre-urls version)) (sha256 (base32 - "0j28dg0zq4vlbk4ady4fq021i8dxx2h8h90n26mzigr9hky86n8d")))) + "125n04rwqmr3bm9slk62w6xcg355hx85rwv2x16nl6qki70hsick")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ("bc" ,bc) @@ -1137,7 +1137,13 @@ system.") version ".tar.gz")) (sha256 (base32 - "0c34b0za2v0934acvgnva0vaqpghmmhz4zh7k0m9jd4mbc91byqm")))) + "0c34b0za2v0934acvgnva0vaqpghmmhz4zh7k0m9jd4mbc91byqm")) + (modules '((guix build utils))) + (snippet + '(substitute* "tests/Makefile.in" + ;; The '%: %.in' rule incorrectly uses @VERSION@. + (("@VERSION@") + "[@]VERSION[@]"))))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-before |