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

Merge pull request #278 from CatalaLang/dune-test-fixup

Browse Source 
Fix nix part 4
This commit is contained in:
Denis Merigoux 2022-06-07 19:04:45 +02:00 committed by GitHub
commit 1f4e869c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.nix/catala.nix
View File

@ -23,7 +23,6 @@
, z3 , z3
, alcotest , alcotest
, ppx_yojson_conv , ppx_yojson_conv
, clerk
, menhirLib ? null #for nixos-unstable compatibility. , menhirLib ? null #for nixos-unstable compatibility.
}: }:
@ -56,7 +55,7 @@ buildDunePackage rec {
camomile camomile
cppo cppo
z3 z3
clerk
pkgs.z3 pkgs.z3

6
.nix/clerk.nix
View File

@ -6,10 +6,11 @@
, cmdliner_1_1_0 , cmdliner_1_1_0
, ninja_utils , ninja_utils
, alcotest , alcotest
, catala
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "ninja_utils"; pname = "clerk";
version = "0.6.0"; # TODO parse `catala.opam` with opam2json version = "0.6.0"; # TODO parse `catala.opam` with opam2json
minimumOCamlVersion = "4.11"; minimumOCamlVersion = "4.11";
@ -25,8 +26,9 @@ buildDunePackage rec {
cmdliner_1_1_0 cmdliner_1_1_0
ninja_utils ninja_utils
alcotest alcotest
catala
]; ];
doCheck = true; doCheck = false;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/CatalaLang/catala"; homepage = "https://github.com/CatalaLang/catala";

2
dune
View File

@ -8,6 +8,7 @@
(rule (rule
(alias runtest) (alias runtest)
(package clerk)
(deps (deps
(source_tree tests)) (source_tree tests))
(action (action
@ -15,6 +16,7 @@
(rule (rule
(alias runtest) (alias runtest)
(package clerk)
(deps (deps
(source_tree examples)) (source_tree examples))
(action (action

6
flake.lock
View File

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653931853, "lastModified": 1654230545,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {