From 970cdc4a054538ee396b2ff37ae8e59c6826d8a3 Mon Sep 17 00:00:00 2001 From: Dan Frumin <dfrumin@cs.ru.nl> Date: Mon, 10 Jun 2019 12:27:21 +0200 Subject: [PATCH] bump guix.scm --- guix.scm | 12 +++++++----- theories/logic/spec_rules.v | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/guix.scm b/guix.scm index 0c694b0..916d0e0 100644 --- a/guix.scm +++ b/guix.scm @@ -30,10 +30,10 @@ #:use-module (gnu packages coq) #:use-module ((guix licenses) #:prefix license:)) -(define stdpp-commit "f8719169e3ed75123d88c59d292ddd0972351ad3") -(define stdpp-sha256 (base32 "0fb7vj5l8j8ms7v3ag74i61q8hygc8w692dlfyli9vxbds7ff7lc")) ;; sha256 hash of the specific std++ checkout -(define iris-commit "c9984c7fc0b2067b11012099ce7884c981e492ed") -(define iris-sha256 (base32 "1lf3k6h2jc26r3ns44qnd4l9b769a2bx17xc3fni6m39y8w5h0py")) ;; sha256 hash of the specific std++ checkout +(define stdpp-commit "c8dbb063cffe6275a75218d377c3174538396670") +(define stdpp-sha256 (base32 "0jn820ahfdnbqax3iaqg2c3d9bd5x0w9mb3r7a6f8lszrg1hll26")) ;; sha256 hash of the specific std++ checkout +(define iris-commit "31bf88ff46fd89815e49dd22dbc5fea4a77fb62e") +(define iris-sha256 (base32 "1avarky1lzpzjypjwfjifl26p69nygn7g7r3ry1jkxj2w3ilh8bi")) ;; sha256 hash of the specific std++ checkout (define %source-dir (dirname (current-filename))) (define-public coq-stdpp @@ -97,8 +97,9 @@ ;; need diff for tests ("diffutils" ,diffutils) ("coq" ,coq) - ("coq-stdpp" ,coq-stdpp) ("camlp5" ,camlp5))) + (propagated-inputs + `(("coq-stdpp" ,coq-stdpp))) (arguments `(#:tests? #f #:phases @@ -123,6 +124,7 @@ #:select? (git-predicate %source-dir))) (build-system gnu-build-system) ;; We propogate all the inputs, because then it's just easier to set up the dev environment + (inputs `(("coq" ,coq))) (propagated-inputs `(("coq" ,coq) ("coq-autosubst" ,coq-autosubst) diff --git a/theories/logic/spec_rules.v b/theories/logic/spec_rules.v index 08e4a31..4710f4f 100644 --- a/theories/logic/spec_rules.v +++ b/theories/logic/spec_rules.v @@ -133,8 +133,7 @@ Section rules. iFrame. iApply "Hclose". iNext. iExists (<[j:=fill K #()]> tp), σ. rewrite to_tpool_insert'; last eauto. iFrame. iPureIntro. - eapply rtc_r, step_insert_no_fork; eauto. econstructor; eauto. - econstructor; eauto. + eapply rtc_r, step_insert_no_fork; eauto. do 2 econstructor; eauto. Qed. (** Alloc, load, and store *) -- GitLab