JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.piqi: 0.6.13 -> 0.6.14 (#47621)

Browse Source
This commit is contained in:
Vincent Laporte 2018-10-01 21:59:56 +00:00 committed by xeji
parent 5c5cb36f7a
commit 736d8af3fd
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/ocaml-modules/piqi/default.nix
View File

@ -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;

13
pkgs/development/ocaml-modules/piqi/safe-string.patch
View File

@ -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