Skip to content

Commit e26d082

Browse files
committed
feat: update to latest rocq -> fix "make all && make html"
1 parent 1f86179 commit e26d082

5 files changed

Lines changed: 22 additions & 3 deletions

File tree

exercises/array_lock.v

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
From iris.algebra Require Import auth excl gset numbers.
2+
From iris.base_logic.lib Require Export invariants.
23
From iris.heap_lang Require Import lang proofmode notation par.
34

45
Lemma lookup_array `{!heapGS_gen hlc Σ} l dq vs off v :

exercises/custom_ra.v

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
From iris.algebra Require Import cmra.
2+
From iris.base_logic.lib Require Export invariants.
23
From iris.heap_lang.lib Require Export par.
34
From iris.heap_lang Require Import proofmode notation.
45

flake.nix

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,29 @@
1414
{
1515
devShells.${system}.default = pkgs.mkShell {
1616
buildInputs = with pkgs; [
17-
rocq-core
18-
rocqPackages.stdlib
17+
# OPAM tool and build dependencies
18+
opam
19+
gmp
20+
pkg-config
21+
rsync
22+
unzip
23+
patch
24+
25+
# Rocq & language server (Commented out because installed via opam)
26+
# rocq-core
27+
# rocqPackages.stdlib
1928
# rocqPackages.stdpp
2029
# rocqPackages.iris
21-
rocqPackages.vsrocq-language-server
30+
# rocqPackages.vsrocq-language-server
31+
2232
gawk
2333
git
2434
];
35+
36+
shellHook = ''
37+
# Automatically load opam environment variables if an opam switch exists
38+
eval $(opam env 2>/dev/null)
39+
'';
2540
};
2641

2742
checks.${system}.default = pkgs.stdenv.mkDerivation {

theories/array_lock.v

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
From iris.algebra Require Import auth excl gset numbers.
2+
From iris.base_logic.lib Require Export invariants.
23
From iris.heap_lang Require Import lang proofmode notation par.
34

45
Lemma lookup_array `{!heapGS_gen hlc Σ} l dq vs off v :

theories/custom_ra.v

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
From iris.algebra Require Import cmra.
2+
From iris.base_logic.lib Require Export invariants.
23
From iris.heap_lang.lib Require Export par.
34
From iris.heap_lang Require Import proofmode notation.
45

0 commit comments

Comments
 (0)