Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ocamlPackages.tyxml: 4.0.1 -> 4.2.0

+5 -10
+5 -10
pkgs/development/ocaml-modules/tyxml/default.nix
··· 1 - { stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re 1 + { stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re 2 2 }: 3 3 4 4 assert stdenv.lib.versionAtLeast ocaml.version "4.02"; 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "tyxml"; 8 - version = "4.0.1"; 8 + version = "4.2.0"; 9 9 name = "ocaml${ocaml.version}-${pname}-${version}"; 10 10 11 11 src = fetchzip { 12 12 url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; 13 - sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y"; 13 + sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; 14 14 }; 15 15 16 - patches = [ (fetchpatch { 17 - url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff; 18 - sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3"; 19 - })]; 16 + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; 20 17 21 - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; 22 - 23 - propagatedBuildInputs = [uutf re ppx_tools markup]; 18 + propagatedBuildInputs = [ uutf re ]; 24 19 25 20 createFindlibDestdir = true; 26 21