aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/linux.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-03-01 19:05:29 -0500
committerMark H Weaver <mhw@netris.org>2015-03-01 19:05:29 -0500
commit3820d3973982048e5b93ad08d619c893bc50de14 (patch)
tree159a3ea785647fb8bb5e4b754f5c0f98d86e29d5 /gnu/packages/linux.scm
parent751be9a056114d353bac12510bea33e8d5577f49 (diff)
parentafff9058a0a9a3f3d633f563bb8a1a7d9e503165 (diff)
downloadguix-3820d3973982048e5b93ad08d619c893bc50de14.tar
guix-3820d3973982048e5b93ad08d619c893bc50de14.tar.gz
Merge branch 'master' into core-updates
Conflicts: gnu/packages/gnupg.scm
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r--gnu/packages/linux.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4bd3592672..6af90426a7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -198,7 +198,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
#f)))
(define-public linux-libre
- (let* ((version "3.18.7")
+ (let* ((version "3.18.8")
(build-phase
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
;; Apply the neat patch.
@@ -271,7 +271,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
(uri (linux-libre-urls version))
(sha256
(base32
- "113r2dzmiwlchp5b3hyjyx91jysx5j4hhxjw45gaky5nj9pax2rh"))))
+ "1ai2krm0svq52z4nm0qyw3q3ybfia83zvpv1f38q1wkllwq0gi6j"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl)
("bc" ,bc)