diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-08-15 09:06:05 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-08-15 09:06:05 +0200 |
| commit | be672e2dc6357c00f179a37c1db71b48dfa4fa24 (patch) | |
| tree | 73c2129a0b036f812d609e9ea5737ffdc7b5435c /gnu/packages/linux.scm | |
| parent | e380ef14cfc0126bb75e43fc237b2fbc05a7c7d2 (diff) | |
| parent | 1a275962302fa18e54da790e89e2c826e6b60b53 (diff) | |
Merge remote-tracking branch 'origin/master' into wip-haskell
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ca5a4f99b0..27ad8873a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> @@ -4027,6 +4027,8 @@ thanks to the use of namespaces.") "libexec/bootstrap-scripts/functions" "libexec/bootstrap-scripts/post.sh" "libexec/functions") + (("\\| grep ") + (string-append "| " (which "grep") " ")) (("egrep ") (string-append (which "egrep") " "))) #t)) @@ -6433,14 +6435,14 @@ available in the kernel Linux.") (define-public cpuid (package (name "cpuid") - (version "20200211") + (version "20200427") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "06sjbqqp80l7nhsp6khglkzdp9qy4vhbvjxbfilznhsmrqiwlw55")))) + "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1")))) (build-system gnu-build-system) (arguments '(#:make-flags '("CC=gcc") |