diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
| commit | edae5b3d50692c25e29fe65fdc14ae3ccdce884d (patch) | |
| tree | ec257af3a922fd96bda8b8b16c00c8d0beaf445a /gnu/packages/linux.scm | |
| parent | 1dba64079c5aaa1fb40e4b1d989f1f06efd6cb63 (diff) | |
| parent | e3aaefe71bd26daf6fdbfd0634f68a90985e059b (diff) | |
| download | guix-patches-edae5b3d50692c25e29fe65fdc14ae3ccdce884d.tar guix-patches-edae5b3d50692c25e29fe65fdc14ae3ccdce884d.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
guix/packages.scm
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7176c37a87..e1f8b4f46d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -145,7 +145,7 @@ (license gpl2+))) (define-public linux-libre - (let* ((version "3.11") + (let* ((version "3.12") (build-phase '(lambda* (#:key system #:allow-other-keys #:rest args) (let ((arch (car (string-split system #\-)))) @@ -191,7 +191,7 @@ (uri (linux-libre-urls version)) (sha256 (base32 - "1vlk04xkvyy1kc9zz556md173rn1qzlnvhz7c9sljv4bpk3mdspl")))) + "0drjxm9h2k9bik2mhrqqqi6cm5rn2db647wf0zvb58xldj0zmhb6")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ("bc" ,bc) |