diff options
author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /gnu/packages/linux.scm | |
parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
download | gnu-guix-933204e5b1473a54367aef1f90de22424e9074ab.tar gnu-guix-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4a0f61ef22..101982114c 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.19.3") + (let* ((version "4.0") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Apply the neat patch. @@ -271,10 +271,9 @@ for SYSTEM, or #f if there is no configuration for SYSTEM." (uri (linux-libre-urls version)) (sha256 (base32 - "13nq0wzkjy7hrhnnvxlwzs1awlqd81vzriqddjn6s9ma3fzj44bn")) + "12nkzn1n4si2zcp10b645qri83m2y7iwp29vs2rjmy612azdab8f")) (patches - (list (search-patch "linux-libre-libreboot-fix.patch") - (search-patch "linux-libre-vblank-fix.patch"))))) + (list (search-patch "linux-libre-libreboot-fix.patch"))))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ("bc" ,bc) @@ -2091,3 +2090,45 @@ the 1394 Trade Assocation. AV/C stands for Audio/Video Control.") "The libiec61883 library provides a higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394.") (license lgpl2.1+))) + +(define-public mdadm + (package + (name "mdadm") + (version "3.3.2") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/linux/utils/raid/mdadm/mdadm-" + version ".tar.xz")) + (sha256 + (base32 + "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")))) + (build-system gnu-build-system) + (inputs + `(("udev" ,eudev))) + (arguments + `(#:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "INSTALL=install" + "CHECK_RUN_DIR=0" + ;; TODO: tell it where to find 'sendmail' + ;; (string-append "MAILCMD=" <???> "/sbin/sendmail") + (string-append "BINDIR=" out "/sbin") + (string-append "MANDIR=" out "/share/man") + (string-append "UDEVDIR=" out "/lib/udev"))) + #:phases (alist-cons-before + 'build 'patch-program-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* "udev-md-raid-arrays.rules" + (("/usr/bin/(readlink|basename)" all program) + (string-append coreutils "/bin/" program))))) + (alist-delete 'configure %standard-phases)) + ;;tests must be done as root + #:tests? #f)) + (home-page "http://neil.brown.name/blog/mdadm") + (synopsis "Tool for managing Linux Software RAID arrays") + (description + "mdadm is a tool for managing Linux Software RAID arrays. It can create, +assemble, report on, and monitor arrays. It can also move spares between raid +arrays when needed.") + (license gpl2+))) |