Fixes flake.nix

.envrc

@@ -0,0 +1,2 @@
+# this line sources your `.envrc.local` file
+source_env_if_exists .envrc.local

.gitignore

@@ -129,4 +129,7 @@ setup.log
 _opam/
 
 # for Nix
-result/
+result/
+/.envrc.local
+/result
+/.direnv/

README.md

@@ -53,7 +53,7 @@ you'll need to [install or enable flakes](https://nixos.wiki/wiki/Flakes).
 Then, cooltt can be built with the command
 
 ```
-nix build --impure
+nix build
 ```
 
 to put a binary `cooltt` in `result/bin/cooltt`. This is good for if you just want to build
@@ -63,7 +63,7 @@ If you're working on cooltt, you can enter a development shell with an OCaml com
 and other tools with
 
 ```
-nix develop --impure
+nix develop
 ```
 
 and then build as in the [with OPAM](https://github.com/RedPRL/cooltt/#with-opam=) section

cooltt.opam

@@ -25,7 +25,7 @@ depends: [
   "kado"
 ]
 pin-depends: [
-  [ "kado.~dev" "git+https://github.com/RedPRL/kado" ]
+  [ "kado.~dev" "git+https://github.com/RedPRL/kado#65573a1c0f14f6b09836f8ae317fda17f5900968" ]
   [ "bantorra.0.1.0" "git+https://github.com/RedPRL/bantorra#1e78633d9a2ef7104552a24585bb8bea36d4117b" ]
 ]
 build: [

flake.nix

@@ -2,35 +2,50 @@
   description = "Experimental implementation of Cartesian cubical type theory";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
-    flake-utils.url = "github:numtide/flake-utils";
-
     opam-repository = {
       url = "github:ocaml/opam-repository";
       flake = false;
     };
-
-    opam-nix = {
-      url = "github:tweag/opam-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.opam-repository.follows = "opam-repository";
-    };
+    opam-nix.url = "github:tweag/opam-nix";
+    opam-nix.inputs.opam-repository.follows = "opam-repository";
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.follows = "opam-nix/nixpkgs";
   };
 
-  outputs = { self
-            , flake-utils
-            , opam-nix
-            , nixpkgs
-            , opam-repository
-            }@inputs:
-    flake-utils.lib.eachDefaultSystem (system: {
-      legacyPackages = let
+  outputs = { self, flake-utils, opam-nix, opam-repository, nixpkgs }@inputs:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
         on = opam-nix.lib.${system};
-      in on.buildDuneProject { } "cooltt" ./. {
-        ocaml-base-compiler = null;
-      };
+        localPackagesQuery = builtins.mapAttrs (_: pkgs.lib.last)
+          (on.listRepo (on.makeOpamRepo ./.));
+        devPackagesQuery = {
+          ocaml-lsp-server = "*";
+          ocp-indent = "*";
+          merlin = "*";
+        };
+        query = devPackagesQuery // {
+          ocaml-base-compiler = "*";
+        };
+        scope = on.buildDuneProject { } "cooltt" ./. query;
+        devPackages = builtins.attrValues
+          (pkgs.lib.getAttrs (builtins.attrNames devPackagesQuery) scope);
+        packages =
+          pkgs.lib.getAttrs (builtins.attrNames localPackagesQuery) scope;
+      in
+      {
+        legacyPackages = scope;
+
+        packages = packages // { default = packages.cooltt; };
 
-      defaultPackage = self.legacyPackages.${system}."cooltt";
-    });
+        devShells.default = pkgs.mkShell {
+          inputsFrom = builtins.attrValues packages;
+          buildInputs = devPackages ++ [
+            pkgs.fd
+            pkgs.nixpkgs-fmt
+            pkgs.pkg-config
+            pkgs.shellcheck
+          ];
+        };
+      });
 }