[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/13: gnu: colord: Update to 1.4.6.
From: |
guix-commits |
Subject: |
13/13: gnu: colord: Update to 1.4.6. |
Date: |
Tue, 27 Sep 2022 10:10:59 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 052c1b0643ce24cab73523096478f8b4f6202d7e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Sep 26 14:40:26 2022 -0400
gnu: colord: Update to 1.4.6.
* gnu/packages/gnome.scm (colord): Update to 1.4.6.
[source]: Override inherited field.
[configure-flags]: Use gexps.
[phases]: Likewise.
[native-inputs]: Remove labels.
---
gnu/packages/gnome.scm | 60 +++++++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c15d119b5c..c3bc3ca2fb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5620,37 +5620,43 @@ output devices.")
(define-public colord
(package/inherit colord-minimal
(name "colord")
+ (version "1.4.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
"https://www.freedesktop.org/software/colord/releases/"
+ "colord-" version ".tar.xz"))
+ (sha256
+ (base32 "0vwfx06k1in8hci3kdxpc3c0bh81f1vl5bp7favd3rdz4wd661vl"))))
(arguments
- (substitute-keyword-arguments
- (package-arguments colord-minimal)
+ (substitute-keyword-arguments (package-arguments colord-minimal)
((#:configure-flags flags)
- `(begin
- (use-modules (srfi srfi-1))
- (append '("-Dbash_completion=true"
- "-Ddocs=true"
- "-Dman=true"
- "-Dvapi=true")
- (fold delete ,flags '("-Dbash_completion=false"
- "-Ddocs=false"
- "-Dman=false")))))
+ #~(begin
+ (use-modules (srfi srfi-1))
+ (append '("-Dbash_completion=true"
+ "-Ddocs=true"
+ "-Dman=true"
+ "-Dvapi=true")
+ (fold delete #$flags '("-Dbash_completion=false"
+ "-Ddocs=false"
+ "-Dman=false")))))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'fix-bash-completion-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "data/meson.build"
- (("bash_completion.get_pkgconfig_variable\
+ #~(modify-phases #$phases
+ (add-after 'unpack 'fix-bash-completion-dir
+ (lambda _
+ (substitute* "data/meson.build"
+ (("bash_completion.get_pkgconfig_variable\
\\('completionsdir'\\)")
- (string-append "'" (assoc-ref outputs "out")
- "/etc/bash_completion.d'")))))))))
- (native-inputs
- (append
- `(("bash-completion" ,bash-completion)
- ("docbook-xsl" ,docbook-xsl-1.79.1)
- ("gtk-doc" ,gtk-doc/stable)
- ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
- ("libxslt" ,libxslt)
- ("vala" ,vala)) ;for VAPI, needed by simple-scan
- (package-native-inputs colord-minimal)))))
+ (string-append "'" #$output
+ "/etc/bash_completion.d'")))))))))
+ (native-inputs
+ (modify-inputs (package-native-inputs colord-minimal)
+ (append bash-completion
+ docbook-xsl-1.79.1
+ gtk-doc/stable
+ libxml2 ;for XML_CATALOG_FILES
+ libxslt
+ vala))))) ;for VAPI, needed by simple-scan
(define-public geoclue
(package
- 11/13: gnu: openjdk: Update to 18., (continued)
- 11/13: gnu: openjdk: Update to 18., guix-commits, 2022/09/27
- 06/13: gnu: openjdk13: Define with make-openjdk., guix-commits, 2022/09/27
- 10/13: gnu: openjdk17: Define with make-openjdk., guix-commits, 2022/09/27
- 09/13: gnu: openjdk16: Define with make-openjdk., guix-commits, 2022/09/27
- 03/13: gnu: opendjk11: Improve regular expressions., guix-commits, 2022/09/27
- 01/13: gnu: opendjk11: Remove trailing #t and use gexps., guix-commits, 2022/09/27
- 02/13: gnu: opendjk11: Remove input labels., guix-commits, 2022/09/27
- 04/13: gnu: opendjk11: Reduce size by removing extraneous files., guix-commits, 2022/09/27
- 07/13: gnu: openjdk14: Define with make-openjdk., guix-commits, 2022/09/27
- 05/13: gnu: openjdk12: Introduce 'make-openjdk' syntax and use it., guix-commits, 2022/09/27
- 13/13: gnu: colord: Update to 1.4.6.,
guix-commits <=
- 08/13: gnu: openjdk15: Define with make-openjdk., guix-commits, 2022/09/27