Skip to content

Commit

Permalink
Merge pull request #717 from CohenCyril/fix-flake
Browse files Browse the repository at this point in the history
Nix flakes: Using the right ocamlPackages and updating locks
  • Loading branch information
rtetley authored Jan 31, 2024
2 parents 1375ed3 + ae4b5d4 commit 11a8f4c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 80 deletions.
70 changes: 7 additions & 63 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 3 additions & 17 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,28 @@

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

coq-8_18 = {
type = "github";
owner = "coq";
repo = "coq";
ref = "V8.18.0";
};

coq-8_18.inputs.nixpkgs.follows = "nixpkgs";

};

outputs = { self, nixpkgs, flake-utils, coq-8_18 }:
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:

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

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

packages.vscoq-language-server =
# Notice the reference to nixpkgs here.
with import nixpkgs { inherit system; };

let ocamlPackages = ocaml-ng.ocamlPackages_4_14; in
ocamlPackages.buildDunePackage {
duneVersion = "3";
pname = "vscoq-language-server";
version = "2.0.3";
src = ./language-server;
buildInputs = [
coq
bash
hostname
python3
time
dune_3
] ++ (with ocamlPackages; [
] ++ (with coq.ocamlPackages; [
lablgtk3-sourceview3
glib
gnome.adwaita-icon-theme
Expand Down

0 comments on commit 11a8f4c

Please sign in to comment.