chore: update nix flake

Signed-off-by: Ali Caglayan <[email protected]>
HoTT · Oct 8, 2024 · d1a2856 · d1a2856
1 parent f14c526
commit d1a2856
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "A Coq library for Homotopy Type Theory";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
 
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -16,25 +16,36 @@
             coqPackages = pkgs.mkCoqPackages coq // {
               __attrsFailEvaluation = true;
             };
-          in { extraPackages ? [ coqPackages.coq-lsp ] }:
+          in
+          { extraPackages ? [ coqPackages.coq-lsp ] }:
           pkgs.mkShell {
-            buildInputs = with coqPackages;
+            buildInputs =
               [ pkgs.dune_3 pkgs.ocaml ] ++ extraPackages ++ [ coq ];
           };
-      in {
+      in
+      {
         packages.default = pkgs.coqPackages.mkCoqDerivation {
           pname = "hott";
-          version = "8.19";
+          version = "8.20";
           src = self;
           useDune = true;
         };
 
-        devShells.default = makeDevShell { coq = pkgs.coq_8_20; } { };
-        devShells.coq_8_19 = makeDevShell { coq = pkgs.coq_8_19; } { };
+        devShells.default =
+          makeDevShell
+            { coq = pkgs.coq_8_20; }
+            { };
+
+        devShells.coq_8_19 =
+          makeDevShell
+            { coq = pkgs.coq_8_19; }
+            { };
 
         # To use, pass --impure to nix develop
         devShells.coq_master =
-          makeDevShell { coq = pkgs.coq.override { version = "master"; }; } { };
+          makeDevShell
+            { coq = pkgs.coq.override { version = "master"; }; }
+            { extraPackages = [ ]; };
 
         formatter = pkgs.nixpkgs-fmt;
       });