diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:22:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:29:38 +0100 |
| commit | b15e543d303ea58fdc0f0541c708389f9d513e3d (patch) | |
| tree | 5c4bd48d67d4d3cd4806269dcabf58382f448bed /gnu/packages/patches | |
| parent | 4efc08d895274ee39e6e6e5c49121fb05a0281b6 (diff) | |
| parent | daf7b5ecef8de0e536ffd8d2957f022d010767a8 (diff) | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/patches')
3 files changed, 49 insertions, 42 deletions
diff --git a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch deleted file mode 100644 index b437bfb061..0000000000 --- a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001 -From: Sonja Heinze <sonjaleaheinze@gmail.com> -Date: Tue, 9 Mar 2021 12:57:47 +0100 -Subject: [PATCH] Adapt to Ppxlib's API change - -Ppxlib is removing Lexer.keyword_table from the API in exchange for -the more lightweight Keyword.is_keyword. - -Signed-off-by: Sonja Heinze <sonjaleaheinze@gmail.com> ---- -Patch from <https://github.com/janestreet/ppx_variants_conv/pull/9>. - - ppx_variants_conv.opam | 2 +- - src/ppx_variants_conv.ml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ppx_variants_conv.opam b/ppx_variants_conv.opam -index 7e7148d..b56040f 100644 ---- a/ppx_variants_conv.opam -+++ b/ppx_variants_conv.opam -@@ -15,7 +15,7 @@ depends: [ - "base" {>= "v0.14" & < "v0.15"} - "variantslib" {>= "v0.14" & < "v0.15"} - "dune" {>= "2.0.0"} -- "ppxlib" {>= "0.14.0"} -+ "ppxlib" {>= "0.23.0"} - ] - synopsis: "Generation of accessor and iteration functions for ocaml variant types" - description: " -diff --git a/src/ppx_variants_conv.ml b/src/ppx_variants_conv.ml -index 8d60086..112fc78 100644 ---- a/src/ppx_variants_conv.ml -+++ b/src/ppx_variants_conv.ml -@@ -66,7 +66,7 @@ end - - let variant_name_to_string v = - let s = String.lowercase v in -- if Caml.Hashtbl.mem Lexer.keyword_table s -+ if Keyword.is_keyword s - then s ^ "_" - else s - diff --git a/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch b/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch new file mode 100644 index 0000000000..012f5de31c --- /dev/null +++ b/gnu/packages/patches/ocaml-qcheck-fix-test-whitespace.patch @@ -0,0 +1,24 @@ +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 + diff --git a/gnu/packages/patches/rust-shell2batch-lint-fix.patch b/gnu/packages/patches/rust-shell2batch-lint-fix.patch new file mode 100644 index 0000000000..7c160b6cca --- /dev/null +++ b/gnu/packages/patches/rust-shell2batch-lint-fix.patch @@ -0,0 +1,25 @@ +Resolves the following error that was most likely introduced in new version of +rust as this package is from 2019: + +error: unnecessary parentheses around type + --> src/converter.rs:108:61 + | +108 | fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { + | ^^^^^^^^ help: remove these parentheses + +Reported upstream at https://github.com/sagiegurari/shell2batch/issues/17. + +diff --git a/src/converter.rs b/src/converter.rs +index fc87d68..af309d2 100644 +--- a/src/converter.rs ++++ b/src/converter.rs +@@ -105,7 +105,7 @@ fn replace_vars(arguments: &str) -> String { + updated_arguments + } + +-fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { ++fn add_arguments(arguments: &str, additional_arguments: Vec<String>, pre: bool) -> String { + let mut windows_arguments = if pre { + "".to_string() + } else { + |