git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76198 from bcdarwin/update-functoria

functoria: 2.0.2 -> 3.0.3

commit612752a4ae7637a12b0abfd05c52e5be3adee44b authorMario Rodas <marsam@users.noreply.github.com> dateMon 23 Dec 2019, 08:57 (7 years ago) parente5b159880da0a6
1 file changed+20−21
pkgs/development/ocaml-modules/functoria/default.nix+20−21
pkgs/development/ocaml-modules/functoria/default.nix+20−21
@@ -1,28 +1,27 @@
1−{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
2−, bos, cmdliner, ocamlgraph
1+{ stdenv, fetchurl, buildDunePackage, alcotest, cmdliner
2+, rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime
33}:
44
5−if !stdenv.lib.versionAtLeast ocaml.version "4.03"
6−then throw "functoria is not available for OCaml ${ocaml.version}" else
5+buildDunePackage rec {
6+ pname = "functoria";
7+ version = "3.0.3";
78
8−stdenv.mkDerivation rec {
9− name = "ocaml${ocaml.version}-functoria-${version}";
10− version = "2.0.2";
11− src = fetchurl {
12− url = "https://github.com/mirage/functoria/releases/download/${version}/functoria-${version}.tbz";
13− sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747";
14− };
9+ minimumOCamlVersion = "4.04";
1510
16− buildInputs = [ ocaml findlib ocamlbuild topkg ];
17− propagatedBuildInputs = [ bos cmdliner ocamlgraph ];
11+ src = fetchurl {
12+ url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
13+ sha256 = "08wv2890gz7ci1fa2b3z4cvqf98nqb09f89y08kcmnsirlbbzlfh";
14+ };
1815
19− inherit (topkg) buildPhase installPhase;
16+ propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ];
17+ checkInputs = [ alcotest ];
2018
21− meta = {
22− description = "A DSL to organize functor applications";
23− homepage = https://github.com/mirage/functoria;
24− license = stdenv.lib.licenses.isc;
25− maintainers = [ stdenv.lib.maintainers.vbgl ];
26− inherit (ocaml.meta) platforms;
27− };
19+ doCheck = true;
20+
21+ meta = with stdenv.lib; {
22+ description = "A DSL to organize functor applications";
23+ homepage = https://github.com/mirage/functoria;
24+ license = licenses.isc;
25+ maintainers = [ maintainers.vbgl ];
26+ };
2827}