ocamlPackages.mirage: 4.4.2 → 4.10.1 (ebb14544) · Commits · nix / nixpkgs

pkgs/development/ocaml-modules/functoria/default.nix

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		{
		lib,
		buildDunePackage,
		cmdliner,
		functoria-runtime,
		rresult,
		astring,
		fmt,
		logs,
		bos,
		fpath,
		emile,
		uri,
		alcotest,
		}:

		buildDunePackage {
		pname = "functoria";
		inherit (functoria-runtime) version src;

		minimalOCamlVersion = "4.08";

		propagatedBuildInputs = [
		cmdliner
		rresult
		astring
		fmt
		logs
		bos
		fpath
		emile
		uri
		];

		# Tests are not compatible with cmdliner 1.3
		doCheck = false;
		checkInputs = [
		alcotest
		functoria-runtime
		];

		meta = with lib; {
		description = "DSL to organize functor applications";
		homepage = "https://github.com/mirage/functoria";
		license = licenses.isc;
		maintainers = [ maintainers.vbgl ];
		};
		}

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		{
		lib,
		buildDunePackage,
		fetchurl,
		cmdliner,
		}:

		buildDunePackage rec {
		pname = "functoria-runtime";
		version = "4.4.2";

		src = fetchurl {
		url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
		hash = "sha256-fPJou5EYmIFfa54BMiFvS7BKQq0u1pkA9MVHXt8boPk=";
		};

		minimalOCamlVersion = "4.08";

		propagatedBuildInputs = [ cmdliner ];

		meta = with lib; {
		homepage = "https://github.com/mirage/functoria";
		license = licenses.isc;
		description = "Runtime support library for functoria-generated code";
		maintainers = [ maintainers.sternenseemann ];
		};
		}

+16 −13

Original line number	Diff line number	Diff line
		{
		buildDunePackage,
		ocaml,
		alcotest,
		functoria,
		mirage-runtime,
		astring,
		bos,
		cmdliner,
		emile,
		fmt,
		fpath,
		ipaddr,
		astring,
		logs,
		stdlib-shims,
		rresult,
		uri,
		}:

		buildDunePackage rec {
		pname = "mirage";
		inherit (mirage-runtime) version src;

		minimalOCamlVersion = "4.08";
		minimalOCamlVersion = "4.13";

		outputs = [
		"out"
		@@ -23,20 +26,20 @@ buildDunePackage rec {
		];

		propagatedBuildInputs = [
		ipaddr
		functoria
		mirage-runtime
		bos
		astring
		bos
		cmdliner
		emile
		fmt
		fpath
		ipaddr
		logs
		stdlib-shims
		rresult
		uri
		];

		# Tests need opam-monorepo
		doCheck = false;
		checkInputs = [
		alcotest
		];

		installPhase = ''
		runHook preInstall

+10 −5

Original line number	Diff line number	Diff line
		{
		lib,
		fetchurl,
		buildDunePackage,
		cmdliner,
		ipaddr,
		functoria-runtime,
		logs,
		lwt,
		alcotest,
		}:

		buildDunePackage {
		buildDunePackage (finalAttrs: {
		pname = "mirage-runtime";
		inherit (functoria-runtime) src version;
		version = "4.10.1";
		src = fetchurl {
		url = "https://github.com/mirage/mirage/releases/download/v${finalAttrs.version}/mirage-${finalAttrs.version}.tbz";
		hash = "sha256:1155b5e9a585d3b44dfdd72777d94a7222b0f88a1737593bfb1f09954b6fb914";
		};

		minimalOCamlVersion = "4.08";

		propagatedBuildInputs = [
		cmdliner
		ipaddr
		functoria-runtime
		logs
		lwt
		];
		@@ -29,4 +34,4 @@ buildDunePackage {
		license = licenses.isc;
		maintainers = with maintainers; [ sternenseemann ];
		};
		}
		})

+0 −4

Original line number	Diff line number	Diff line
		@@ -661,10 +661,6 @@ let

		frontc = callPackage ../development/ocaml-modules/frontc { };

		functoria = callPackage ../development/ocaml-modules/functoria { };

		functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { };

		functory = callPackage ../development/ocaml-modules/functory { };

		### G ###