diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
| commit | 3d337bbc3916b95c0197ebbb890875f0439eec53 (patch) | |
| tree | ffd4098c3ec8e7af659f2e70448e45180b2a7cfb /gnu/packages/linux.scm | |
| parent | 932b2ea2064ec8ab8e81b959bd92f6138974fd39 (diff) | |
| parent | 4e8efc15fb9082fb80726a2a37c4e6ebb13552fa (diff) | |
| download | guix-3d337bbc3916b95c0197ebbb890875f0439eec53.tar guix-3d337bbc3916b95c0197ebbb890875f0439eec53.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 68ca5fceee..e65327c61d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,13 +358,13 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-4.1 (package (inherit linux-libre) - (version "4.1.28") + (version "4.1.29") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "02b7hq32cyx3h04k7l3mfzhh09snh5x4pxiwxllwchw94a6lkxl8")))) + "1ygd89x5plkpxisafhnrnfbw69a257sza2gw15wj9jkzxs36a1jp")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) @@ -2590,7 +2590,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "4.5.3") + (version "4.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -2598,7 +2598,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "1lzbw275xgv69v4z8hmsf3jnip38116hxhkpv0madk8wv049drz6")))) + "06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of binaries in "out" (~16MiB!) @@ -2628,7 +2628,8 @@ and copy/paste text in the console and in xterm.") ;; For building documentation ("libxml2" ,libxml2) ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl))) + ("docbook-xsl" ,docbook-xsl) + ("which" ,which))) (home-page "https://btrfs.wiki.kernel.org/") (synopsis "Create and manage btrfs copy-on-write file systems") (description "Btrfs is a copy-on-write (CoW) filesystem for Linux aimed at |