Package: guix-patches;
Reported by: raingloom <raingloom <at> riseup.net>
Date: Tue, 22 Nov 2022 19:48:02 UTC
Severity: normal
Tags: patch
Done: Julien Lepiller <julien <at> lepiller.eu>
Bug is archived. No further changes may be made.
Message #23 received at 59487 <at> debbugs.gnu.org (full text, mbox):
From: Csepp <raingloom <at> riseup.net> To: 59487 <at> debbugs.gnu.org Cc: pukkamustard <at> posteo.net, julien <at> lepiller.eu, raingloom <raingloom <at> riseup.net> Subject: [PATCH v2 2/2] gnu: Remove explicit test-target arguments in ocaml.scm. Date: Wed, 11 Jan 2023 18:40:03 +0100
From: raingloom <raingloom <at> riseup.net>
gnu/packages/ocaml.scm: Delete test-target if it's ".", "test", or "tests".
---
gnu/packages/ocaml.scm | 129 +++++++++++------------------------------
1 file changed, 33 insertions(+), 96 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5109cd052a..c3a586f091 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -664,8 +664,6 @@ (define-public ocaml-cudf
(base32
"1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk"))))
(build-system dune-build-system)
- (arguments
- '(#:test-target "."))
(propagated-inputs (list ocaml-extlib))
(native-inputs (list ocaml-ounit2))
(home-page "https://www.mancoosi.org/cudf/")
@@ -855,8 +853,7 @@ (define-public opam
"1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda* (#:key inputs make-flags #:allow-other-keys)
@@ -1699,8 +1696,6 @@ (define-public ocaml-qcheck
(sha256
(base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-alcotest ocaml-ounit ocaml-ppxlib))
(native-inputs
@@ -1744,8 +1739,6 @@ (define-public ocaml-qtest
(base32
"04ghjshh6104xyglm0db9kv90m62qla5f4bfrlndv6dsvgw3rdjl"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(propagated-inputs
`(("ounit" ,ocaml-ounit)
("qcheck" ,ocaml-qcheck)))
@@ -1771,8 +1764,6 @@ (define-public ocaml-stringext
(base32
"1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
("qtest" ,ocaml-qtest)))
@@ -2047,8 +2038,7 @@ (define-public ocaml4.07-ppx-tools-versioned
"07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:package "ppx_tools_versioned"))
+ `(#:package "ppx_tools_versioned"))
(propagated-inputs
(list ocaml-migrate-parsetree))
(properties `((upstream-name . "ppx_tools_versioned")))
@@ -2167,8 +2157,7 @@ (define-public ocaml-result
"166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:dune ,dune-bootstrap))
+ `(#:dune ,dune-bootstrap))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-result))
(ocaml5.0-variant . ,(delay ocaml5.0-result))))
(home-page "https://github.com/janestreet/result")
@@ -2183,8 +2172,7 @@ (define-public ocaml4.09-result
(inherit ocaml-result)
(name "ocaml4.09-result")
(arguments
- `(#:test-target "."
- #:dune ,ocaml4.09-dune-bootstrap
+ `(#:dune ,ocaml4.09-dune-bootstrap
#:ocaml ,ocaml-4.09
#:findlib ,ocaml4.09-findlib))))
@@ -2331,8 +2319,7 @@ (define-public ocaml-csv
"0y2hlqlmqs7r4y5mfzc5qdv7gdp3wxbwpz458vf7fj4593vg94cf"))))
(build-system dune-build-system)
(arguments
- `(#:package "csv"
- #:test-target "."))
+ `(#:package "csv"))
(home-page "https://github.com/Chris00/ocaml-csv")
(synopsis "Pure OCaml functions to read and write CSV")
(description
@@ -2570,7 +2557,6 @@ (define-public ocaml-alcotest
(build-system dune-build-system)
(arguments
`(#:package "alcotest"
- #:test-target "."
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-test-format
@@ -2615,8 +2601,7 @@ (define-public ocaml4.07-alcotest
(base32
"1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8"))))
(arguments
- `(#:package "alcotest"
- #:test-target "."))
+ `(#:package "alcotest"))
(properties '()))))
(define-public ocaml-ppx-tools
@@ -2689,8 +2674,6 @@ (define-public ocaml-ssl
(sha256 (base32
"1bg5vagklq6yfxsvcnj2i76xis8hb59088hkic82smyrxdjd1kjs"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(native-inputs
(list autoconf automake ocaml-alcotest which))
(propagated-inputs (list openssl))
@@ -3243,8 +3226,7 @@ (define-public ocaml-gen
"1z5nw5wljvcqp8q07h336bbvf9paynia0jsdh4486hlkbmr1ask1"))))
(build-system dune-build-system)
(arguments
- `(#:package "gen"
- #:test-target "."))
+ `(#:package "gen"))
(propagated-inputs
(list ocaml-odoc ocaml-seq))
(native-inputs
@@ -3504,8 +3486,6 @@ (define-public ocaml-ocp-indent
(base32
"1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(propagated-inputs
(list ocaml-cmdliner))
(home-page "https://www.typerex.org/ocp-indent.html")
@@ -3729,7 +3709,6 @@ (define-public ocaml-benchmark
(sha256
(base32 "0d0vdfjgjzf1y6wkd714d8b0piv1z9qav5ahsapynqzk4b4ahhnp"))))
(build-system dune-build-system)
- (arguments `(#:test-target "tests"))
(home-page "https://github.com/Chris00/ocaml-benchmark")
(synopsis "Benchmark running times of code")
(description
@@ -4070,8 +4049,6 @@ (define-public ocaml-re
(sha256
(base32 "1g0vmpx6ylv8m0w77zarn215pgb4czc6gcpb2fi5da1s307zwr0w"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-seq))
(native-inputs
@@ -4094,8 +4071,7 @@ (define-public ocaml4.07-re
(package
(inherit ocaml-re)
(arguments
- `(#:test-target "."
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-dune-version
(lambda _
@@ -4116,8 +4092,6 @@ (define-public ocaml-ocplib-endian
"1klj4g451s7m5r8bxmwc1rpvngpqdm40csnx9smgc06pwy2fax2c"))
(file-name (git-file-name name version))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(native-inputs
`(("cppo" ,ocaml-cppo)))
(home-page "https://github.com/OCamlPro/ocplib-endian")
@@ -4144,8 +4118,7 @@ (define-public ocaml-cstruct
"0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w"))))
(build-system dune-build-system)
(arguments
- `(#:package "cstruct"
- #:test-target "."))
+ `(#:package "cstruct"))
(propagated-inputs
(list ocaml-bigarray-compat))
(native-inputs
@@ -4188,8 +4161,6 @@ (define-public ocaml-hex
(base32
"0xnl5wxd2qrba7phm3mdrjwd2kk26kb17dv94ciwp49ljcj28qc1"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
`(("ocaml-bigarray-compat" ,ocaml-bigarray-compat)
("cstruct" ,ocaml-cstruct)))
@@ -4213,8 +4184,7 @@ (define-public ocaml-ezjsonm
(base32 "004knljxqxn9zq0rnq7q7wxl4nwlzydm8p9f5cqkl8il5yl5zkjm"))))
(build-system dune-build-system)
(arguments
- `(#:package "ezjsonm"
- #:test-target "."))
+ `(#:package "ezjsonm"))
(native-inputs (list ocaml-alcotest js-of-ocaml node))
(propagated-inputs (list ocaml-jsonm ocaml-uutf ocaml-sexplib0 ocaml-hex))
(home-page "https://github.com/mirage/ezjsonm/")
@@ -4241,8 +4211,7 @@ (define-public ocaml-uri
(base32
"1bgkc66cq00mgnkz3i535srwzwc4cpdsv0mly5dzvvq33451xwf0"))))
(build-system dune-build-system)
- (arguments '(#:package "uri"
- #:test-target "."))
+ (arguments '(#:package "uri"))
(propagated-inputs
(list ocaml-stringext ocaml-angstrom))
(native-inputs
@@ -4268,8 +4237,7 @@ (define-public ocaml4.07-uri
(base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-before 'build 'update-deprecated
(lambda _
@@ -4692,8 +4660,6 @@ (define-public ocaml-zed
ocaml-uucp
ocaml-uuseg
ocaml-odoc))
- (arguments
- `(#:test-target "."))
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed))))
(synopsis "Abstract engine for text edition in OCaml")
(description
@@ -4741,8 +4707,6 @@ (define-public ocaml-lambda-term
(base32
"1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-logs
ocaml-lwt
@@ -4796,8 +4760,6 @@ (define-public ocaml-utop
(sha256
(base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(native-inputs
(list ocaml-cppo))
(propagated-inputs
@@ -4852,8 +4814,6 @@ (define-public ocaml-ansiterminal
(base32
"052qnc23vmxp90yympjz9q6lhqw98gs1yvb3r15kcbi1j678l51h"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(properties `((upstream-name . "ANSITerminal")))
(home-page "https://github.com/Chris00/ANSITerminal")
(synopsis
@@ -5233,8 +5193,6 @@ (define-public ocaml-bindlib
(base32
"1viyws3igy49hfaj4jaiwm4iggck9zdn7r3g6kh1n4zxphqk57yk"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(native-inputs
(list ocamlbuild ocaml-findlib))
(home-page "https://rlepigre.github.io/ocaml-bindlib/")
@@ -5261,8 +5219,6 @@ (define-public ocaml-earley
(base32
"1vi58zdxchpw6ai0bz9h2ggcmg8kv57yk6qbx82lh47s5wb3mz5y"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-stdlib-shims))
(synopsis "Parsing library based on Earley Algorithm")
@@ -5287,8 +5243,6 @@ (define-public ocaml-timed
"1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1"))
(file-name (git-file-name name version))))
(build-system dune-build-system)
- (arguments
- '(#:test-target "."))
(synopsis "Timed references for imperative state")
(description "Timed references for imperative state. This module provides
an alternative type for references (or mutable cells) supporting undo/redo
@@ -5353,8 +5307,7 @@ (define-public ocaml-yojson
"1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:package "yojson"))
+ `(#:package "yojson"))
(propagated-inputs (list ocaml-seq))
(native-inputs (list ocaml-alcotest ocaml-cppo))
(synopsis "Low-level JSON library for OCaml")
@@ -5504,8 +5457,7 @@ (define-public ocaml-gsl
"1l5zkkkg8sglsihrbf10ivq9s8xzl1y6ag89i4jqpnmi4m43fy34"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-gsl-directory
(lambda* (#:key inputs #:allow-other-keys)
@@ -5898,8 +5850,6 @@ (define-public ocaml-ppx-deriving
(base32
"1wqcnw4wi6pfjjhixpakckm03dpj990259za432804471a6spm2j"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-ppx-derivers ocaml-ppxlib ocaml-result))
(native-inputs
@@ -6945,7 +6895,6 @@ (define-public ocaml-ppx-cold
(janestreet-origin "ppx_cold" version
"13gqmfw2sq80anag9bwpm35600l1fnfn7mh9cbj1291k84rsx7wb"))
(build-system dune-build-system)
- (arguments `(#:test-target "tests"))
(propagated-inputs
(list ocaml-base ocaml-ppxlib))
(properties `((upstream-name . "ppx_cold")))
@@ -7130,8 +7079,6 @@ (define-public ocaml-ppx-typerep-conv
(sha256
(base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib))
(properties `((upstream-name . "ppx_typerep_conv")
(ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv))))
@@ -7197,8 +7144,6 @@ (define-public ocaml-ppx-stable
(sha256
(base32 "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(propagated-inputs (list ocaml-base ocaml-ppxlib))
(properties `((upstream-name . "ppx_stable")))
(home-page "https://github.com/janestreet/ppx_stable")
@@ -7216,8 +7161,6 @@ (define-public ocaml-ppx-base
"ppx_base" version
"181w7y2has8jsrqdsvd08q5nhnkx523vwsk3lg0cjix55qssvfyn"))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-ppx-compare
ocaml-ppx-cold
@@ -7373,8 +7316,6 @@ (define-public ocaml-ppx-disable-unused-warnings
(sha256
(base32 "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(propagated-inputs (list ocaml-base ocaml-ppxlib))
(properties `((upstream-name . "ppx_disable_unused_warnings")))
(home-page "https://github.com/janestreet/ppx_disable_unused_warnings")
@@ -7397,8 +7338,6 @@ (define-public ocaml-ppx-jane
(sha256
(base32 "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-base-quickcheck
ocaml-ppx-assert
@@ -7591,8 +7530,7 @@ (define-public ocaml4.07-jane-street-headers
"0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh"))))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:ocaml ,ocaml-4.07
+ `(#:ocaml ,ocaml-4.07
#:findlib ,ocaml4.07-findlib
#:dune ,ocaml4.07-dune))
(home-page "https://github.com/janestreet/jane-street-headers")
@@ -8065,8 +8003,7 @@ (define-public ocaml4.07-bisect-ppx
(native-inputs
`(("ocaml-ounit2" ,ocaml-ounit2)))
(arguments
- `(#:test-target "."
- ;; tests require git and network
+ `(;; tests require git and network
#:tests? #f))
(properties '((upstream-name . "bisect_ppx"))))))
@@ -8205,8 +8142,6 @@ (define-public ocaml-fftw3
(base32
"07ljbin9dsclsqh24p7haqjccz1w828sf5xfwlzl298d4a6zsbhs"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(propagated-inputs
(list fftw fftwf))
(native-inputs
@@ -8266,8 +8201,6 @@ (define-public ocaml-cairo2
(base32
"06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "tests"))
(inputs
`(("cairo" ,cairo)
("gtk+-2" ,gtk+-2)
@@ -8439,7 +8372,18 @@ (define-public lablgtk3
(build-system dune-build-system)
(arguments
`(#:package "lablgtk3"
- #:test-target "."))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'make-writable
+ (lambda _
+ (for-each (lambda (file)
+ (chmod file #o644))
+ (find-files "." "."))))
+ (add-before 'build 'set-version
+ (lambda _
+ (substitute* "dune-project"
+ (("\\(name lablgtk3\\)")
+ (string-append "(name lablgtk3)\n(version " ,version ")"))))))))
(propagated-inputs
(list ocaml-cairo2 ocaml-camlp-streams))
(inputs
@@ -8464,8 +8408,7 @@ (define-public ocaml-lablgtk3-sourceview3
(propagated-inputs (list lablgtk3))
(native-inputs (list gtksourceview-3 pkg-config))
(arguments
- `(#:package "lablgtk3-sourceview3"
- #:test-target "."))
+ `(#:package "lablgtk3-sourceview3"))
(synopsis "OCaml interface to GTK+ gtksourceview library")
(description "This package provides the lablgtk interface to the
GTK+ gtksourceview library.")))
@@ -8727,8 +8670,6 @@ (define-public ocaml-bigstringaf
(base32
"188j9awxg99vrp2l3rqfmdxdazq5xrjmg1wf62vfqsks9sff6wqx"))))
(build-system dune-build-system)
- (arguments
- '(#:test-target "."))
(propagated-inputs
(list ocaml-bigarray-compat))
(native-inputs
@@ -8860,8 +8801,7 @@ (define-public ocaml-angstrom
(build-system dune-build-system)
(arguments
;; Only build the base angstrom package.
- '(#:package "angstrom"
- #:test-target "."))
+ '(#:package "angstrom"))
(propagated-inputs
(list ocaml-bigstringaf))
(native-inputs
@@ -8908,8 +8848,7 @@ (define-public ocaml-uri-sexp
(inherit ocaml-uri)
(name "ocaml-uri-sexp")
(arguments
- '(#:package "uri-sexp"
- #:test-target "."))
+ '(#:package "uri-sexp"))
(propagated-inputs
(list ocaml-uri ocaml-ppx-sexp-conv ocaml-sexplib0))
(native-inputs (list ocaml-ounit))
@@ -8967,8 +8906,8 @@ (define-public js-of-ocaml
(base32 "14ig69iyc9yzniclfsc6cz9g9zqp96bs66y6dy4rzrm78s81w6i1"))))
(build-system dune-build-system)
(arguments
- `(#:tests? #f ;tests assume ocaml 4.13
- #:test-target "."))
+ ;;tests assume ocaml 4.13
+ `(#:tests? #f))
(propagated-inputs
(list ocaml-ppxlib
ocaml-uchar
@@ -9092,8 +9031,6 @@ (define-public ocaml-crowbar
(base32
"11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j"))))
(build-system dune-build-system)
- (arguments
- `(#:test-target "."))
(propagated-inputs
(list ocaml-ocplib-endian
ocaml-cmdliner
--
2.38.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.