From d4acc8eb33b63ff35be0253d6792db5fdd2a99bb Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Mon, 6 Jun 2022 22:52:45 +0200
Subject: [PATCH 1/6] Change dune rule to build tests only for catala

---
 dune | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dune b/dune
index 89a6b5b3..aafbca69 100644
--- a/dune
+++ b/dune
@@ -8,6 +8,7 @@
 
 (rule
  (alias runtest)
+ (package catala)
  (deps
   (source_tree tests))
  (action
@@ -15,6 +16,7 @@
 
 (rule
  (alias runtest)
+ (package catala)
  (deps
   (source_tree examples))
  (action

From 5b845f4f9b6457dee5fa09c46b6eaed8d333ce68 Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:17:14 +0200
Subject: [PATCH 2/6] disable test in the nix build

---
 .nix/catala.nix | 2 +-
 .nix/clerk.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.nix/catala.nix b/.nix/catala.nix
index 45cd4d41..66252629 100644
--- a/.nix/catala.nix
+++ b/.nix/catala.nix
@@ -67,7 +67,7 @@ buildDunePackage rec {
     unionfind
     bindlib
   ] ++ (if isNull menhirLib then [ ] else [ menhirLib ]);
-  doCheck = true;
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://catala-lang.org";
diff --git a/.nix/clerk.nix b/.nix/clerk.nix
index 93fc854d..c3125c17 100644
--- a/.nix/clerk.nix
+++ b/.nix/clerk.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
     ninja_utils
     alcotest
   ];
-  doCheck = true;
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://github.com/CatalaLang/catala";

From c48b8843743a7e07fece976252d98a6d64408598 Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:36:15 +0200
Subject: [PATCH 3/6] typo

---
 .nix/clerk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nix/clerk.nix b/.nix/clerk.nix
index c3125c17..c7ad4682 100644
--- a/.nix/clerk.nix
+++ b/.nix/clerk.nix
@@ -9,7 +9,7 @@
 }:
 
 buildDunePackage rec {
-  pname = "ninja_utils";
+  pname = "clerk";
   version = "0.6.0"; # TODO parse `catala.opam` with opam2json
 
   minimumOCamlVersion = "4.11";

From 6fb8b06e07d23fbeb4f3b590d7f7da084afa857d Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:54:03 +0200
Subject: [PATCH 4/6] revert dependency between clerk and catala

---
 .nix/catala.nix | 5 ++---
 .nix/clerk.nix  | 4 +++-
 dune            | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.nix/catala.nix b/.nix/catala.nix
index 66252629..42ca321d 100644
--- a/.nix/catala.nix
+++ b/.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
 
@@ -67,7 +66,7 @@ buildDunePackage rec {
     unionfind
     bindlib
   ] ++ (if isNull menhirLib then [ ] else [ menhirLib ]);
-  doCheck = false;
+  doCheck = true;
 
   meta = with lib; {
     homepage = "https://catala-lang.org";
diff --git a/.nix/clerk.nix b/.nix/clerk.nix
index c7ad4682..a98d2250 100644
--- a/.nix/clerk.nix
+++ b/.nix/clerk.nix
@@ -6,6 +6,7 @@
 , cmdliner_1_1_0
 , ninja_utils
 , alcotest
+, catala
 }:
 
 buildDunePackage rec {
@@ -25,8 +26,9 @@ buildDunePackage rec {
     cmdliner_1_1_0
     ninja_utils
     alcotest
+    catala
   ];
-  doCheck = false;
+  doCheck = true;
 
   meta = with lib; {
     homepage = "https://github.com/CatalaLang/catala";
diff --git a/dune b/dune
index aafbca69..664c4c44 100644
--- a/dune
+++ b/dune
@@ -8,7 +8,7 @@
 
 (rule
  (alias runtest)
- (package catala)
+ (package clerk)
  (deps
   (source_tree tests))
  (action
@@ -16,7 +16,7 @@
 
 (rule
  (alias runtest)
- (package catala)
+ (package clerk)
  (deps
   (source_tree examples))
  (action

From 15aee21670d5cda5874a9a12bd4e684319be4be5 Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:56:37 +0200
Subject: [PATCH 5/6] disable clerk tests in nix build

---
 .nix/clerk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nix/clerk.nix b/.nix/clerk.nix
index a98d2250..3a15b3cd 100644
--- a/.nix/clerk.nix
+++ b/.nix/clerk.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
     alcotest
     catala
   ];
-  doCheck = true;
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://github.com/CatalaLang/catala";

From 7b4fd78e28f2f148f7b5c1ec2ca1407a9b00631e Mon Sep 17 00:00:00 2001
From: lIlIlIlIIIIlIIIllIIlIllIIllIII
 <90894311+lIlIlIlIIIIlIIIllIIlIllIIllIII@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:57:02 +0200
Subject: [PATCH 6/6] update flake

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index f7e41b27..3eef24e7 100644
--- a/flake.lock
+++ b/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": {