From 7f9c14afe40338434090e18950a8f2f816f67556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= <basile.clement@ocamlpro.com>
Date: Mon, 4 Dec 2023 13:12:08 +0100
Subject: [PATCH 1/5] WIP: Nix for CI?

---
 .github/workflows/nix.yml | 17 +++++++++++++++++
 default.nix               |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 .github/workflows/nix.yml

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
new file mode 100644
index 0000000000..5b91ba903b
--- /dev/null
+++ b/.github/workflows/nix.yml
@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+# Restrict the GITHUB_TOKEN
+permissions: {}
+
+jobs:
+  check:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix-shell --run 'make runtest-ci'
diff --git a/default.nix b/default.nix
index b8cc07982c..b0d4b045e0 100644
--- a/default.nix
+++ b/default.nix
@@ -24,6 +24,7 @@ let
       dolmen_loop
       camlzip
       ppx_deriving
+      stdcompat
     ];
   };
 

From 1360bd79e1cdeaa34e0567df00dcc9e69709f374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= <basile.clement@ocamlpro.com>
Date: Mon, 4 Dec 2023 13:25:16 +0100
Subject: [PATCH 2/5] Also macOS

---
 .github/workflows/nix.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 5b91ba903b..1c31ad2c3c 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -9,9 +9,13 @@ permissions: {}
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on:
+      - ubuntu-22.04
+      - macos-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix-shell --run 'make runtest-ci'

From 98a6c2d303559d519f007bd20455ed3445054d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= <basile.clement@ocamlpro.com>
Date: Mon, 4 Dec 2023 13:24:05 +0100
Subject: [PATCH 3/5] Bump nixpkgs

---
 nix/sources.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 6858698910..572e506544 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,6 +1,6 @@
 {
     "dolmen": {
-        "branch": "master",
+        "branch": "b14eb8a2400c3dd2c34cded212c2135bbce1a57c",
         "description": "Dolmen provides a library and a binary to parse, typecheck, and evaluate languages used in automated deduction",
         "homepage": "",
         "owner": "Gbury",
@@ -18,10 +18,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4ee5b576ac2861a818950aea99f609d7a6fc02a3",
-        "sha256": "0jpnc718q3xgwx6l17qwkxgc5ya5zvbsy45p4rygk7riwn0y0qlx",
+        "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
+        "sha256": "0370pkzfcpm05q5m0llr52y8vb87smr6hdpcfs9m1gl1s7h3qlpd",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4ee5b576ac2861a818950aea99f609d7a6fc02a3.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9f06adb793d1cca5384907b3b8a4071d5d7cb19.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ocplib-simplex": {

From f52ac5875c82b0bda2933153a6a75eb2eaff2217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= <basile.clement@ocamlpro.com>
Date: Mon, 4 Dec 2023 13:26:45 +0100
Subject: [PATCH 4/5] MAatrix

---
 .github/workflows/nix.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 1c31ad2c3c..7ad138d199 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -9,9 +9,13 @@ permissions: {}
 
 jobs:
   check:
-    runs-on:
-      - ubuntu-22.04
-      - macos-latest
+    matrix:
+      os:
+        - macos-latest
+        - ubuntu-22.04
+
+    runs-on: ${{ matrix.os }}
+
     steps:
       - uses: actions/checkout@v3
         with:

From 1e1ae17b0be77561018f8e1b0af1019087925675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= <basile.clement@ocamlpro.com>
Date: Mon, 4 Dec 2023 13:27:43 +0100
Subject: [PATCH 5/5] Syntax

---
 .github/workflows/nix.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 7ad138d199..5bebc31fd9 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -9,10 +9,11 @@ permissions: {}
 
 jobs:
   check:
-    matrix:
-      os:
-        - macos-latest
-        - ubuntu-22.04
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-22.04
 
     runs-on: ${{ matrix.os }}