Skip to content

Commit 11a8f4c

Browse files
authored
Merge pull request #717 from CohenCyril/fix-flake
Nix flakes: Using the right ocamlPackages and updating locks
2 parents 1375ed3 + ae4b5d4 commit 11a8f4c

File tree

2 files changed

+10
-80
lines changed

2 files changed

+10
-80
lines changed

flake.lock

Lines changed: 7 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,28 @@
55

66
flake-utils.url = "github:numtide/flake-utils";
77

8-
coq-8_18 = {
9-
type = "github";
10-
owner = "coq";
11-
repo = "coq";
12-
ref = "V8.18.0";
13-
};
14-
15-
coq-8_18.inputs.nixpkgs.follows = "nixpkgs";
16-
178
};
189

19-
outputs = { self, nixpkgs, flake-utils, coq-8_18 }:
10+
outputs = { self, nixpkgs, flake-utils }:
2011
flake-utils.lib.eachDefaultSystem (system:
2112

22-
let coq = coq-8_18.defaultPackage.${system}; in
2313
rec {
2414

2515
packages.default = self.packages.${system}.vscoq-language-server;
2616

2717
packages.vscoq-language-server =
2818
# Notice the reference to nixpkgs here.
2919
with import nixpkgs { inherit system; };
30-
20+
let ocamlPackages = ocaml-ng.ocamlPackages_4_14; in
3121
ocamlPackages.buildDunePackage {
3222
duneVersion = "3";
3323
pname = "vscoq-language-server";
3424
version = "2.0.3";
3525
src = ./language-server;
3626
buildInputs = [
3727
coq
38-
bash
39-
hostname
40-
python3
41-
time
4228
dune_3
43-
] ++ (with ocamlPackages; [
29+
] ++ (with coq.ocamlPackages; [
4430
lablgtk3-sourceview3
4531
glib
4632
gnome.adwaita-icon-theme

0 commit comments

Comments
 (0)