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

ocamlPackages.ocsigen-toolkit: 1.1.0 -> 2.0.0

+14 -9
+14 -9
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
··· 1 - { stdenv, fetchurl, buildOcaml, ocaml, opaline 1 + { stdenv, fetchFromGitHub, ocaml, findlib, opaline 2 2 , calendar, eliom, js_of_ocaml-ppx_deriving_json 3 3 }: 4 4 5 - buildOcaml rec 6 - { 7 - name = "ocsigen-toolkit"; 8 - version = "1.1.0"; 5 + stdenv.mkDerivation rec { 6 + pname = "ocsigen-toolkit"; 7 + name = "ocaml${ocaml.version}-${pname}-${version}"; 8 + version = "2.0.0"; 9 9 10 10 propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; 11 - buildInputs = [ opaline ]; 11 + buildInputs = [ ocaml findlib opaline ]; 12 12 13 13 installPhase = 14 14 '' ··· 17 17 opaline -prefix $out 18 18 ''; 19 19 20 - src = fetchurl { 21 - sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; 22 - url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; 20 + src = fetchFromGitHub { 21 + owner = "ocsigen"; 22 + repo = pname; 23 + rev = version; 24 + sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; 23 25 }; 26 + 27 + createFindlibDestdir = true; 24 28 25 29 meta = { 26 30 homepage = http://ocsigen.org/ocsigen-toolkit/; 27 31 description = " User interface widgets for Ocsigen applications"; 28 32 license = stdenv.lib.licenses.lgpl21; 29 33 maintainers = [ stdenv.lib.maintainers.gal_bolle ]; 34 + inherit (ocaml.meta) platforms; 30 35 }; 31 36 32 37