diff --git a/.gitignore b/.gitignore index 25f233df..8e5891af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ _build/ _opam/ result - *.install *.spellok *.catala*.errors diff --git a/.nix/bindlib.nix b/.nix/bindlib.nix index 45b56f3d..1a3fc7d4 100644 --- a/.nix/bindlib.nix +++ b/.nix/bindlib.nix @@ -1,7 +1,4 @@ -{ lib -, fetchFromGitHub -, buildDunePackage -}: +{ lib, fetchFromGitHub, buildDunePackage }: # We need the very last version "bleeding edge" since previous versions don't use dune. @@ -23,7 +20,8 @@ buildDunePackage rec { meta = with lib; { homepage = "https://rlepigre.github.io/ocaml-bindlib/"; - description = "Bindlib is a library allowing the manipulation of data structures with bound variables"; + description = + "Bindlib is a library allowing the manipulation of data structures with bound variables"; license = licenses.lgpl3; maintainers = [ ]; }; diff --git a/.nix/unionfind.nix b/.nix/unionfind.nix index 937743fb..3f7e5d59 100644 --- a/.nix/unionfind.nix +++ b/.nix/unionfind.nix @@ -1,7 +1,4 @@ -{ lib -, fetchurl -, buildDunePackage -}: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "unionFind"; @@ -12,7 +9,8 @@ buildDunePackage rec { useDune2 = true; src = fetchurl { - url = "https://gitlab.inria.fr/fpottier/unionFind/-/archive/20200320/archive.tar.gz"; + url = + "https://gitlab.inria.fr/fpottier/unionFind/-/archive/20200320/archive.tar.gz"; hash = "sha256-szIwK9QyAw6fIIWDOiiyfyrEFZaaErGPRLkGhIK9STI="; }; diff --git a/default.nix b/default.nix index 8fed6d45..2531e987 100644 --- a/default.nix +++ b/default.nix @@ -1,24 +1,6 @@ -{ lib -, fetchFromGitHub -, buildDunePackage -, ansiterminal -, sedlex_2 -, menhir -, unionfind -, bindlib -, cmdliner -, re -, zarith -, zarith_stubs_js -, ocamlgraph -, calendar -, visitors -, benchmark -, js_of_ocaml -, js_of_ocaml-ppx -, camomile -, cppo -}: +{ lib, fetchFromGitHub, buildDunePackage, ansiterminal, sedlex_2, menhir +, unionfind, bindlib, cmdliner, re, zarith, zarith_stubs_js, ocamlgraph +, calendar, visitors, benchmark, js_of_ocaml, js_of_ocaml-ppx, camomile, cppo }: buildDunePackage rec { pname = "catala"; @@ -54,11 +36,11 @@ buildDunePackage rec { patches = [ ./.nix/no-web.patch ]; - meta = with lib; { homepage = "https://catala-lang.org"; - description = "Catala is a domain-specific programming language designed for deriving correct-by-construction implementations from legislative texts."; + description = + "Catala is a domain-specific programming language designed for deriving correct-by-construction implementations from legislative texts."; license = licenses.asl20; maintainers = with maintainers; [ ]; }; -} \ No newline at end of file +} diff --git a/release.nix b/release.nix index 732ec746..f1859d38 100644 --- a/release.nix +++ b/release.nix @@ -2,6 +2,6 @@ with pkgs; ocamlPackages.callPackage ./. { - bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix {}; - unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix {}; -} \ No newline at end of file + bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix { }; + unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix { }; +} diff --git a/shell.nix b/shell.nix index 9e86b66b..9470086e 100644 --- a/shell.nix +++ b/shell.nix @@ -1,10 +1,11 @@ -{ pkgs? import { } }: +{ pkgs ? import { } }: with pkgs; -let pkg = ocamlPackages.callPackage ./. { - bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix {}; - unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix {}; -}; +let + pkg = ocamlPackages.callPackage ./. { + bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix { }; + unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix { }; + }; in mkShell { inputsFrom = [ pkg ]; buildInputs = pkg.propagatedBuildInputs ++ [ @@ -15,4 +16,4 @@ in mkShell { ocamlPackages.utop ocamlPackages.ocaml-lsp ]; -} \ No newline at end of file +}