From 1a9f5e9ff37de0a4f3025dc87924f9a7a6b78516 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 7 Apr 2016 21:13:40 -0400 Subject: gnu: linux-libre-4.1: Update to 4.1.21. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.21. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3a4c9f114d..09886be0e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,13 +353,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.20") + (version "4.1.21") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "0vwk6jh57djbwr29xvlgaf14409bq9vmwf6r6nq9jdl6dizfd110")))) + "1gfzwiinpxzhqb5xi7b1iv7ay96nrjlhia6bvcyq8ffkx7a2r715")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.2.3 From 097e012b5aa8f377954cca450e68dffe848037c6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 11 Apr 2016 18:59:53 -0400 Subject: gnu: e2fsprogs: Fix misleading comment. * gnu/packages/linux.scm (e2fsprogs): Fix misleading comment. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 09886be0e5..80ac863fab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -598,7 +598,7 @@ slabtop, and skill.") (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) ;for the libext2fs Info manual (arguments - '(;; util-linux is not the preferred source for some of the libraries and + '(;; util-linux is the preferred source for some of the libraries and ;; commands, so disable them (see, e.g., ;; .) #:configure-flags '("--disable-libblkid" -- cgit v1.2.3 From 916627b484053a0ed95c78e312c8f36a919a723d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 2 Apr 2016 15:29:32 +0200 Subject: gnu: btrfs-progs: Update to 4.5.1. * gnu/packages/linux.scm (btrfs-progs): Update to 4.5.1. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 80ac863fab..02cde8eed2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2487,7 +2487,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "4.4.1") + (version "4.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -2495,7 +2495,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r")))) + "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From df887432be25e1534b9ecdccf39c98857b1d0786 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Apr 2016 21:36:28 +0200 Subject: gnu: util-linux: Add "static" output. * gnu/packages/linux.scm: (util-linux)[outputs]: New field. [arguments]: Remove "--disable-static" from #:configure-flags. Add 'move-static-libraries' phase. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 02cde8eed2..6c669e3160 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) + (outputs '("out" + "static")) ; >2 MiB of static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" - ;; Do not build .a files to save 2 MiB. - "--disable-static" - ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" @@ -494,6 +493,19 @@ providing the system administrator with some help in common tasks.") (substitute* "tests/ts/misc/mcookie" (("/etc/services") (string-append net "/etc/services"))) + #t))) + (add-after + 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion out + (for-each (lambda (file) + (rename-file file + (string-append static "/" + file))) + (find-files "lib" "\\.a$"))) #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses))) -- cgit v1.2.3 From 5f3f3ac287467994f01646680c6a6837ec7ee587 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Apr 2016 21:36:29 +0200 Subject: gnu: btrfs-progs: Add "static" output. * gnu/packages/linux.scm (btrfs-progs)[outputs]: New field. [inputs]: Add "static" outputs of util-linux for libuuid and libblkid. [arguments]: Add 'build-static' and 'install-static' phases. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6c669e3160..2920298b36 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2509,12 +2509,26 @@ and copy/paste text in the console and in xterm.") (base32 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f")))) (build-system gnu-build-system) + (outputs '("out" + "static")) ; static versions of binaries in "out" (~16MiB!) (arguments - '(#:test-target "test" + '(#:phases (modify-phases %standard-phases + (add-after 'build 'build-static + (lambda _ (zero? (system* "make" "static")))) + (add-after 'install 'install-static + (let ((staticbin (string-append (assoc-ref %outputs "static") + "/bin"))) + (lambda _ + (zero? (system* "make" + (string-append "bindir=" staticbin) + "install-static")))))) + #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) ("libblkid" ,util-linux) + ("libblkid:static" ,util-linux "static") ("libuuid" ,util-linux) + ("libuuid:static" ,util-linux "static") ("zlib" ,zlib) ("lzo" ,lzo))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f7cfd80fc6b594a38a30255a74eedb5c33e45834 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Apr 2016 18:04:49 -0400 Subject: gnu: linux-libre: Update to 4.5.1. * gnu/packages/linux.scm (linux-libre): Update to 4.5.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2920298b36..5846dd9b04 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -221,7 +221,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (search-path %load-path file))) (define-public linux-libre - (let* ((version "4.5") + (let* ((version "4.5.1") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps @@ -299,7 +299,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (uri (linux-libre-urls version)) (sha256 (base32 - "0km863vwy557flpygkr869yshpjs1v11ni78p8k9p9nm31ai6yn3")))) + "1x621kvaf842bzpgglfl31zi74ny9w9jgvmkz3z6m3708n8clrdh")))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) -- cgit v1.2.3 From 557a2503bc04649bb6dcb7dac8270e293bca8e44 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Apr 2016 18:08:31 -0400 Subject: gnu: linux-libre-4.4: Update to 4.4.7. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.7. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5846dd9b04..31554c01df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -336,13 +336,13 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-4.4 (package (inherit linux-libre) - (version "4.4.6") + (version "4.4.7") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "0sf623knc4j23p96r0w1ng725kj45ra50bwix01z5nvl5aqpnsrp")))) + "031wh2k204zvshira28bf33sk1bbk19ilgqmkvkwjp6spk5wmvpq")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.2.3 From fc1adab1487e5ea3c5f6341263df14414ba4e784 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 8 Apr 2016 15:18:13 +0300 Subject: gnu: packages: Use 'search-patches' everywhere. * gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field. * gnu/packages/acl.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/algebra.scm: Likewise. * gnu/packages/animation.scm: Likewise. * gnu/packages/apr.scm: Likewise. * gnu/packages/audacity.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/autotools.scm: Likewise. * gnu/packages/avahi.scm: Likewise. * gnu/packages/backup.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/bash.scm: Likewise. * gnu/packages/bioinformatics.scm: Likewise. * gnu/packages/cdrom.scm: Likewise. * gnu/packages/ci.scm: Likewise. * gnu/packages/cmake.scm: Likewise. * gnu/packages/cpio.scm: Likewise. * gnu/packages/cross-base.scm: Likewise. * gnu/packages/dico.scm: Likewise. * gnu/packages/doxygen.scm: Likewise. * gnu/packages/ebook.scm: Likewise. * gnu/packages/elf.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/firmware.scm: Likewise. * gnu/packages/flashing-tools.scm: Likewise. * gnu/packages/fltk.scm: Likewise. * gnu/packages/ftp.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gawk.scm: Likewise. * gnu/packages/gcc.scm: Likewise. * gnu/packages/gd.scm: Likewise. * gnu/packages/ghostscript.scm: Likewise. * gnu/packages/glib.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gnucash.scm: Likewise. * gnu/packages/gnunet.scm: Likewise. * gnu/packages/gnupg.scm: Likewise. * gnu/packages/gnuzilla.scm: Likewise. * gnu/packages/graphics.scm: Likewise. * gnu/packages/grub.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/icu4c.scm: Likewise. * gnu/packages/idutils.scm: Likewise. * gnu/packages/image.scm: Likewise. * gnu/packages/imagemagick.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/ldc.scm: Likewise. * gnu/packages/libcanberra.scm: Likewise. * gnu/packages/libevent.scm: Likewise. * gnu/packages/libreoffice.scm: Likewise. * gnu/packages/libunwind.scm: Likewise. * gnu/packages/libusb.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lirc.scm: Likewise. * gnu/packages/llvm.scm: Likewise. * gnu/packages/lsh.scm: Likewise. * gnu/packages/lua.scm: Likewise. * gnu/packages/lxqt.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/mcrypt.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/mit-krb5.scm: Likewise. * gnu/packages/mp3.scm: Likewise. * gnu/packages/multiprecision.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/ninja.scm: Likewise. * gnu/packages/nvi.scm: Likewise. * gnu/packages/ocaml.scm: Likewise. * gnu/packages/orpheus.scm: Likewise. * gnu/packages/ots.scm: Likewise. * gnu/packages/parallel.scm: Likewise. * gnu/packages/patchutils.scm: Likewise. * gnu/packages/pcre.scm: Likewise. * gnu/packages/pdf.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/plotutils.scm: Likewise. * gnu/packages/polkit.scm: Likewise. * gnu/packages/pulseaudio.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/qemu.scm: Likewise. * gnu/packages/qt.scm: Likewise. * gnu/packages/ratpoison.scm: Likewise. * gnu/packages/rdf.scm: Likewise. * gnu/packages/readline.scm: Likewise. * gnu/packages/rush.scm: Likewise. * gnu/packages/scheme.scm: Likewise. * gnu/packages/screen.scm: Likewise. * gnu/packages/sdl.scm: Likewise. * gnu/packages/slim.scm: Likewise. * gnu/packages/ssh.scm: Likewise. * gnu/packages/tcl.scm: Likewise. * gnu/packages/tcsh.scm: Likewise. * gnu/packages/texinfo.scm: Likewise. * gnu/packages/tls.scm: Likewise. * gnu/packages/tor.scm: Likewise. * gnu/packages/tv.scm: Likewise. * gnu/packages/valgrind.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/vpn.scm: Likewise. * gnu/packages/vtk.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/web.scm: Likewise. * gnu/packages/wicd.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xfce.scm: Likewise. * gnu/packages/xiph.scm: Likewise. * gnu/packages/xml.scm: Likewise. * gnu/packages/xorg.scm: Likewise. * gnu/packages/zip.scm: Likewise. --- gnu/packages/linux.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 31554c01df..8659471623 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -170,8 +170,7 @@ (sha256 (base32 "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1")) - (patches - (list (search-patch "module-init-tools-moduledir.patch"))))) + (patches (search-patches "module-init-tools-moduledir.patch")))) (build-system gnu-build-system) (arguments ;; FIXME: The upstream tarball lacks man pages, and building them would @@ -453,7 +452,7 @@ providing the system administrator with some help in common tasks.") (sha256 (base32 "1ivdx1bhjbakf77agm9dn3wyxia1wgz9lzxgd61zqxw3xzih9gzw")) - (patches (list (search-patch "util-linux-tests.patch"))) + (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet ;; We take the 'logger' program from GNU Inetutils and 'kill' @@ -820,7 +819,7 @@ intercept and print the system calls executed by the program.") (sha256 (base32 "0fx057746dj7rjdi0jnvx2m9b0y1lgdkh1hks87d8w32xyihf3k9")) - (patches (list (search-patch "alsa-lib-mips-atomic-fix.patch"))))) + (patches (search-patches "alsa-lib-mips-atomic-fix.patch")))) (build-system gnu-build-system) (home-page "http://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") @@ -981,8 +980,7 @@ manpages.") (sha256 (base32 "0yvxrzk0mzmspr7sa34hm1anw6sif39gyn85w4c5ywfn8inxvr3s")) - (patches - (list (search-patch "net-tools-bitrot.patch"))))) + (patches (search-patches "net-tools-bitrot.patch")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build gnu-build-system) @@ -1564,7 +1562,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (sha256 (base32 "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv")) - (patches (list (search-patch "kmod-module-directory.patch"))))) + (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1609,7 +1607,7 @@ from the module-init-tools project.") (sha256 (base32 "0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p")) - (patches (list (search-patch "eudev-rules-directory.patch"))))) + (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1743,7 +1741,7 @@ interface.") (sha256 (base32 "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23")) - (patches (list (search-patch "crda-optional-gcrypt.patch"))))) + (patches (search-patches "crda-optional-gcrypt.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -1861,7 +1859,7 @@ country-specific regulations for the wireless spectrum.") (sha256 (base32 "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx")) - (patches (list (search-patch "lm-sensors-hwmon-attrs.patch"))))) + (patches (search-patches "lm-sensors-hwmon-attrs.patch")))) (build-system gnu-build-system) (inputs `(("rrdtool" ,rrdtool) ("perl" ,perl) @@ -2201,7 +2199,7 @@ also contains the libsysfs library.") version ".tar.gz")) (sha256 (base32 "0qfqv7nqmjfr3p0bwrdlxkiqwqr7vmx053cadaa548ybqbghxmvm")) - (patches (list (search-patch "cpufrequtils-fix-aclocal.patch"))))) + (patches (search-patches "cpufrequtils-fix-aclocal.patch")))) (build-system gnu-build-system) (native-inputs `(("sysfsutils" ,sysfsutils-1))) @@ -2298,7 +2296,7 @@ MPEG-2 and audio over Linux IEEE 1394.") (sha256 (base32 "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")) - (patches (list (search-patch "mdadm-gcc-4.9-fix.patch"))))) + (patches (search-patches "mdadm-gcc-4.9-fix.patch")))) (build-system gnu-build-system) (inputs `(("udev" ,eudev))) -- cgit v1.2.3 From 85c7e8e611be1bdc2eed47e61e9ff45d92ab293d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 14 Apr 2016 13:24:10 -0400 Subject: Revert "gnu: util-linux: Add "static" output." This reverts commit df887432be25e1534b9ecdccf39c98857b1d0786. --- gnu/packages/linux.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8659471623..310bb57127 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -463,11 +463,12 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) - (outputs '("out" - "static")) ; >2 MiB of static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" + ;; Do not build .a files to save 2 MiB. + "--disable-static" + ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" @@ -492,19 +493,6 @@ providing the system administrator with some help in common tasks.") (substitute* "tests/ts/misc/mcookie" (("/etc/services") (string-append net "/etc/services"))) - #t))) - (add-after - 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (mkdir-p (string-append static "/lib")) - (with-directory-excursion out - (for-each (lambda (file) - (rename-file file - (string-append static "/" - file))) - (find-files "lib" "\\.a$"))) #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses))) -- cgit v1.2.3 From 08fbfa8d21674738cf043bf4cc6fba1a91fc3162 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 14 Apr 2016 21:01:09 -0400 Subject: Revert "gnu: btrfs-progs: Add "static" output." This reverts commit 5f3f3ac287467994f01646680c6a6837ec7ee587. --- gnu/packages/linux.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 310bb57127..e1a12045df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2495,26 +2495,12 @@ and copy/paste text in the console and in xterm.") (base32 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f")))) (build-system gnu-build-system) - (outputs '("out" - "static")) ; static versions of binaries in "out" (~16MiB!) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'build 'build-static - (lambda _ (zero? (system* "make" "static")))) - (add-after 'install 'install-static - (let ((staticbin (string-append (assoc-ref %outputs "static") - "/bin"))) - (lambda _ - (zero? (system* "make" - (string-append "bindir=" staticbin) - "install-static")))))) - #:test-target "test" + '(#:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) ("libblkid" ,util-linux) - ("libblkid:static" ,util-linux "static") ("libuuid" ,util-linux) - ("libuuid:static" ,util-linux "static") ("zlib" ,zlib) ("lzo" ,lzo))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 503275e94a98af1de83f27780e5bec97b2c472c5 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Fri, 15 Apr 2016 16:51:38 +0300 Subject: gnu: linux: Add case for arm64. * gnu/packages/linux.scm (system->linux-architecture): Add "aarch64". --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e1a12045df..e4426e9e2a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -81,6 +81,7 @@ (cond ((string=? arch "i686") "i386") ((string-prefix? "mips" arch) "mips") ((string-prefix? "arm" arch) "arm") + ((string-prefix? "aarch64" arch) "arm64") (else arch)))) (define (linux-libre-urls version) -- cgit v1.2.3 From 5953d2b7c0f1d502cdc3205fc296299a985ce781 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 8 Apr 2016 21:57:11 +0300 Subject: gnu: kbd: Use 'modify-phases'. * gnu/packages/linux.scm (kbd)[arguments]: Use 'modify-phases'. --- gnu/packages/linux.scm | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e4426e9e2a..1b84242968 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1485,27 +1485,26 @@ system.") "tty")))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - (let ((gzip (assoc-ref %build-inputs "gzip")) - (bzip2 (assoc-ref %build-inputs "bzip2"))) - (substitute* "src/libkeymap/findfile.c" - (("gzip") - (string-append gzip "/bin/gzip")) - (("bzip2") - (string-append bzip2 "/bin/bzip2"))))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure these programs find their comrades. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (for-each (lambda (prog) - (wrap-program (string-append bin "/" prog) - `("PATH" ":" prefix (,bin)))) - '("unicode_start" "unicode_stop")))) - %standard-phases)))) + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + (let ((gzip (assoc-ref %build-inputs "gzip")) + (bzip2 (assoc-ref %build-inputs "bzip2"))) + (substitute* "src/libkeymap/findfile.c" + (("gzip") + (string-append gzip "/bin/gzip")) + (("bzip2") + (string-append bzip2 "/bin/bzip2")))))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure these programs find their comrades. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (for-each (lambda (prog) + (wrap-program (string-append bin "/" prog) + `("PATH" ":" prefix (,bin)))) + '("unicode_start" "unicode_stop")))))))) (inputs `(("check" ,check) ("gzip" ,gzip) ("bzip2" ,bzip2) -- cgit v1.2.3 From a78daf5e2bdd8e0b958d679c442d0f122a7d68cd Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 8 Apr 2016 21:57:56 +0300 Subject: gnu: kbd: Update to 2.0.3. * gnu/packages/linux.scm (kbd): Update to 2.0.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b84242968..d554ecc17a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1464,14 +1464,14 @@ system.") (define-public kbd (package (name "kbd") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/kbd/kbd-" version ".tar.xz")) (sha256 (base32 - "04mrms12nm5sas0nxs94yrr3hz7gmqhnmfgb9ff34bh1jszxmzcx")) + "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From dc9bdb1e2730589ff7c2ec5f1e601f4262eac9d6 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Mon, 18 Apr 2016 21:36:42 +0200 Subject: gnu: Add acpi. * gnu/packages/linux.scm (acpi): New variable. --- gnu/packages/linux.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d554ecc17a..fbbefbec1d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Raymond Nicholson +;;; Copyright © 2016 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. ;;; @@ -2104,6 +2105,26 @@ WLAN, Bluetooth and mobile broadband.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) +(define-public acpi + (package + (name "acpi") + (version "1.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/acpiclient/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp")))) + (build-system gnu-build-system) + (home-page "http://acpiclient.sourceforge.net") + (synopsis "Display information on ACPI devices") + (description "@code{acpi} attempts to replicate the functionality of the +\"old\" @code{apm} command on ACPI systems, including battery and thermal +information. It does not support ACPI suspending, only displays information +about ACPI devices.") + (license license:gpl2+))) + (define-public acpid (package (name "acpid") -- cgit v1.2.3 From a2cc073aa282ac9e7863e0cc980eedbe9fba8acb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 22 Apr 2016 21:32:14 -0400 Subject: gnu: linux-libre: Update to 4.5.2. * gnu/packages/linux.scm (linux-libre): Update to 4.5.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fbbefbec1d..49441e512f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -222,7 +222,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (search-path %load-path file))) (define-public linux-libre - (let* ((version "4.5.1") + (let* ((version "4.5.2") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps @@ -300,7 +300,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (uri (linux-libre-urls version)) (sha256 (base32 - "1x621kvaf842bzpgglfl31zi74ny9w9jgvmkz3z6m3708n8clrdh")))) + "0mw8n5pms33k3m3aamlryahrcbhfnqbzvkglgw3j4dhaja3hwr7n")))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) -- cgit v1.2.3 From 01963db007663cb13f4b97ac1ad9ee05784277cb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 22 Apr 2016 21:33:10 -0400 Subject: gnu: linux-libre-4.4: Update to 4.4.8. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.8. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 49441e512f..6d9f69ade0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -337,13 +337,13 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-4.4 (package (inherit linux-libre) - (version "4.4.7") + (version "4.4.8") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "031wh2k204zvshira28bf33sk1bbk19ilgqmkvkwjp6spk5wmvpq")))) + "0zyhdy01gjglgmlrmpqa1sdnm0z91mzwspbksj6zvcamczb8ml53")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.2.3 From c1ed117941f620d32ef13eaf2ddcb03fc4b6397d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 22 Apr 2016 21:33:59 -0400 Subject: gnu: linux-libre-4.1: Update to 4.1.22. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.22. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6d9f69ade0..a26e641342 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,13 +354,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.21") + (version "4.1.22") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1gfzwiinpxzhqb5xi7b1iv7ay96nrjlhia6bvcyq8ffkx7a2r715")))) + "0bn6qba7q4i3yn3zx2p56gawnb2gczrf4vyrjggirj4d60gvng7y")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.2.3