Skip to content

Fix build, update nix flake, don't compile fairis #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: fairneris
Choose a base branch
from
Open

Fix build, update nix flake, don't compile fairis #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TRILLIUM_DIR := 'trillium'
FAIRIS_DIR := 'fairis'
FAIRNERIS_DIR := 'fairneris'
LOCAL_SRC_DIRS := $(TRILLIUM_DIR) $(FAIRIS_DIR) $(FAIRNERIS_DIR)
LOCAL_SRC_DIRS := $(TRILLIUM_DIR) $(FAIRNERIS_DIR)
SRC_DIRS := $(LOCAL_SRC_DIRS) 'external'

ALL_VFILES := $(shell find $(SRC_DIRS) -name "*.v")
Expand Down Expand Up @@ -46,17 +45,14 @@ clean:
# project-specific targets
.PHONY: build clean-trillium clean-fairis clean-fairneris trillium fairis fairneris

VPATH= $(TRILLIUM_DIR) $(FAIRIS_DIR) $(FAIRNERIS_DIR)
VPATH= $(TRILLIUM_DIR) $(FAIRNERIS_DIR)
VPATH_FILES := $(shell find $(VPATH) -name "*.v")

build: $(VPATH_FILES:.v=.vo)

fairneris :
@$(MAKE) build VPATH=$(FAIRNERIS_DIR)

fairis :
@$(MAKE) build VPATH=$(FAIRIS_DIR)

trillium :
@$(MAKE) build VPATH=$(TRILLIUM_DIR)

Expand All @@ -68,8 +64,5 @@ clean-local:
clean-trillium:
@$(MAKE) clean-local LOCAL_SRC_DIRS=$(TRILLIUM_DIR)

clean-fairis:
@$(MAKE) clean-local LOCAL_SRC_DIRS=$(FAIRIS_DIR)

clean-fairneris:
@$(MAKE) clean-local LOCAL_SRC_DIRS=$(FAIRNERIS_DIR)
2 changes: 1 addition & 1 deletion _CoqProject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
-Q trillium trillium
-Q fairis trillium.fairness
-Q fairneris fairneris

-Q external/stdpp/stdpp stdpp
Expand All @@ -9,6 +8,7 @@
-Q external/iris/iris_unstable iris.unstable
-Q external/iris/iris_heap_lang iris.heap_lang
-Q external/paco/src Paco
-Q external/coq-record-update/src RecordUpdate

-arg -w -arg -notation-overridden
-arg -w -arg -redundant-canonical-projection
Expand Down
2 changes: 1 addition & 1 deletion fairneris/examples/retransmit_example_adequacy.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Definition initial_state shA shB :=
state_ms := ∅; |}).

Definition initial_model_state : retransmit_state :=
(retransmit_model_base.Start, ∅, ∅).
(retransmit_model.Start, ∅, ∅).

Lemma retransmit_continued_simulation shA shB :
fairly_terminating localeB (initial_state shA shB).
Expand Down
2 changes: 1 addition & 1 deletion fairneris/partial_termination.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Qed.
Lemma not_infinite_terminating_trace {S L} (tr : trace S L) :
¬ infinite_trace tr → terminating_trace tr.
Proof.
intros Hinf. epose proof (infinite_or_finite) as [?|?]; done.
intros Hinf. epose proof (infinite_or_finite tr) as [?|?]; done.
Qed.

Lemma trace_always_mono_strong_alt
Expand Down
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
with pkgs;
{
devShell = mkShell rec {
buildInputs = with coqPackages_8_17; [
buildInputs = with coqPackages_8_19; [
coq

# coq-lsp.packages.${system}.coq-lsp
Expand Down