From 9f250190951ddc9aafa82fa11b398dc1918045df Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 24 Jun 2016 18:33:50 -0400 Subject: gnu: linux-libre-4.1: Update to 4.1.27. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.27. --- 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 16fd5d0ab31..4d298b6737e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,13 +357,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.26") + (version "4.1.27") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1vrqz7z0b9zl6g8nbvz1hb2jhgy5zpnbdwc1v3zc4wjc35i2c4i4")))) + "0bbp782gdj8kz986a8hfygdrj7is0c8wgbb2mpb9gqhkfxcg74kf")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.3 From 18c658f966dd9af23496bd591b5863a30dbcd6ad Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 25 Jun 2016 13:12:12 -0400 Subject: gnu: linux-libre-4.4: Update to 4.4.14. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.14. --- 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 4d298b6737e..bfe78b677cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -340,13 +340,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.13") + (version "4.4.14") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1qcgnprgl9hy4g51bkx4bjs1cdsyy9kpwqymxggwghrzdid41x9l")))) + "1yfmzrjrkj8mn2dfd7p98w13afchrkpz26gwfcm2fhsmla16n1my")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.3 From 36c6919c93e2894b44a50cfed8f50506ae5be5cc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 25 Jun 2016 13:13:36 -0400 Subject: gnu: linux-libre: Update to 4.6.3. * gnu/packages/linux.scm (linux-libre): Update to 4.6.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 bfe78b677cc..a0c21d8d2ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -225,7 +225,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.6.2") + (let* ((version "4.6.3") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps @@ -303,7 +303,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (uri (linux-libre-urls version)) (sha256 (base32 - "1sq75sbs85kwngq8l0n5v5v1z973l71by98k3wbw1mfq3g0s323b")))) + "1ajhdk9jq0pfxlhvzwarbxc23418yqav1v0z0mnfs575y5lq2gmp")))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) -- cgit v1.3 From b58c1b2d9b8f6d2aaee92a55804d7aa75f5f3499 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Jul 2016 22:08:47 +0300 Subject: gnu: sshfs-fuse: Update to 2.8. * gnu/packages/linux.scm (sshfs-fuse): Update to 2.8. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a0c21d8d2ca..1c9d6d40b3a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1419,17 +1419,15 @@ UnionFS-FUSE additionally supports copy-on-write.") (define-public sshfs-fuse (package (name "sshfs-fuse") - (version "2.5") + (version "2.8") (source (origin (method url-fetch) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) - (string-append "https://github.com/libfuse/sshfs/releases/" - "download/sshfs_" version-with-underscores - "/sshfs-fuse-" version ".tar.gz"))) + (uri (string-append "https://github.com/libfuse/sshfs/releases/" + "download/sshfs_" version + "/sshfs-" version ".tar.gz")) (sha256 (base32 - "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9")))) + "08mdd4rs7yys7hmyig6i08qlid76p17xlvrh64k7wsrfs1s92s3z")))) (build-system gnu-build-system) (inputs `(("fuse" ,fuse) -- cgit v1.3 From 75750abbbc66a8cdf10048ac846a57dab1eec801 Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 3 Jul 2016 04:05:39 +0200 Subject: gnu: Order module imports in (gnu packages linux) alphabetically. * gnu/packages/linux.scm: Order module imports alphabetically. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c9d6d40b3a..509727d7cbb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,49 +30,49 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages linux) - #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages admin) + #:use-module (gnu packages algebra) + #:use-module (gnu packages attr) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) + #:use-module (gnu packages calendar) + #:use-module (gnu packages check) #:use-module (gnu packages compression) - #:use-module (gnu packages gcc) + #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) + #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages flex) - #:use-module (gnu packages bison) - #:use-module (gnu packages admin) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages databases) #:use-module (gnu packages perl) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages readline) + #:use-module (gnu packages rrdtool) #:use-module (gnu packages slang) - #:use-module (gnu packages algebra) - #:use-module (gnu packages gettext) - #:use-module (gnu packages glib) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages attr) - #:use-module (gnu packages xml) - #:use-module (gnu packages autotools) #:use-module (gnu packages texinfo) - #:use-module (gnu packages check) - #:use-module (gnu packages maths) - #:use-module (gnu packages base) - #:use-module (gnu packages rrdtool) - #:use-module (gnu packages elf) - #:use-module (gnu packages gtk) - #:use-module (gnu packages docbook) - #:use-module (gnu packages documentation) - #:use-module (gnu packages readline) - #:use-module (gnu packages calendar) #:use-module (gnu packages tls) - #:use-module (gnu packages freedesktop) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system gnu) + #:use-module (gnu packages xml) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) -- cgit v1.3 From 9b0942c1b0bfee6878f31411106751769cef2e3d Mon Sep 17 00:00:00 2001 From: David Craven Date: Sun, 3 Jul 2016 04:26:28 +0200 Subject: gnu: Add rng-tools. * gnu/packages/linux.scm (rng-tools): New variable. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 509727d7cbb..0fd40ee9820 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016 David Craven ;;; ;;; This file is part of GNU Guix. ;;; @@ -2724,3 +2725,25 @@ from userspace.") commonly found on Microsoft Windows. It is implemented as a FUSE file system. The package provides additional NTFS tools.") (license license:gpl2+))) + +(define-public rng-tools + (package + (name "rng-tools") + (version "5") + (source (origin + (method url-fetch) + (uri (string-append + "http://downloads.sourceforge.net/sourceforge/gkernel/" + "rng-tools-" version ".tar.gz")) + (sha256 + (base32 + "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0")))) + (build-system gnu-build-system) + (synopsis "Random number generator daemon") + (description + "Monitor a hardware random number generator, and supply entropy +from that to the system kernel's @file{/dev/random} machinery.") + (home-page "http://sourceforge.net/projects/gkernel") + ;; The source package is offered under the GPL2+, but the files + ;; 'rngd_rdrand.c' and 'rdrand_asm.S' are only available under the GPL2. + (license (list license:gpl2 license:gpl2+)))) -- cgit v1.3 From 8f1488c63971360ece630e3cedae7d95e650cd4d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Jul 2016 21:52:06 -0400 Subject: gnu: linux-libre-4.4: Update to 4.4.15. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.15. --- 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 0fd40ee9820..dd2f359bcff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -341,13 +341,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.14") + (version "4.4.15") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1yfmzrjrkj8mn2dfd7p98w13afchrkpz26gwfcm2fhsmla16n1my")))) + "0n3lz4xnciif9v3y769q1pjs9321gvl6a2wr10r40sl1ixlk3ipz")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) -- cgit v1.3 From 7a7d6b2bdea1c81128a413ee19159dff5b36e32c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Jul 2016 21:57:33 -0400 Subject: gnu: linux-libre: Update to 4.6.4. * gnu/packages/linux.scm (linux-libre): Update to 4.6.4. --- 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 dd2f359bcff..9c33830ec6a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -226,7 +226,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.6.3") + (let* ((version "4.6.4") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps @@ -304,7 +304,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (uri (linux-libre-urls version)) (sha256 (base32 - "1ajhdk9jq0pfxlhvzwarbxc23418yqav1v0z0mnfs575y5lq2gmp")))) + "1294qw4agax0cnbhh0dk33jz358smhflllg77zv0rd8w9g433xiz")))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) -- cgit v1.3 From e05647add7d4ebddf68626b84fa640956ee35301 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 15 Jul 2016 14:29:22 +0200 Subject: Update e-mail address for Tobias Geerinckx-Rice. * .mailmap: Add Tobias Geerinckx-Rice. * gnu/packages/disk.scm: Replace "tobias.geerinckx.rice@gmail.com" with "me@tobias.gr". * gnu/packages/linux.scm: Likewise. * gnu/packages/networking.scm: Likewise. Co-authored-by: Tobias Geerinckx-Rice --- .mailmap | 1 + gnu/packages/disk.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/networking.scm | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/.mailmap b/.mailmap index 50b6e685bcd..2af7760b168 100644 --- a/.mailmap +++ b/.mailmap @@ -42,3 +42,4 @@ Ricardo Wurmus Sou Bunnbu (宋文武) Taylan Ulrich Bayırlı/Kammer Tomáš Čech +Tobias Geerinckx-Rice \ No newline at end of file diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 83ba4e4f7c5..54f23db01e2 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016 Tobias Geerinckx-Rice +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9c33830ec6a..601d4ac8d66 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2016 Tobias Geerinckx-Rice +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Raymond Nicholson ;;; Copyright © 2016 Mathieu Lirzin diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 72c601102ce..9e4f7bb010f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015 Stefan Reichör ;;; Copyright © 2016 Raimon Grau -;;; Copyright © 2016 Tobias Geerinckx-Rice +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright 2016 John Darrington ;;; Copyright © 2016 Nicolas Goaziou ;;; -- cgit v1.3 From ee6a5d0e3e8d147c49876df3bd89f0e5dafc0619 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 15 Jul 2016 19:18:36 +0200 Subject: gnu: lm-sensors: Add alternate source URL. * gnu/packages/linux.scm (lm-sensors)[source]: Add URL. --- gnu/packages/linux.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 601d4ac8d66..d20314fc603 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1861,9 +1861,14 @@ country-specific regulations for the wireless spectrum.") (version "3.3.5") (source (origin (method url-fetch) - (uri (string-append - "ftp://ftp.netroedge.com/pub/lm-sensors/lm_sensors-" - version ".tar.bz2")) + (uri (list (string-append + "ftp://ftp.netroedge.com/pub/lm-sensors/" + "lm_sensors-" version ".tar.bz2") + (string-append + "http://pkgs.fedoraproject.org/repo/pkgs/" + "lm_sensors/lm_sensors-3.3.5.tar.bz2/" + "da506dedceb41822e64865f6ba34828a/" + "lm_sensors-3.3.5.tar.bz2"))) (sha256 (base32 "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx")) -- cgit v1.3 From 58d6a1f227a09da0d17c0252978a583ff8e8b38e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Jul 2016 04:45:19 +0200 Subject: gnu: Add cpupower. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (cpupower): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d20314fc603..291ae0b4dfd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2752,3 +2752,41 @@ from that to the system kernel's @file{/dev/random} machinery.") ;; The source package is offered under the GPL2+, but the files ;; 'rngd_rdrand.c' and 'rdrand_asm.S' are only available under the GPL2. (license (list license:gpl2 license:gpl2+)))) + +(define-public cpupower + (package + (name "cpupower") + (version (package-version linux-libre)) + (source (package-source linux-libre)) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "tools/power/cpupower"))) + (delete 'configure) + (add-before 'build 'fix-makefiles + (lambda _ + (substitute* "Makefile" + (("/usr/") "/") + (("/bin/(install|pwd)" _ command) command)) + (substitute* "bench/Makefile" + (("\\$\\(CC\\) -o") "$(CC) $(LDFLAGS) -o"))))) + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list (string-append "DESTDIR=" out) + (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") + "docdir=/share/doc/cpupower" + "confdir=$(docdir)/examples" + ;; The Makefile recommends the following changes + "DEBUG=false" + "PACKAGE_BUGREPORT=bug-guix@gnu.org")) + #:tests? #f)) ;no tests + (native-inputs `(("gettext" ,gnu-gettext))) + (inputs `(("pciutils" ,pciutils))) + (home-page (package-home-page linux-libre)) + (synopsis "CPU frequency and voltage scaling tools for Linux") + (description + "cpupower is a set of user-space tools that use the cpufreq feature of the +Linux kernel to retrieve and control processor features related to power saving, +such as frequency and voltage scaling.") + (license license:gpl2))) -- cgit v1.3