From 736d8af3fd0ae1ade885bb2675ecbc0a5e9a7030 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Mon, 1 Oct 2018 21:59:56 +0000
Subject: ocamlPackages.piqi: 0.6.13 -> 0.6.14 (#47621)

---
 pkgs/development/ocaml-modules/piqi/default.nix       |  6 +++---
 pkgs/development/ocaml-modules/piqi/safe-string.patch | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/piqi/safe-string.patch

(limited to 'pkgs/development/ocaml-modules')

diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index c7baa87a331..6be1595f7c5 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.13";
+  version = "0.6.14";
   name    = "piqi-${version}";
  
   src = fetchurl {
     url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
-    sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
+    sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
   };
 
   buildInputs = [ ocaml findlib which ocaml_optcomp ];
   propagatedBuildInputs = [ulex xmlm easy-format base64];
 
-  patches = [ ./no-ocamlpath-override.patch ./safe-string.patch ];
+  patches = [ ./no-ocamlpath-override.patch ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/piqi/safe-string.patch b/pkgs/development/ocaml-modules/piqi/safe-string.patch
deleted file mode 100644
index fbc2864d534..00000000000
--- a/pkgs/development/ocaml-modules/piqi/safe-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/piqilib/piqi_json_parser.mll
-+++ b/piqilib/piqi_json_parser.mll
-@@ -189,8 +189,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-     let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
-     let s = lexbuf.lex_buffer in
-     let start = lexbuf.lex_start_pos in
--    check_adjust_utf8 v lexbuf s start len;
--    Buffer.add_substring v.buf s start len
-+    check_adjust_utf8 v lexbuf (Bytes.unsafe_to_string s) start len;
-+    Buffer.add_subbytes v.buf s start len
- 
-   let map_lexeme f lexbuf =
-     let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
-- 
cgit 1.4.1