[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/13: gnu: phodav: Use libsoup 2 instead of libsoup 3.
From: |
guix-commits |
Subject: |
10/13: gnu: phodav: Use libsoup 2 instead of libsoup 3. |
Date: |
Tue, 5 Apr 2022 14:43:11 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit d15a601a85c85431a691c2a3f85b9e6e0948a540
Author: Leo Nikkilä <hello@lnikki.la>
AuthorDate: Sat Apr 2 21:34:18 2022 +0300
gnu: phodav: Use libsoup 2 instead of libsoup 3.
Looks like phodav requires libsoup 2. Example of failing build logs,
wanting libsoup 2.4: <https://ci.guix.gnu.org/build/584454/log/raw>
After swapping the dependency, tests were failing due to HOME not being
writable. I added a new build phase to account for this. I also removed
the start-virtual-dir-server phase which no longer seems required, the
tests pass without it.
* gnu/packages/gnome.scm (phodav): Fix build, tests.
[inputs]: Replace libsoup 3 with libsoup 2.
[arguments]<#:phases>[set-temporary-home]: New phase.
[arguments]<#:phases>[start-virtual-dir-server]: Remove phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/gnome.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8ff59f084b..19adb67423 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -69,6 +69,7 @@
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1191,12 +1192,10 @@ Library reference documentation.")
(substitute* "data/meson.build"
(("udev\\.get_pkgconfig_variable\\('udevdir'\\)")
(format #f "'~a'" rules))))))
- (add-before 'check 'start-virtual-dir-server
- ;; The same server when started by tests/virtual-dir returns an
- ;; unexpected status (4 instead of 200) and fails a test. It is
- ;; unclear why starting it manually here makes it pass.
+ (add-before 'check 'set-temporary-home
+ ;; Tests want to write into HOME.
(lambda _
- (system "tests/virtual-dir-server &"))))))
+ (setenv "HOME" "/tmp"))))))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.3)
("gettext" ,gettext-minimal)
@@ -1205,7 +1204,7 @@ Library reference documentation.")
("gtk-doc" ,gtk-doc/stable)
("pkg-config" ,pkg-config)))
(inputs
- (list avahi libgudev libsoup))
+ (list avahi libgudev libsoup-minimal-2))
(synopsis "WebDav server implementation using libsoup")
(description "PhoDav was initially developed as a file-sharing mechanism
for Spice,
but it is generic enough to be reused in other projects,
- branch master updated (66177c2b87 -> e777c3e34c), guix-commits, 2022/04/05
- 03/13: doc: Update the sample yggdrasil-private.conf., guix-commits, 2022/04/05
- 06/13: gnu: python-dotenv: Update to 0.20.0., guix-commits, 2022/04/05
- 08/13: gnu: python-w3lib: Fix build., guix-commits, 2022/04/05
- 02/13: gnu: curlie: Update to 1.6.9, guix-commits, 2022/04/05
- 01/13: gnu: xmonad-next: Change #:phases to gexp., guix-commits, 2022/04/05
- 04/13: gnu: celluloid: Update to 0.23., guix-commits, 2022/04/05
- 05/13: gnu: linux: Allow kconfig options to be strings, guix-commits, 2022/04/05
- 07/13: gnu: python-gst: Fix the concatenation of install path., guix-commits, 2022/04/05
- 09/13: gnu: pantheon-calculator: Update to 1.7.2., guix-commits, 2022/04/05
- 10/13: gnu: phodav: Use libsoup 2 instead of libsoup 3.,
guix-commits <=
- 12/13: services: messaging: Fix two copy-paste mistakes; avoid warnings., guix-commits, 2022/04/05
- 11/13: gnu: plocate: Build with "--sharedstatedir=/var"., guix-commits, 2022/04/05
- 13/13: gnu: l2md: Update to 9db252bc., guix-commits, 2022/04/05