Pin the hashable library to working version 1.4.2.0 (#3732)

Fixes #3730 Fixes #3731 After upgrading GHC and stack resolver to newer versions, which bring in `hashable-1.4.3.0`, downstream upgrade jobs started failing because of missing `#Ceil` conditions. Systematic testing showed that the upgrade to `hashable` is causing these omissions. A manual downgrade of the dependency to 1.4.2.0 (as before) may fix the problems. --------- Co-authored-by: Georgy Lukyanov <[email protected]>
runtimeverification · Feb 27, 2024 · 62a3e13 · 62a3e13
1 parent fa0d3b2
commit 62a3e13
Show file tree

Hide file tree

Showing 12 changed files with 923 additions and 923 deletions.
diff --git a/kore/kore.cabal b/kore/kore.cabal
@@ -127,7 +127,8 @@ common library
   build-depends: gitrev >=1.3
   build-depends: graphviz >=2999.20
   -- Pin hashable to make sure cabal build uses the one Nix & Stack builds do
-  build-depends: hashable ==1.4.3.0
+  -- Also note that hashable-1.4.3.0 DOES NOT WORK! (see #3730)
+  build-depends: hashable ==1.4.2.0
   build-depends: haskeline ==0.8.*
   build-depends: ghc-bignum >=1.2
   build-depends: json-rpc >=1.0

diff --git a/stack.yaml b/stack.yaml
@@ -48,10 +48,11 @@ packages:
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)
 extra-deps:
+  - hashable-1.4.2.0
   - decision-diagrams-0.2.0.0
   - typerep-map-0.6.0.0
   - monad-validate-1.3.0.0
-  - github: goodlyrottenapple/tasty-test-reporter 
+  - github: goodlyrottenapple/tasty-test-reporter
     commit: b704130545aa3925a8487bd3e92f1dd5ce0512e2
 
 ghc-options:

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -4,6 +4,13 @@
 #   https://docs.haskellstack.org/en/stable/lock_files
 
 packages:
+- completed:
+    hackage: hashable-1.4.2.0@sha256:585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a,4520
+    pantry-tree:
+      sha256: 792a6cab3f15c5db29d759c8ca735d0be5f4c94f363329652f8b9780009d0829
+      size: 1248
+  original:
+    hackage: hashable-1.4.2.0
 - completed:
     hackage: decision-diagrams-0.2.0.0@sha256:9f82d39f7331f6836784fa89354986e436a4d62d810b8fb2b44dd10c6a0beb85,3415
     pantry-tree:

diff --git a/test/imp/max-inconsistent-prelude-spec.k.out.golden b/test/imp/max-inconsistent-prelude-spec.k.out.golden
@@ -1 +1,2 @@
     The definitions sent to the solver are inconsistent.
+The definitions sent to the solver are inconsistent.
diff --git a/test/imp/run-stepf-repl-script-spec.k b/test/imp/run-stepf-repl-script-spec.k
diff --git a/test/imp/run-stepf-repl-script-spec.k.out.golden b/test/imp/run-stepf-repl-script-spec.k.out.golden
diff --git a/test/imp/run-stepf-repl-script-spec.k.repl b/test/imp/run-stepf-repl-script-spec.k.repl
diff --git a/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden b/test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden
@@ -111,20 +111,20 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d
                         /* InternalMap: */ Lbl'Unds'Map'Unds'{}(
                             /* concrete element: */ Lbl'UndsPipe'-'-GT-Unds'{}(
                                 /* Inj: */ inj{SortId{}, SortKItem{}}(
-                                    \dv{SortId{}}("sum")
+                                    \dv{SortId{}}("n")
                                 ),
                                 /* T Fn D Spa */
                                 /* Inj: */ inj{SortInt{}, SortKItem{}}(
-                                    /* T Fn D Sfa */ VarS:SortInt{}
+                                    /* T Fn D Sfa */ VarN:SortInt{}
                                 )
                             ),
                             /* concrete element: */ Lbl'UndsPipe'-'-GT-Unds'{}(
                                 /* Inj: */ inj{SortId{}, SortKItem{}}(
-                                    \dv{SortId{}}("n")
+                                    \dv{SortId{}}("sum")
                                 ),
                                 /* T Fn D Spa */
                                 /* Inj: */ inj{SortInt{}, SortKItem{}}(
-                                    /* T Fn D Sfa */ VarN:SortInt{}
+                                    /* T Fn D Sfa */ VarS:SortInt{}
                                 )
                             )
                         )

diff --git a/test/regression-c/test-smoke100.sh.out.golden b/test/regression-c/test-smoke100.sh.out.golden
diff --git a/test/rpc-server/Makefile b/test/rpc-server/Makefile
@@ -13,3 +13,6 @@ clean: ;
 build-test: ;
 
 .PHONY: test test-k clean build-test
+
+golden: RECREATE_BROKEN_GOLDEN = true
+golden: test
diff --git a/test/simplification/Makefile b/test/simplification/Makefile
@@ -9,4 +9,4 @@ a-spec.k.out: a-spec.k simplification.k $(TEST_DEPS)
 	@echo ">>>" $(CURDIR) "kprove" $<
 	rm -f $@
 	$(KPROVE) $(KPROVE_OPTS) $(KPROVE_SPEC) 1> /dev/null 2> $@ || true
-	grep -q "equation is not applicable" $@ && rm $@ || mv $@ $@.fail
+	grep -q "equation is not applicable" $@ && echo "OK" > $@ || mv $@ $@.fail
diff --git a/test/simplification/a-spec.k.out.golden b/test/simplification/a-spec.k.out.golden
@@ -0,0 +1 @@
+OK
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		The definitions sent to the solver are inconsistent.
		The definitions sent to the solver are inconsistent.