From c680b932ff510e70edb2ef2e42d10d8aabb7e0de Mon Sep 17 00:00:00 2001 From: adelaett <90894311+adelaett@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:51:51 +0100 Subject: [PATCH] update nix files --- .nix/french_law.nix | 32 ++++++++++++++++++++++++++++++++ .nix/packages.nix | 1 + flake.nix | 1 + french_law/ocaml/dune | 5 ++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 .nix/french_law.nix diff --git a/.nix/french_law.nix b/.nix/french_law.nix new file mode 100644 index 00000000..3965271a --- /dev/null +++ b/.nix/french_law.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, odoc +, catala +}: + +buildDunePackage { + pname = "french_law"; + version = "0.7.0"; # TODO parse `catala.opam` with opam2json + + minimumOCamlVersion = "4.11"; + + src = ../.; + + duneVersion = "3"; + + propagatedBuildInputs = [ + odoc + catala + ]; + + nativeBuildInputs = [ catala ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/CatalaLang/catala"; + description = + "Build system for Catala, a specification language for tax and social benefits computation rules"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/.nix/packages.nix b/.nix/packages.nix index 15fdcebe..c4490d5a 100644 --- a/.nix/packages.nix +++ b/.nix/packages.nix @@ -10,4 +10,5 @@ ocamlPackages.overrideScope' (self: super: { clerk = self.callPackage ./clerk.nix { }; ubase = self.callPackage ./ubase.nix { }; dates_calc = self.callPackage ./dates_calc.nix { }; + french_law = self.callPackage ./french_law.nix { }; }) diff --git a/flake.nix b/flake.nix index b7ae30a4..c8976907 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ packages = { catala = ocamlPackages.catala; clerk = ocamlPackages.clerk; + french_law = ocamlPackages.french_law; }; defaultPackage = packages.catala; devShell = pkgs.mkShell { diff --git a/french_law/ocaml/dune b/french_law/ocaml/dune index 9c5a8a08..0ee51ae4 100644 --- a/french_law/ocaml/dune +++ b/french_law/ocaml/dune @@ -1,7 +1,9 @@ (executable (name bench) (modes native) + (public_name bench) (modules bench) + (package french_law) (libraries catala.runtime_ocaml french_law benchmark)) (executable @@ -28,5 +30,6 @@ (rule (alias runtest) + (package french_law) (action - (run ./bench.exe))) + (run bench)))