diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2022-02-06 19:30:24 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2022-02-06 21:41:54 +0100 |
| commit | c8b5f9daf5a5aed503c70ed7b3477d4edfd4f523 (patch) | |
| tree | 4949aebe821c6dbc27b9b9382c02d01eb121ca5a | |
| parent | 7c9ad54b0616112c7eea6dd02379616aef206490 (diff) | |
| download | guix-patches-c8b5f9daf5a5aed503c70ed7b3477d4edfd4f523.tar guix-patches-c8b5f9daf5a5aed503c70ed7b3477d4edfd4f523.tar.gz | |
gnu: ocaml-qcheck: Update to 0.18.1.
* gnu/packages/ocaml.scm (ocaml-qcheck): Update to 0.18.1.
* gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch: Remove
file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/ocaml.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch | 24 |
3 files changed, 3 insertions, 36 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3ae66803f2..38eed6bbae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1570,7 +1570,6 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ - %D%/packages/patches/ocaml-qcheck-fix-test-whitespace.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 150ce3157f..6b743f8892 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1548,7 +1548,7 @@ archive(native) = \"frontc.cmxa\"")))) (define-public ocaml-qcheck (package (name "ocaml-qcheck") - (version "0.18") + (version "0.18.1") (source (origin (method git-fetch) @@ -1556,19 +1556,11 @@ archive(native) = \"frontc.cmxa\"")))) (url "https://github.com/c-cube/qcheck") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "ocaml-qcheck-fix-test-whitespace.patch")) (sha256 - (base32 "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x")))) + (base32 "0g3r8lrw6fsdphgpnp08saxyxk1vd3chpmb564ir2qnsp716vz6z")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-deprecated - (lambda _ - (substitute* "src/core/QCheck.ml" - (("Pervasives.compare") "compare")) - #t))))) + `(#:test-target ".")) (propagated-inputs (list ocaml-alcotest ocaml-ounit)) (native-inputs diff --git a/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch b/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch deleted file mode 100644 index 012f5de31c..0000000000 --- a/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cb666fffcbeb78c8c14d271b3ba65ea514bfc44 Mon Sep 17 00:00:00 2001 -From: Julien Lepiller <julien@lepiller.eu> -Date: Fri, 19 Nov 2021 03:03:21 +0100 -Subject: [PATCH] Fix whitespace issue in test - ---- - example/alcotest/output.txt.expected | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/example/alcotest/output.txt.expected b/example/alcotest/output.txt.expected -index bde0b83..9f1417c 100644 ---- a/example/alcotest/output.txt.expected -+++ b/example/alcotest/output.txt.expected -@@ -16,7 +16,6 @@ test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) - [exception] test `fail_sort_id` failed on ≥ 1 cases: [1; 0] (after 20 shrink steps) - - -- - ────────────────────────────────────────────────────────────────────────────── - - 3 failures! 5 tests run. --- -2.33.1 - |