lilyp pushed a commit to branch gnome-team
in repository guix.
commit 5fc7a5a9a9d133d43c3f77843adbe7d2129a905a
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Thu Jan 9 22:38:04 2025 +0100
gnu: uhttpmock: Update to 0.11.0.
* gnu/packages/web.scm (uhttpmock): Update to 0.11.0.
[build-system]: Use meson-build-system.
[inputs]: Replace libsoup-minimal-2 with libsoup. Drop labels.
[arguments]: Add #:glib-or-gtk? and #:configure-flags.
(uhttpmock-with-libsoup2): New variable.
* gnu/packages/gnome.scm (libgdata)[native-inputs]: Use
uhttpmock-with-libsoup2 instead of uhttpmock.
---
gnu/packages/gnome.scm | 2 +-
gnu/packages/web.scm | 33 +++++++++++++++++++++++++++------
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 191430c794..4937ba6885 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2088,7 +2088,7 @@ formats like PNG, SVG, PDF and EPS.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("uhttpmock" ,uhttpmock)))
+ ("uhttpmock" ,uhttpmock-with-libsoup2)))
(inputs
(list cyrus-sasl glib-networking vala))
(propagated-inputs
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 058649bf6b..839c3fbc52 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5692,23 +5692,24 @@ fast and flexible way of exploring HTML from the
terminal.")
(define-public uhttpmock
(package
(name "uhttpmock")
- (version "0.5.3")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://tecnocode.co.uk/downloads/uhttpmock/";
"uhttpmock-" version ".tar.xz"))
(sha256
- (base32 "0bqizz69hxk8rn4z57asz1d45vizl1rj6i5k3rzxn2x3qcik514h"))))
- (build-system glib-or-gtk-build-system)
+ (base32 "1gw4g3m99j00rjd3flbxigv3qgbkafnkhf77c76hv7yy58dc1vgy"))))
+ (build-system meson-build-system)
(native-inputs
(list gobject-introspection
;; For check phase.
glib-networking gsettings-desktop-schemas pkg-config))
- (inputs
- `(("libsoup" ,libsoup-minimal-2)))
+ (inputs (list libsoup))
(arguments
- `(#:phases
+ `(#:glib-or-gtk? #t
+ #:configure-flags '("-Dgtk_doc=false")
+ #:phases
(modify-phases %standard-phases
(add-before 'check 'set-home-for-tests
(lambda _
@@ -5721,6 +5722,26 @@ HTTPS. It provides a library, libuhttpmock, which
implements recording and
playback of HTTP request/response traces.")
(license license:lgpl2.1+)))
+(define-public uhttpmock-with-libsoup2
+ (package
+ (inherit uhttpmock)
+ (version "0.5.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://tecnocode.co.uk/downloads/uhttpmock/";
+ "uhttpmock-" version ".tar.xz"))
+ (sha256
+ (base32 "0bqizz69hxk8rn4z57asz1d45vizl1rj6i5k3rzxn2x3qcik514h"))))
+ (build-system glib-or-gtk-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home-for-tests
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
+ (inputs (list libsoup-minimal-2))))
+
(define-public woof
(package
(name "woof")
