fix: nixpkgs commit url

coq · Feb 12, 2025 · 1d940f0 · 1d940f0
1 parent 8dba43a
commit 1d940f0
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 46 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,25 +3,26 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=4221c236f296269b5b2e2a6b733ebcd4a2e05f90";
 
-    coq-master = { url = "github:coq/coq/9d13cf5137c82610893241ac3c5c756f01c2aaa1"; }; # Should be kept in sync with PIN_COQ in CI workflow
-    coq-master.inputs.nixpkgs.follows = "nixpkgs";
+    rocq-master = { url = "github:coq/coq/9d13cf5137c82610893241ac3c5c756f01c2aaa1"; }; # Should be kept in sync with PIN_COQ in CI workflow
+    rocq-master.inputs.nixpkgs.follows = "nixpkgs";
 
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
-    coq-master,
+    rocq-master,
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       name = "vscoq-client";
       vscodeExtPublisher = "maximedenes";
       vscodeExtName = "vscoq";
       vscodeExtUniqueId = "maximedenes.vscoq";
       vscoq_version = "2.2.3";
-      coq = coq-master.packages.${system};
+      rocq = rocq-master.packages.${system};
     in rec {
       formatter = nixpkgs.legacyPackages.${system}.alejandra;
 
@@ -49,7 +50,7 @@
                 ++ (with coq.ocamlPackages; [
                   lablgtk3-sourceview3
                   glib
-                  gnome.adwaita-icon-theme
+                  pkgs.adwaita-icon-theme
                   wrapGAppsHook
                   ocaml
                   findlib
@@ -92,7 +93,7 @@
                 ++ (with coq.ocamlPackages; [
                   lablgtk3-sourceview3
                   glib
-                  gnome.adwaita-icon-theme
+                  pkgs.adwaita-icon-theme
                   wrapGAppsHook
                   ocaml
                   yojson
@@ -135,7 +136,7 @@
                 ++ (with coq.ocamlPackages; [
                   lablgtk3-sourceview3
                   glib
-                  gnome.adwaita-icon-theme
+                  pkgs.adwaita-icon-theme
                   wrapGAppsHook
                   ocaml
                   yojson
@@ -168,17 +169,17 @@
               version = vscoq_version;
               src = ./language-server;
               nativeBuildInputs = [
-                coq
+                rocq
               ];
               buildInputs =
                 [
-                  coq
+                  rocq
                   dune_3
                 ]
                 ++ (with coq.ocamlPackages; [
                   lablgtk3-sourceview3
                   glib
-                  gnome.adwaita-icon-theme
+                  pkgs.adwaita-icon-theme
                   wrapGAppsHook
                   ocaml
                   yojson