diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2019-11-27 21:41:09 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2019-11-30 15:50:30 +0100 |
| commit | 05fe0a587a9d470c7bd3e66ac2178cf3389dbd37 (patch) | |
| tree | b646cb951c2b32b37d157b9309709de773162593 /gnu/packages/patches | |
| parent | 98a468ffd29252e2b08f53b7e115b8a3e0d1df15 (diff) | |
gnu: ocaml-piqilib: Update to 0.6.15.
* gnu/packages/ocaml.scm (ocaml-piqilib): Update to 0.6.15.
[source]: Remove patch.
[native-inputs]: Remove camlp4.
[propagated-inputs]: Replace ulex with sedlex.
* gnu/packages/patches/ocaml-piqilib-Update-base64.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/ocaml-piqilib-Update-base64.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/gnu/packages/patches/ocaml-piqilib-Update-base64.patch b/gnu/packages/patches/ocaml-piqilib-Update-base64.patch deleted file mode 100644 index ec2c02d93e..0000000000 --- a/gnu/packages/patches/ocaml-piqilib-Update-base64.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 98abdbff3d5316a75f27d6a76fe09317d56f2a38 Mon Sep 17 00:00:00 2001 -From: Vincent Bernardoff <vb@luminar.eu.org> -Date: Sun, 10 Feb 2019 14:47:07 +0100 -Subject: [PATCH] Fix compilation with newer base64 versions - ---- - opam | 2 +- - piqilib/piqi_base64.ml | 9 ++++----- - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/opam b/opam -index 3a9128e..bb5a53f 100644 ---- a/opam -+++ b/opam -@@ -26,6 +26,6 @@ depends: [ - "easy-format" - "ulex" - "xmlm" -- "base64" {>="2.0.0"} -+ "base64" {>="3.1.0"} - ] - dev-repo: "git://github.com/alavrik/piqi" -diff --git a/piqilib/piqi_base64.ml b/piqilib/piqi_base64.ml -index c5a6ae7..a98346e 100644 ---- a/piqilib/piqi_base64.ml -+++ b/piqilib/piqi_base64.ml -@@ -18,12 +18,11 @@ - (* TODO: add more base64 validation; the base64 library doesn't do any - * validation *) - let decode x = -- try -- B64.decode x -- with _ -> -- invalid_arg "Piqi_base64.decode" -+ match Base64.decode x with -+ | Error _ -> invalid_arg "Piqi_base64.decode" -+ | Ok v -> v - - - let encode x = -- B64.encode x -+ Base64.encode_exn x - --- -2.21.0 - |