From 45e1580a66261d4be7a6df190809bf9f09c7abd3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Jun 2020 11:12:32 -0500 Subject: httpd-mod-python-24: build with openssl-1.0.2 --- gn/packages/web.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gn/packages/web.scm b/gn/packages/web.scm index 7eb3adf..1539aa3 100644 --- a/gn/packages/web.scm +++ b/gn/packages/web.scm @@ -253,8 +253,7 @@ connections and other data between hits and access to Apache internals.") (base32 "1bmcx7ki7y486x6490yppssr7dh3a0qyki6gjf2lj83gyh68c0r0"))))))) (arguments - `(#:tests? #f - #:imported-modules ((guix build python-build-system) + `(#:imported-modules ((guix build python-build-system) ,@%gnu-build-system-modules) #:modules ((guix build gnu-build-system) (guix build utils) @@ -278,6 +277,11 @@ connections and other data between hits and access to Apache internals.") (("PY_INCLUDES=.*") (string-append "PY_INCLUDES=-I" python "/include/python" py-version "\n"))) (invoke "autoreconf" "-vfi")))) + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "test/test.py" + (("2\\.2") "2.4")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -363,7 +367,7 @@ connections and other data between hits and access to Apache internals.") ,@(package-native-inputs mod-python-24) ("mod-python" ,(package-source mod-python-24)))) (inputs - `(,@(package-inputs httpd) + `(,@(alist-delete "openssl" (package-inputs httpd)) ,@(package-inputs python-2.4) ("python" ,python-2.4))))) -- cgit v1.2.3