From cfa04b1c6c640e9450eaf574fb60ce493825a3ee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:09:25 -0400 Subject: [PATCH] gnu: ocaml-dose3: Disable tests to avoid Python 2 dependencies. * gnu/packages/ocaml.scm (ocaml-dose3)[tests?]: Set to #f. [native-inputs]: Use new style. Remove python-2 and python2-pyyaml. --- gnu/packages/ocaml.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e6d6bc7a89..5591e08d78 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -663,21 +664,20 @@ (define-public ocaml-dose3 "ocaml-dose3-Install-mli-cmx-etc.patch")))) (build-system ocaml-build-system) (arguments - `(#:configure-flags + `(#:tests? #f ;the test suite requires python 2 + #:configure-flags ,#~(list (string-append "SHELL=" #+(file-append (canonical-package bash-minimal) "/bin/sh"))) #:make-flags ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib")))) (propagated-inputs - (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re)) + (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re)) (native-inputs - `(("perl" ,perl) - ("python" ,python-2) ; for a test script - ("python2-pyyaml" ,python2-pyyaml) ; for a test script - ("ocaml-extlib" ,ocaml-extlib) - ("ocamlbuild" ,ocamlbuild) - ("ocaml-cppo" ,ocaml-cppo))) + (list perl + ocaml-extlib + ocamlbuild + ocaml-cppo)) (home-page "https://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for