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

Fix nix part 4

.nix/catala.nix

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

.nix/clerk.nix

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

dune

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

flake.lock

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