diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/rrdtool.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/rrdtool.scm')
| -rw-r--r-- | gnu/packages/rrdtool.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index 4390c5b0ca..1fb642216d 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -53,7 +53,7 @@ ("gtk" ,gtk+-2) ("libxml2" ,libxml2) ("pango" ,pango) - ("python" ,python-2))) + ("python" ,python))) (native-inputs (list groff pkg-config @@ -62,7 +62,8 @@ perl ; will also build Perl bindings tzdata-for-tests)) (arguments - '(#:phases + `(#:disallowed-references (,tzdata-for-tests) + #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ |