diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index f24f3bd..0e2aac5 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -18,7 +18,7 @@ jobs:
           nix_path: nixpkgs=channel:nixpkgs-unstable
       - name: Setup build matrix
         id: set-matrix
-        run: "echo ::set-output name=matrix::$(./ci-matrix.sh)"
+        run: echo "matrix=$(./ci-matrix.sh)" >> $GITHUB_OUTPUT
 
   builds:
     name: Build mathcomp and coq combination
diff --git a/.nix/config.nix b/.nix/config.nix
index 770f1dd..31698bf 100644
--- a/.nix/config.nix
+++ b/.nix/config.nix
@@ -46,6 +46,7 @@
     ## In some cases, light overrides are not available/enough
     ## in which case you can use either
     # coqPackages.<coq-pkg>.overrideAttrs = o: <overrides>;
+    coqPackages.mathcomp.override.version = "2.0.0";
     ## or a "long" overlay to put in `.nix/coq-overlays
     ## you may use `nix-shell --run fetchOverlay <coq-pkg>`
     ## to automatically retrieve the one from nixpkgs
diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
index 8070738..bd20995 100644
--- a/.nix/coq-nix-toolbox.nix
+++ b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"f0370efea6403ad3862e379fdd0892ed5a295d55"
+"a407b99285047baaf8e90fef7c33644f623a1a87"
diff --git a/.nix/nixpkgs.nix b/.nix/nixpkgs.nix
index 1621de6..00af792 100644
--- a/.nix/nixpkgs.nix
+++ b/.nix/nixpkgs.nix
@@ -1,4 +1,4 @@
 fetchTarball {
-         url = https://github.com/CohenCyril/nixpkgs/archive/8c2fccc525426a1ac5370b8748756934e20e20bf.tar.gz;
-         sha256 = "18zr88g3p7x4dhldxqzzxn56fq5qvh5vwcy5g7kgq7n3kvaqpk3r";
-       }
+    url = https://github.com/NixOS/nixpkgs/archive/493c4e6a0cfb9b05cdc870cbd94b10a0528aff4a.tar.gz;
+    sha256 = "0m9jz3gnw7b37l1h45xpzjn3rblrvvza1nv5i0k9fvwdxpsa8jr7";
+  }
diff --git a/matrix/default.nix b/matrix/default.nix
index 972a3da..9c9f98e 100644
--- a/matrix/default.nix
+++ b/matrix/default.nix
@@ -3,6 +3,7 @@ with import <nixpkgs> {}; with builtins; with lib;
 let
   old-coq = [ "8.9" "8.8" "8.7" ];
   mc-coq-set = {
+    "2.0.0"  = [ "8.18" "8.17" "8.16"];
     "1.17.0" = [ "8.17" "8.16" "8.15"];
     "1.16.0" = [ "8.17" "8.16" "8.15" "8.14" "8.13" ];
     "1.15.0" = [ "8.16" "8.15" "8.14" "8.13" ];
@@ -11,8 +12,8 @@ let
     "1.12.0" = [ "8.13" "8.12" "8.11" "8.10" ];
     "1.11.0" = [ "8.12" "8.11" "8.10" ] ++ old-coq;
     "1.10.0" = [ "8.11" "8.10" ] ++ old-coq;
-    "1.9.0" =  [ "8.10" ] ++ old-coq;
-    "1.8.0" =  old-coq;
+    "1.9.0"  = [ "8.10" ] ++ old-coq;
+    "1.8.0"  = old-coq;
   };
 
   mcs   = sort versionAtLeast (attrNames mc-coq-set);