Skip to content

Commit

Permalink
Merge pull request #814 from ejgallego/nix_update_flake
Browse files Browse the repository at this point in the history
[nix] [build] Update flake to more modern ppx packages.
  • Loading branch information
ejgallego authored Aug 30, 2024
2 parents d3b77ac + c123675 commit f4564b4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ jobs:
submodules: recursive

- name: ❄️ Setup Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v27

- name: 🧱 Build coq-lsp
run: nix build .?submodules=1
run: nix build '.?submodules=1#'

client-compile:
runs-on: ubuntu-latest
Expand Down
48 changes: 21 additions & 27 deletions flake.lock

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

5 changes: 2 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,17 @@
...
}: let
l = lib // builtins;
coqpkg = pkgs.coqPackages_8_18;
coqpkg = pkgs.coqPackages_8_20;
coqPackages = coqpkg.coqPackages;
ocamlPackages = coqpkg.coq.ocamlPackages;
in {
packages.default = config.packages.coq-lsp;

# NOTE(2023-06-02): Nix does not support top-level self submodules (yet)
packages.coq-lsp = ocamlPackages.buildDunePackage {
duneVersion = "3";

pname = "coq-lsp";
version = "${self.lastModifiedDate}+8.18-rc1";
version = "${self.lastModifiedDate}+8.20-rc1";

src = self.outPath;

Expand Down

0 comments on commit f4564b4

Please sign in to comment.