CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

style: Formatting

Browse Source
This commit is contained in:
Alain 2021-10-29 14:59:16 +02:00
parent cfcc454022
commit bba896c949
6 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,7 +1,6 @@
_build/ _build/
_opam/ _opam/
result result
*.install *.install
*.spellok *.spellok
*.catala*.errors *.catala*.errors

8
.nix/bindlib.nix
View File

@ -1,7 +1,4 @@
{ lib { lib, fetchFromGitHub, buildDunePackage }:
, fetchFromGitHub
, buildDunePackage
}:
# We need the very last version "bleeding edge" since previous versions don't use dune. # We need the very last version "bleeding edge" since previous versions don't use dune.
@ -23,7 +20,8 @@ buildDunePackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://rlepigre.github.io/ocaml-bindlib/"; 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; license = licenses.lgpl3;
maintainers = [ ]; maintainers = [ ];
}; };

8
.nix/unionfind.nix
View File

@ -1,7 +1,4 @@
{ lib { lib, fetchurl, buildDunePackage }:
, fetchurl
, buildDunePackage
}:
buildDunePackage rec { buildDunePackage rec {
pname = "unionFind"; pname = "unionFind";
@ -12,7 +9,8 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
src = fetchurl { 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="; hash = "sha256-szIwK9QyAw6fIIWDOiiyfyrEFZaaErGPRLkGhIK9STI=";
}; };

30
default.nix
View File

@ -1,24 +1,6 @@
{ lib { lib, fetchFromGitHub, buildDunePackage, ansiterminal, sedlex_2, menhir
, fetchFromGitHub , unionfind, bindlib, cmdliner, re, zarith, zarith_stubs_js, ocamlgraph
, buildDunePackage , calendar, visitors, benchmark, js_of_ocaml, js_of_ocaml-ppx, camomile, cppo }:
, 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 { buildDunePackage rec {
pname = "catala"; pname = "catala";
@ -54,11 +36,11 @@ buildDunePackage rec {
patches = [ ./.nix/no-web.patch ]; patches = [ ./.nix/no-web.patch ];
meta = with lib; { meta = with lib; {
homepage = "https://catala-lang.org"; 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; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };
} }

6
release.nix
View File

@ -2,6 +2,6 @@
with pkgs; with pkgs;
ocamlPackages.callPackage ./. { ocamlPackages.callPackage ./. {
bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix {}; bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix { };
unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix {}; unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix { };
} }

13
shell.nix
View File

@ -1,10 +1,11 @@
{ pkgs? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
with pkgs; with pkgs;
let pkg = ocamlPackages.callPackage ./. { let
bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix {}; pkg = ocamlPackages.callPackage ./. {
unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix {}; bindlib = ocamlPackages.callPackage ./.nix/bindlib.nix { };
}; unionfind = ocamlPackages.callPackage ./.nix/unionfind.nix { };
};
in mkShell { in mkShell {
inputsFrom = [ pkg ]; inputsFrom = [ pkg ];
buildInputs = pkg.propagatedBuildInputs ++ [ buildInputs = pkg.propagatedBuildInputs ++ [
@ -15,4 +16,4 @@ in mkShell {
ocamlPackages.utop ocamlPackages.utop
ocamlPackages.ocaml-lsp ocamlPackages.ocaml-lsp
]; ];
} }