diff options
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc3e4d4079..d239d4e4c4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2016 Alex Kost <alezost@gmail.com> +;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> @@ -194,11 +194,10 @@ (define* (kernel-config arch #:key variant) "Return the absolute file name of the Linux-Libre build configuration file for ARCH and optionally VARIANT, or #f if there is no such configuration." - (let* ((name (string-append "linux-libre-" - (if variant (string-append variant "-") "") + (let* ((name (string-append (if variant (string-append variant "-") "") (if (string=? "i386" arch) "i686" arch) ".conf")) - (file (string-append "gnu/packages/" name))) - (search-path %load-path file))) + (file (string-append "linux-libre/" name))) + (search-auxiliary-file file))) (define %default-extra-linux-options `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html @@ -338,8 +337,8 @@ It has been modified to remove all non-free binary blobs.") (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-libre-version "4.10") -(define %linux-libre-hash "167zzgkivpqsp07did25wjqsswddzp3gifcdkq7xk00llxlmspla") +(define %linux-libre-version "4.10.1") +(define %linux-libre-hash "0mvwrjny1bjqyjqjxff9m97j48ybfdw8qpdazr5rwk12234v4k3d") (define-public linux-libre (make-linux-libre %linux-libre-version @@ -1097,10 +1096,10 @@ allows a system administrator to make use of all iproute2 features, including traffic control. iproute2 is usually shipped in a package called iproute or iproute2 and -consists of several tools, of which the most important are ip and tc. ip -controls IPv4 and IPv6 configuration and tc stands for traffic control. Both -tools print detailed usage messages and are accompanied by a set of -manpages.") +consists of several tools, of which the most important are @command{ip} and +@command{tc}. @command{ip} controls IPv4 and IPv6 configuration and +@command{tc} stands for traffic control. Both tools print detailed usage +messages and are accompanied by a set of manpages.") (license license:gpl2+))) (define-public net-tools @@ -3230,7 +3229,7 @@ of flash storage.") (define-public libseccomp (package (name "libseccomp") - (version "2.3.1") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -3238,7 +3237,7 @@ of flash storage.") "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0asnlkzqms520r0dra08dzcz5hh6hs7lkajfw9wij3vrd0hxsnzz")))) + "18dwfxzsw3agiy2dxbflrkhmjgvlji0wwkk636nabh2ng41qrp1x")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) |