futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: libsoup-minimal: Update style.

Browse Source 
* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions.

Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Vivien Kraus 2023-12-02 16:09:40 +01:00 committed by Liliana Marie Prikler
parent 89f79f7129
commit 49b1ff08df
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/packages/gnome.scm
View File

@ -5032,25 +5032,26 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
"1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocs=disabled")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'adjust-tests
(lambda _
;; This test fails due to missing /etc/nsswitch.conf
;; in the build environment.
(substitute* "tests/unix-socket-test.c"
((".*/sockets/unconnected.*") ""))
(list
#:configure-flags #~(list "-Ddocs=disabled")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'adjust-tests
(lambda _
;; This test fails due to missing /etc/nsswitch.conf
;; in the build environment.
(substitute* "tests/unix-socket-test.c"
((".*/sockets/unconnected.*") ""))
;; These fail because "subdomain.localhost" does not resolve in
;; the build environment. Moreover, the hsts-test suite fails on
;; i686-linux because of errors from `session_get_uri' like
;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
(substitute* "tests/meson.build"
((".*'name': 'hsts'.*") ""))
(substitute* "tests/hsts-db-test.c"
((".*/hsts-db/subdomains.*") "")))))))
;; These fail because "subdomain.localhost" does not resolve in
;; the build environment. Moreover, the hsts-test suite fails on
;; i686-linux because of errors from `session_get_uri' like
;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
(substitute* "tests/meson.build"
((".*'name': 'hsts'.*") ""))
(substitute* "tests/hsts-db-test.c"
((".*/hsts-db/subdomains.*") "")))))))
(native-inputs
(list `(,glib "bin") ;for glib-mkenums
gobject-introspection
@ -5100,13 +5101,13 @@ and the GLib main loop, to integrate well with GNOME applications.")
#~(cons "-Dgtk_doc=false"
(delete "-Ddocs=disabled" #$configure-flags)))
((#:phases phases)
`(modify-phases ,phases
(replace 'adjust-tests
(lambda _
;; Disable the SSL test, failing since 2.68 and resolved in
;; libsoup 3.
(substitute* "tests/meson.build"
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
#~(modify-phases #$phases
(replace 'adjust-tests
(lambda _
;; Disable the SSL test, failing since 2.68 and resolved in
;; libsoup 3.
(substitute* "tests/meson.build"
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
(native-inputs
(modify-inputs (package-native-inputs libsoup-minimal)
(replace "vala" vala-0.52)))))