[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Wed, 27 Sep 2017 15:14:43 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 9f1d112d1282216f16b2f673c8213d2839e39b7a
Merge: 859620e cb1e0cf
Author: Marius Bakke <address@hidden>
Date: Wed Sep 27 21:14:27 2017 +0200
Merge branch 'master' into staging
Makefile.am | 1 +
README | 38 +++----
doc/guix.texi | 4 +
gnu/local.mk | 4 -
gnu/packages/ci.scm | 6 +-
gnu/packages/electronics.scm | 5 +-
gnu/packages/fontutils.scm | 37 ++-----
gnu/packages/ftp.scm | 4 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnupg.scm | 30 +++++-
gnu/packages/libunwind.scm | 8 +-
gnu/packages/linux.scm | 29 +++---
gnu/packages/lxqt.scm | 30 ++++++
gnu/packages/music.scm | 4 +-
gnu/packages/ntp.scm | 6 +-
.../patches/e2fsprogs-32bit-quota-warnings.patch | 46 ---------
gnu/packages/patches/fontforge-svg-modtime.patch | 35 -------
gnu/packages/patches/libunwind-CVE-2015-3239.patch | 17 ----
.../python-acme-dont-use-openssl-rand.patch | 28 ------
gnu/packages/samba.scm | 21 +++-
gnu/packages/tcl.scm | 45 +++++++++
gnu/packages/tls.scm | 7 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xorg.scm | 98 ++++++++++++++++++
gnu/services/cuirass.scm | 5 +
gnu/tests/base.scm | 8 +-
gnu/tests/install.scm | 6 +-
guix/build-system/meson.scm | 2 +-
guix/gnu-maintenance.scm | 72 +------------
guix/http-client.scm | 4 +-
guix/import/gnome.scm | 112 +++++++++++++++++++++
guix/upstream.scm | 19 ++++
33 files changed, 449 insertions(+), 296 deletions(-)
diff --cc gnu/packages/linux.scm
index dd83964,ae402ed..46434b3
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2372,45 -2372,49 +2373,48 @@@ country-specific regulations for the wi
(arguments
`(#:tests? #f ; no 'check' target
#:make-flags (list (string-append "PREFIX=" %output)
- (string-append "ETCDIR=" %output "/etc")
- (string-append "MANDIR=" %output "/share/man"))
+ (string-append "ETCDIR=" (assoc-ref %outputs "lib")
"/etc")
+ (string-append "INCLUDEDIR="
+ (assoc-ref %outputs "lib")
"/include")
+ (string-append "MANDIR=" %output "/share/man")
+ (string-append "LIBDIR=" (assoc-ref %outputs "lib")
"/lib"))
#:phases
- (alist-delete
- 'configure
- (alist-cons-before
- 'build 'patch-exec-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "prog/detect/sensors-detect"
- (("`uname")
- (string-append "`" (assoc-ref inputs "coreutils")
- "/bin/uname"))
- (("(`|\")modprobe" all open-quote)
- (string-append open-quote
- (assoc-ref inputs "kmod")
- "/bin/modprobe")))
- (substitute* '("prog/pwm/pwmconfig"
- "prog/pwm/fancontrol")
- (("gnuplot")
- (string-append (assoc-ref inputs "gnuplot")
- "/bin/gnuplot"))
- (("cat ")
- (string-append (assoc-ref inputs "coreutils")
- "/bin/cat "))
- (("egrep ")
- (string-append (assoc-ref inputs "grep")
- "/bin/egrep "))
- (("sed -e")
- (string-append (assoc-ref inputs "sed")
- "/bin/sed -e"))
- (("cut -d")
- (string-append (assoc-ref inputs "coreutils")
- "/bin/cut -d"))
- (("sleep ")
- (string-append (assoc-ref inputs "coreutils")
- "/bin/sleep "))
- (("readlink -f")
- (string-append (assoc-ref inputs "coreutils")
- "/bin/readlink -f"))))
- %standard-phases))))
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'patch-exec-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "prog/detect/sensors-detect"
+ (("`uname")
+ (string-append "`" (assoc-ref inputs "coreutils")
+ "/bin/uname"))
+ (("(`|\")modprobe" all open-quote)
+ (string-append open-quote
+ (assoc-ref inputs "kmod")
+ "/bin/modprobe")))
+ (substitute* '("prog/pwm/pwmconfig"
+ "prog/pwm/fancontrol")
+ (("gnuplot")
+ (string-append (assoc-ref inputs "gnuplot")
+ "/bin/gnuplot"))
+ (("cat ")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/cat "))
+ (("egrep ")
+ (string-append (assoc-ref inputs "grep")
+ "/bin/egrep "))
+ (("sed -e")
+ (string-append (assoc-ref inputs "sed")
+ "/bin/sed -e"))
+ (("cut -d")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/cut -d"))
+ (("sleep ")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/sleep "))
+ (("readlink -f")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/readlink -f")))
+ #t)))))
(home-page "http://jdelvare.nerim.net/devel.html#lmsensors";)
(synopsis "Utilities to read temperature/voltage/fan sensors")
(description