gnu: rrdtool: Update to 1.8.0.
* gnu/packages/rrdtool.scm (rrdtool): Update to 1.8.0. [source]: Change URI making Github the primary distribution point; [inputs]: Use new style; [arguments]: Use gexps, remove PRE-CONFIGURE phase. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
This commit is contained in:
parent
96f227e2fa
commit
0abde609f2
1 changed files with 33 additions and 34 deletions
|
@ -18,6 +18,7 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages rrdtool)
|
(define-module (gnu packages rrdtool)
|
||||||
|
#:use-module (guix git-download)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
|
@ -31,58 +32,56 @@
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages))
|
#:use-module (guix packages))
|
||||||
|
|
||||||
(define-public rrdtool
|
(define-public rrdtool
|
||||||
(package
|
(package
|
||||||
(name "rrdtool")
|
(name "rrdtool")
|
||||||
(version "1.7.2")
|
(version "1.8.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append "http://oss.oetiker.ch/rrdtool/pub/rrdtool-"
|
(uri (git-reference
|
||||||
version ".tar.gz"))
|
(url "https://github.com/oetiker/rrdtool-1.x")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"))))
|
"04dhygsp34dykrnbbcqni5f7hih0hzqbnj6d2sl439lqbx9k3q3b"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("cairo" ,cairo)
|
(list cairo
|
||||||
("freetype" ,freetype)
|
freetype
|
||||||
("glib" ,glib)
|
glib
|
||||||
("gtk" ,gtk+-2)
|
gtk+-2
|
||||||
("libxml2" ,libxml2)
|
libxml2
|
||||||
("pango" ,pango)
|
pango
|
||||||
("python" ,python)))
|
python))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list groff
|
(list groff
|
||||||
pkg-config
|
pkg-config
|
||||||
;; For tests.
|
;; For tests.
|
||||||
bc
|
bc
|
||||||
perl ; will also build Perl bindings
|
perl ; will also build Perl bindings
|
||||||
tzdata-for-tests))
|
tzdata-for-tests))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:disallowed-references (,tzdata-for-tests)
|
(list
|
||||||
#:phases
|
#:disallowed-references (list (gexp-input tzdata-for-tests))
|
||||||
(modify-phases %standard-phases
|
#:phases
|
||||||
(add-before 'configure 'pre-configure
|
#~(modify-phases %standard-phases
|
||||||
(lambda _
|
(add-before 'check 'prepare-test-environment
|
||||||
(substitute* "libtool"
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(("/bin/sed") (which "sed")))
|
(setenv "TZDIR"
|
||||||
#t))
|
(search-input-directory inputs "share/zoneinfo"))))
|
||||||
(add-before 'check 'prepare-test-environment
|
(add-after 'install 'remove-native-input-references
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda _
|
||||||
(setenv "TZDIR"
|
(let ((examples (string-append #$output
|
||||||
(search-input-directory inputs "share/zoneinfo"))))
|
"/share/rrdtool/examples")))
|
||||||
(add-after 'install 'remove-native-input-references
|
;; Drop shebangs from examples to avoid depending on native-input
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
;; perl. It's clear from context and extension how to run them.
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(substitute* (find-files examples "\\.pl$")
|
||||||
(examples (string-append out "/share/rrdtool/examples")))
|
(("^#!.*") ""))))))))
|
||||||
;; Drop shebangs from examples to avoid depending on native-input
|
|
||||||
;; perl. It's clear from context and extension how to run them.
|
|
||||||
(substitute* (find-files examples "\\.pl$")
|
|
||||||
(("^#!.*") ""))
|
|
||||||
#t))))))
|
|
||||||
(home-page "https://oss.oetiker.ch/rrdtool/")
|
(home-page "https://oss.oetiker.ch/rrdtool/")
|
||||||
(synopsis "Time-series data storage and display system")
|
(synopsis "Time-series data storage and display system")
|
||||||
(description
|
(description
|
||||||
|
|
Reference in a new issue