[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: gnu: libsoup: Simplify inputs.
From: |
guix-commits |
Subject: |
12/12: gnu: libsoup: Simplify inputs. |
Date: |
Sun, 5 Dec 2021 17:55:40 -0500 (EST) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit c162f8582ba1d3107dd494790a2d0b628b734d9e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Dec 5 23:53:40 2021 +0100
gnu: libsoup: Simplify inputs.
Obtained by running "guix style --input-simplification=always" and by
using 'modify-inputs' instead of list primitives.
* gnu/packages/gnome.scm (libsoup-minimal, libsoup-minimal-2, libsoup):
Simplify inputs.
---
gnu/packages/gnome.scm | 48 +++++++++++++++++++++++-------------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d349e30..2037ab9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5033,29 +5033,28 @@ libxml to ease remote use of the RESTful API.")
(substitute* "tests/hsts-db-test.c"
((".*/hsts-db/subdomains.*") "")))))))
(native-inputs
- `(("glib:bin" ,glib "bin") ;for glib-mkenums
- ("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("vala" ,vala)
- ("curl" ,curl)
- ("gnutls" ,gnutls) ;for 'certtool'
- ("httpd" ,httpd)))
+ (list `(,glib "bin") ;for glib-mkenums
+ gobject-introspection
+ intltool
+ pkg-config
+ python-wrapper
+ vala
+ curl
+ gnutls ;for 'certtool'
+ httpd))
(propagated-inputs
;; libsoup-3.0.pc refers to all of these (except where otherwise noted)
- `(("brotli" ,brotli)
- ("glib" ,glib)
- ("glib-networking" ,glib-networking) ; for GIO runtime modules
- ("libpsl" ,libpsl)
- ("nghttp2" ,nghttp2) ;for pkg-config
- ("nghttp2:lib" ,nghttp2 "lib")
- ("libxml2" ,libxml2)
- ("sqlite" ,sqlite)
- ("zlib" ,zlib)))
+ (list brotli
+ glib
+ glib-networking ; for GIO runtime modules
+ libpsl
+ nghttp2 ;for pkg-config
+ `(,nghttp2 "lib")
+ libxml2
+ sqlite
+ zlib))
(inputs
- `(("mit-krb5" ,mit-krb5)
- ("ntlm_auth" ,samba/fixed))) ; For ntlm_auth support
+ (list mit-krb5 samba/fixed)) ; For ntlm_auth support
(home-page "https://wiki.gnome.org/Projects/libsoup")
(synopsis "GLib-based HTTP Library")
(description
@@ -5086,8 +5085,8 @@ and the GLib main loop, to integrate well with GNOME
applications.")
(substitute* "tests/meson.build"
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
(native-inputs
- (cons `("vala" ,vala-0.52)
- (delete "vala" (package-native-inputs libsoup-minimal))))))
+ (modify-inputs (package-native-inputs libsoup-minimal)
+ (replace "vala" vala-0.52)))))
(define-public libsoup
(package/inherit libsoup-minimal
@@ -5116,9 +5115,8 @@ and the GLib main loop, to integrate well with GNOME
applications.")
(string-append doc "/share/gtk-doc"))
(delete-file-recursively
(string-append out "/share/gtk-doc")))))))))
- (native-inputs (append `(("docbook-xml" ,docbook-xml-4.1.2)
- ("gtk-doc" ,gtk-doc))
- (package-native-inputs libsoup-minimal)))))
+ (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
+ (prepend docbook-xml-4.1.2 gtk-doc)))))
(define-public libsecret
(package
- branch core-updates-frozen updated (0f2a77e -> c162f85), guix-commits, 2021/12/05
- 02/12: gnu: Add texlive-latex-luatex., guix-commits, 2021/12/05
- 05/12: gnu: openbox: Use 'librsvg-for-system'., guix-commits, 2021/12/05
- 04/12: gnu: mate: Depend on 'librsvg-for-system'., guix-commits, 2021/12/05
- 01/12: gnu: gtranslator: Fix URL., guix-commits, 2021/12/05
- 06/12: gnu: emacs: Use 'librsvg-for-system'., guix-commits, 2021/12/05
- 08/12: gnu: libsoup: Remove unneeded dependency on PHP., guix-commits, 2021/12/05
- 03/12: gnu: librsvg@2.40: Depend on the default Pango version., guix-commits, 2021/12/05
- 10/12: gnu: gtk+: Simplify inputs., guix-commits, 2021/12/05
- 07/12: gnu: gtk+: Use 'librsvg-for-system'., guix-commits, 2021/12/05
- 12/12: gnu: libsoup: Simplify inputs.,
guix-commits <=
- 11/12: gnu: librsvg: Simplify inputs., guix-commits, 2021/12/05
- 09/12: gnu: gtk+@2: Use 'librsvg-for-system'., guix-commits, 2021/12/05