Skip to content

Commit 25581cb

Browse files
authored
Merge pull request #1029 from coq/fix-flake-coq-master
Update flake.nix
2 parents cfcb7e4 + 1d940f0 commit 25581cb

File tree

2 files changed

+49
-46
lines changed

2 files changed

+49
-46
lines changed

flake.lock

+38-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33

44
inputs = {
55
flake-utils.url = "github:numtide/flake-utils";
6+
nixpkgs.url = "github:NixOS/nixpkgs?rev=4221c236f296269b5b2e2a6b733ebcd4a2e05f90";
67

7-
coq-master = { url = "github:coq/coq/3e7c26f8bb991e7335162647017edf21b2afd974"; }; # Should be kept in sync with PIN_COQ in CI workflow
8-
coq-master.inputs.nixpkgs.follows = "nixpkgs";
8+
rocq-master = { url = "github:coq/coq/9d13cf5137c82610893241ac3c5c756f01c2aaa1"; }; # Should be kept in sync with PIN_COQ in CI workflow
9+
rocq-master.inputs.nixpkgs.follows = "nixpkgs";
910

1011
};
1112

1213
outputs = {
1314
self,
1415
nixpkgs,
1516
flake-utils,
16-
coq-master,
17+
rocq-master,
1718
}:
1819
flake-utils.lib.eachDefaultSystem (system: let
1920
name = "vscoq-client";
2021
vscodeExtPublisher = "maximedenes";
2122
vscodeExtName = "vscoq";
2223
vscodeExtUniqueId = "maximedenes.vscoq";
2324
vscoq_version = "2.2.3";
24-
coq = coq-master.packages.${system};
25+
rocq = rocq-master.packages.${system};
2526
in rec {
2627
formatter = nixpkgs.legacyPackages.${system}.alejandra;
2728

@@ -49,7 +50,7 @@
4950
++ (with coq.ocamlPackages; [
5051
lablgtk3-sourceview3
5152
glib
52-
gnome.adwaita-icon-theme
53+
pkgs.adwaita-icon-theme
5354
wrapGAppsHook
5455
ocaml
5556
findlib
@@ -92,7 +93,7 @@
9293
++ (with coq.ocamlPackages; [
9394
lablgtk3-sourceview3
9495
glib
95-
gnome.adwaita-icon-theme
96+
pkgs.adwaita-icon-theme
9697
wrapGAppsHook
9798
ocaml
9899
yojson
@@ -135,7 +136,7 @@
135136
++ (with coq.ocamlPackages; [
136137
lablgtk3-sourceview3
137138
glib
138-
gnome.adwaita-icon-theme
139+
pkgs.adwaita-icon-theme
139140
wrapGAppsHook
140141
ocaml
141142
yojson
@@ -168,17 +169,17 @@
168169
version = vscoq_version;
169170
src = ./language-server;
170171
nativeBuildInputs = [
171-
coq
172+
rocq
172173
];
173174
buildInputs =
174175
[
175-
coq
176+
rocq
176177
dune_3
177178
]
178179
++ (with coq.ocamlPackages; [
179180
lablgtk3-sourceview3
180181
glib
181-
gnome.adwaita-icon-theme
182+
pkgs.adwaita-icon-theme
182183
wrapGAppsHook
183184
ocaml
184185
yojson

0 commit comments

Comments
 (0)