test on OCaml 5.2, improve nix flake

anmonteiro · Jun 23, 2024 · dd811a5 · dd811a5
1 parent fe44d24
commit dd811a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [4_14, 5_0, 5_1]
+        ocamlVersion: [4_14, 5_1, 5_2]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - uses: cachix/install-nix-action@v20
+    - uses: cachix/install-nix-action@v27
       with:
         extra_nix_config: |
           extra-substituters = https://anmonteiro.nix-cache.workers.dev

diff --git a/flake.nix b/flake.nix
@@ -12,13 +12,14 @@
         pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
           ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
         });
-      in
-      rec {
         packages = pkgs.callPackage ./nix { nix-filter = nix-filter.lib; };
+      in
+      {
+        packages = packages // { default = packages.h2; };
         defaultPackage = packages.h2;
-        devShells = rec {
+        devShells = {
           default = pkgs.callPackage ./nix/shell.nix { inherit packages; };
-          release = default.override { release-mode = true; };
+          release = self.devShells.${system}.default.override { release-mode = true; };
         };
       });
 }