Skip to content

Commit 0db06f4

Browse files
committed
Update flake to Rocq (9.1)
1 parent faee42a commit 0db06f4

File tree

2 files changed

+24
-101
lines changed

2 files changed

+24
-101
lines changed

flake.lock

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

flake.nix

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@
22
description = "A mechanization of the specification of ECMAScript regexes.";
33

44
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
6-
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
5+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
76
flake-utils.url = "github:numtide/flake-utils";
87
spec-merger = {
98
url = "github:Ef55/SpecMerger/38ac474cca1788ec4fb4d85ecaaa8c81aecf41f6?dir=.nix";
10-
inputs.nixpkgs.follows = "nixpkgs";
11-
inputs.flake-utils.follows = "flake-utils";
12-
};
13-
melange = {
14-
url = "github:melange-re/melange/v3-414";
15-
inputs.nixpkgs.follows = "nixpkgs";
9+
# inputs.nixpkgs.follows = "nixpkgs";
1610
inputs.flake-utils.follows = "flake-utils";
1711
};
1812
};
1913

20-
outputs = { self, nixpkgs, nixpkgs-unstable, spec-merger, flake-utils, melange }@input:
14+
outputs = { self, nixpkgs, spec-merger, flake-utils }@input:
2115
flake-utils.lib.eachDefaultSystem (system:
2216
let
23-
pkgs = import nixpkgs { inherit system; overlays = [ melange.overlays.default ]; };
24-
pkgs-unstable = import nixpkgs-unstable { inherit system; };
17+
pkgs = nixpkgs.legacyPackages.${system};
2518

2619
spec-diff = pkgs.writeShellApplication {
2720
name = "spec-diff";
@@ -37,10 +30,11 @@
3730
devShells = {
3831
default = pkgs.mkShell {
3932
buildInputs = with pkgs; [
40-
coq
33+
coq_9_1
34+
coqPackages_9_1.stdlib
4135

4236
ocaml
43-
pkgs-unstable.dune_3
37+
dune_3
4438
ocamlPackages.ocamlformat
4539
ocamlPackages.ocaml-lsp
4640
ocamlPackages.findlib
@@ -50,12 +44,12 @@
5044
ocamlPackages.melange
5145
ocamlPackages.zarith
5246

53-
coqPackages.serapi
54-
python311Packages.alectryon
47+
# coqPackages.serapi
48+
# python311Packages.alectryon
5549
spec-merger.packages.${system}.spec-merger
5650
spec-diff
5751

58-
nodejs_21
52+
nodejs_24
5953
nodePackages.webpack-cli
6054
];
6155
};

0 commit comments

Comments
 (0)