From 9473cd91f5085ae9f050f21e0eeefb6eeddc9c99 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 29 Sep 2023 14:11:07 +0000 Subject: [PATCH 01/32] deps/hs-backend-booster_release: Set Version 28c0a48dccd45ab343acc06eb06cb834323f4a06 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index bc188d4565e..426efebc7d5 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566 +28c0a48dccd45ab343acc06eb06cb834323f4a06 From f745f3c9a6f4a69c5d5f7c76b7bbf617c081328b Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 29 Sep 2023 14:12:17 +0000 Subject: [PATCH 02/32] flake.nix, haskell-backend/src/main/native/haskell-backend: update to version 96545095d33235f3e8c91da7981cf28abbcdc679 --- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 441f83602c1..6d41bf7ba37 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "K Framework"; inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; - haskell-backend.url = "github:runtimeverification/haskell-backend/63397c713d21322434d572281c1407d929a1189e"; + haskell-backend.url = "github:runtimeverification/haskell-backend/96545095d33235f3e8c91da7981cf28abbcdc679"; booster-backend = { url = "github:runtimeverification/hs-backend-booster/6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566"; # NB booster-backend will bring in another dependency on haskell-backend, diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index 63397c713d2..96545095d33 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit 63397c713d21322434d572281c1407d929a1189e +Subproject commit 96545095d33235f3e8c91da7981cf28abbcdc679 From 7550920ab329198827c21bfb0aa8aa2574d8fffd Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 29 Sep 2023 14:12:17 +0000 Subject: [PATCH 03/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version 28c0a48dccd45ab343acc06eb06cb834323f4a06 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6d41bf7ba37..214a9372b98 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/96545095d33235f3e8c91da7981cf28abbcdc679"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566"; + url = "github:runtimeverification/hs-backend-booster/28c0a48dccd45ab343acc06eb06cb834323f4a06"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index 6c2f5ab988e..28c0a48dccd 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit 6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566 +Subproject commit 28c0a48dccd45ab343acc06eb06cb834323f4a06 From 9582b9b75f5b3612b05a9d6827ac56b09cde058f Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 29 Sep 2023 14:13:05 +0000 Subject: [PATCH 04/32] flake.nix, flake.lock: update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5700d98865b..12fb95e5f36 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1695839205, - "narHash": "sha256-9USUlWcL4YOseMJdQ1h4XvihR4/FG5zykykI7eY/13A=", + "lastModified": 1695996185, + "narHash": "sha256-cgCgzXHCQ7j2m5E8jnT/JLysJkOkG2fJBA/WVLGqcZg=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566", + "rev": "28c0a48dccd45ab343acc06eb06cb834323f4a06", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "6c2f5ab988e2c5f98b1cdeb04b8a5787d8a7c566", + "rev": "28c0a48dccd45ab343acc06eb06cb834323f4a06", "type": "github" } }, @@ -439,17 +439,17 @@ "z3-src": "z3-src" }, "locked": { - "lastModified": 1695129967, - "narHash": "sha256-wLMrn/a10zH3Zvl+ln2Z37b8n4c013i+udkKfFf61Eg=", + "lastModified": 1695315789, + "narHash": "sha256-GCGWVK7PM1iuQBkRJnf1OKLjfBjdC4xdJG3o1RalUC8=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "63397c713d21322434d572281c1407d929a1189e", + "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "85b5d086840a0f1e89499f086b50d7258598fc8b", + "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", "type": "github" } }, @@ -465,17 +465,17 @@ "z3-src": "z3-src_2" }, "locked": { - "lastModified": 1695129967, - "narHash": "sha256-wLMrn/a10zH3Zvl+ln2Z37b8n4c013i+udkKfFf61Eg=", + "lastModified": 1695315789, + "narHash": "sha256-GCGWVK7PM1iuQBkRJnf1OKLjfBjdC4xdJG3o1RalUC8=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "63397c713d21322434d572281c1407d929a1189e", + "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "63397c713d21322434d572281c1407d929a1189e", + "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", "type": "github" } }, @@ -1227,11 +1227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1695559356, - "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { From 618ee34ccde18f6107eb97ef6b1ff1e87591d0a4 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 5 Oct 2023 15:47:35 +0000 Subject: [PATCH 05/32] deps/hs-backend-booster_release: Set Version dc14d6c602190ff1a07bc0a3185002228d14f4b1 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index 426efebc7d5..1d5ea7cb8e0 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -28c0a48dccd45ab343acc06eb06cb834323f4a06 +dc14d6c602190ff1a07bc0a3185002228d14f4b1 From e79a195353c54c2a1af94acc45eed75d6ac84e75 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 5 Oct 2023 15:49:17 +0000 Subject: [PATCH 06/32] flake.nix, haskell-backend/src/main/native/haskell-backend: update to version a62ea52492519ef3813227796b318cfce001e3c8 --- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 214a9372b98..6ab26b73ea2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "K Framework"; inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; - haskell-backend.url = "github:runtimeverification/haskell-backend/96545095d33235f3e8c91da7981cf28abbcdc679"; + haskell-backend.url = "github:runtimeverification/haskell-backend/a62ea52492519ef3813227796b318cfce001e3c8"; booster-backend = { url = "github:runtimeverification/hs-backend-booster/28c0a48dccd45ab343acc06eb06cb834323f4a06"; # NB booster-backend will bring in another dependency on haskell-backend, diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index 96545095d33..a62ea524925 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit 96545095d33235f3e8c91da7981cf28abbcdc679 +Subproject commit a62ea52492519ef3813227796b318cfce001e3c8 From 73aefcc44091de180c43a1612e34442790546111 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 5 Oct 2023 15:49:18 +0000 Subject: [PATCH 07/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version dc14d6c602190ff1a07bc0a3185002228d14f4b1 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6ab26b73ea2..d92d4809939 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/a62ea52492519ef3813227796b318cfce001e3c8"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/28c0a48dccd45ab343acc06eb06cb834323f4a06"; + url = "github:runtimeverification/hs-backend-booster/dc14d6c602190ff1a07bc0a3185002228d14f4b1"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index 28c0a48dccd..dc14d6c6021 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit 28c0a48dccd45ab343acc06eb06cb834323f4a06 +Subproject commit dc14d6c602190ff1a07bc0a3185002228d14f4b1 From 8f210415122515d8da48d65bf0d9a9dd65023419 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 5 Oct 2023 15:50:11 +0000 Subject: [PATCH 08/32] flake.nix, flake.lock: update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7933e8a9af3..da2ba2f56a9 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1695996185, - "narHash": "sha256-cgCgzXHCQ7j2m5E8jnT/JLysJkOkG2fJBA/WVLGqcZg=", + "lastModified": 1696508999, + "narHash": "sha256-yDzVlN+QRLTIsMlw6HByadKA5L+l7RmxY2+xGTLN4fE=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "28c0a48dccd45ab343acc06eb06cb834323f4a06", + "rev": "dc14d6c602190ff1a07bc0a3185002228d14f4b1", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "28c0a48dccd45ab343acc06eb06cb834323f4a06", + "rev": "dc14d6c602190ff1a07bc0a3185002228d14f4b1", "type": "github" } }, @@ -247,11 +247,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696267196, - "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -439,17 +439,17 @@ "z3-src": "z3-src" }, "locked": { - "lastModified": 1695315789, - "narHash": "sha256-GCGWVK7PM1iuQBkRJnf1OKLjfBjdC4xdJG3o1RalUC8=", + "lastModified": 1696415155, + "narHash": "sha256-bMiKWpYYbz6slnGTltKQZpD9YU4jQnRfEUygz0mU8Jc=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", + "rev": "a62ea52492519ef3813227796b318cfce001e3c8", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", + "rev": "a62ea52492519ef3813227796b318cfce001e3c8", "type": "github" } }, @@ -465,17 +465,17 @@ "z3-src": "z3-src_2" }, "locked": { - "lastModified": 1695315789, - "narHash": "sha256-GCGWVK7PM1iuQBkRJnf1OKLjfBjdC4xdJG3o1RalUC8=", + "lastModified": 1696415155, + "narHash": "sha256-bMiKWpYYbz6slnGTltKQZpD9YU4jQnRfEUygz0mU8Jc=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", + "rev": "a62ea52492519ef3813227796b318cfce001e3c8", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "96545095d33235f3e8c91da7981cf28abbcdc679", + "rev": "a62ea52492519ef3813227796b318cfce001e3c8", "type": "github" } }, @@ -1227,11 +1227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1696374741, + "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", "type": "github" }, "original": { From e660b913996ebc84ef9ec9baeeeb12b9ad44e0e7 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 6 Oct 2023 13:07:13 +0000 Subject: [PATCH 09/32] deps/hs-backend-booster_release: Set Version cb313711f98dcf100b315138502e6bdffbb58369 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index 1d5ea7cb8e0..ce851a84b34 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -dc14d6c602190ff1a07bc0a3185002228d14f4b1 +cb313711f98dcf100b315138502e6bdffbb58369 From f9f7fefc192dd19e2f0a8f53792ca2a17e17d270 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 6 Oct 2023 13:08:14 +0000 Subject: [PATCH 10/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version cb313711f98dcf100b315138502e6bdffbb58369 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index d92d4809939..93a4ccf1a0f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/a62ea52492519ef3813227796b318cfce001e3c8"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/dc14d6c602190ff1a07bc0a3185002228d14f4b1"; + url = "github:runtimeverification/hs-backend-booster/cb313711f98dcf100b315138502e6bdffbb58369"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index dc14d6c6021..cb313711f98 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit dc14d6c602190ff1a07bc0a3185002228d14f4b1 +Subproject commit cb313711f98dcf100b315138502e6bdffbb58369 From 8d9fcd058350f8575c89b36bbb3115ad82f2bed6 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 6 Oct 2023 13:09:02 +0000 Subject: [PATCH 11/32] flake.nix, flake.lock: update --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index da2ba2f56a9..d121f746572 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1696508999, - "narHash": "sha256-yDzVlN+QRLTIsMlw6HByadKA5L+l7RmxY2+xGTLN4fE=", + "lastModified": 1696597274, + "narHash": "sha256-OR/2mFKCNXLACtjPaL+cVtYZclVA9gr7jx//UM0P1ZY=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "dc14d6c602190ff1a07bc0a3185002228d14f4b1", + "rev": "cb313711f98dcf100b315138502e6bdffbb58369", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "dc14d6c602190ff1a07bc0a3185002228d14f4b1", + "rev": "cb313711f98dcf100b315138502e6bdffbb58369", "type": "github" } }, From 321ae9af73cecf134c2b49505ba2c50ee3017e71 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 9 Oct 2023 07:32:33 +0000 Subject: [PATCH 12/32] deps/hs-backend-booster_release: Set Version ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index ce851a84b34..8a7a25b8d4a 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -cb313711f98dcf100b315138502e6bdffbb58369 +ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 From 548bd39b4890f279a69adb6a6bcbff8412c86848 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 9 Oct 2023 07:33:54 +0000 Subject: [PATCH 13/32] flake.nix, haskell-backend/src/main/native/haskell-backend: update to version c2b8559a11c4d22c6ddc02ac7620b7a5ece65931 --- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 93a4ccf1a0f..cb35626faef 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "K Framework"; inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; - haskell-backend.url = "github:runtimeverification/haskell-backend/a62ea52492519ef3813227796b318cfce001e3c8"; + haskell-backend.url = "github:runtimeverification/haskell-backend/c2b8559a11c4d22c6ddc02ac7620b7a5ece65931"; booster-backend = { url = "github:runtimeverification/hs-backend-booster/cb313711f98dcf100b315138502e6bdffbb58369"; # NB booster-backend will bring in another dependency on haskell-backend, diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index a62ea524925..c2b8559a11c 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit a62ea52492519ef3813227796b318cfce001e3c8 +Subproject commit c2b8559a11c4d22c6ddc02ac7620b7a5ece65931 From bab82771881018b9bedc8633cf92becc9bc494e1 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 9 Oct 2023 07:33:55 +0000 Subject: [PATCH 14/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index cb35626faef..28c1dca74cc 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/c2b8559a11c4d22c6ddc02ac7620b7a5ece65931"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/cb313711f98dcf100b315138502e6bdffbb58369"; + url = "github:runtimeverification/hs-backend-booster/ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index cb313711f98..ef85779096e 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit cb313711f98dcf100b315138502e6bdffbb58369 +Subproject commit ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 From a07c59439fdbf81cc9798f9e1598a65390fd86d6 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 9 Oct 2023 07:34:58 +0000 Subject: [PATCH 15/32] flake.nix, flake.lock: update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d121f746572..63cc7447067 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1696597274, - "narHash": "sha256-OR/2mFKCNXLACtjPaL+cVtYZclVA9gr7jx//UM0P1ZY=", + "lastModified": 1696836206, + "narHash": "sha256-LRuWGj09J4Ivw2oJIVPDZWCSN5eCsfyxDWTXnO41c/w=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "cb313711f98dcf100b315138502e6bdffbb58369", + "rev": "ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "cb313711f98dcf100b315138502e6bdffbb58369", + "rev": "ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1", "type": "github" } }, @@ -439,17 +439,17 @@ "z3-src": "z3-src" }, "locked": { - "lastModified": 1696415155, - "narHash": "sha256-bMiKWpYYbz6slnGTltKQZpD9YU4jQnRfEUygz0mU8Jc=", + "lastModified": 1696504623, + "narHash": "sha256-+/kBMs0Fcqrh9MTjeONST/kxxFVYU//EQl2fQCCVdeI=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "a62ea52492519ef3813227796b318cfce001e3c8", + "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "a62ea52492519ef3813227796b318cfce001e3c8", + "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", "type": "github" } }, @@ -465,17 +465,17 @@ "z3-src": "z3-src_2" }, "locked": { - "lastModified": 1696415155, - "narHash": "sha256-bMiKWpYYbz6slnGTltKQZpD9YU4jQnRfEUygz0mU8Jc=", + "lastModified": 1696504623, + "narHash": "sha256-+/kBMs0Fcqrh9MTjeONST/kxxFVYU//EQl2fQCCVdeI=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "a62ea52492519ef3813227796b318cfce001e3c8", + "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "a62ea52492519ef3813227796b318cfce001e3c8", + "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", "type": "github" } }, @@ -1227,11 +1227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1696697597, + "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", "type": "github" }, "original": { From f64394c0584bba43efe5b41c4ebe8d244b4b1c5a Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 9 Oct 2023 10:30:33 +0000 Subject: [PATCH 16/32] deps/hs-backend-booster_release: Set Version ec1da250a8da41dc6b9aeb7786cd4093d3584225 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index 8a7a25b8d4a..b1307d3ef24 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 +ec1da250a8da41dc6b9aeb7786cd4093d3584225 From 3e51eb0eaee5c256f23233a3c43d8582e7798411 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 9 Oct 2023 10:31:35 +0000 Subject: [PATCH 17/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version ec1da250a8da41dc6b9aeb7786cd4093d3584225 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 28c1dca74cc..a8565785e89 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/c2b8559a11c4d22c6ddc02ac7620b7a5ece65931"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1"; + url = "github:runtimeverification/hs-backend-booster/ec1da250a8da41dc6b9aeb7786cd4093d3584225"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index ef85779096e..ec1da250a8d 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1 +Subproject commit ec1da250a8da41dc6b9aeb7786cd4093d3584225 From 468454a7830db5df707e3f130a968e5aee412e51 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 9 Oct 2023 10:32:22 +0000 Subject: [PATCH 18/32] flake.nix, flake.lock: update --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 63cc7447067..422844d61fd 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1696836206, - "narHash": "sha256-LRuWGj09J4Ivw2oJIVPDZWCSN5eCsfyxDWTXnO41c/w=", + "lastModified": 1696847202, + "narHash": "sha256-Agg1dtNnt936bBOvnwHKgDKINW1G/9OAVuUjWr+WjH0=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1", + "rev": "ec1da250a8da41dc6b9aeb7786cd4093d3584225", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "ef85779096ea79cb4e2bcf57ad0c1dd8f4b74fe1", + "rev": "ec1da250a8da41dc6b9aeb7786cd4093d3584225", "type": "github" } }, From cc060350714de72fc7588f9042f03c41da49e296 Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 10 Oct 2023 15:58:01 +0000 Subject: [PATCH 19/32] deps/hs-backend-booster_release: Set Version 303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index b1307d3ef24..3379f6d41fd 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -ec1da250a8da41dc6b9aeb7786cd4093d3584225 +303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba From f7dc68208bcd8ca921e33211a6bf4698d1b47f83 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 10 Oct 2023 15:59:07 +0000 Subject: [PATCH 20/32] flake.nix, haskell-backend/src/main/native/haskell-backend: update to version cdc83446c302961cd6abd2bca8c3e73dde8f6eab --- flake.nix | 2 +- haskell-backend/src/main/native/haskell-backend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a8565785e89..8944e3f507d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "K Framework"; inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; - haskell-backend.url = "github:runtimeverification/haskell-backend/c2b8559a11c4d22c6ddc02ac7620b7a5ece65931"; + haskell-backend.url = "github:runtimeverification/haskell-backend/cdc83446c302961cd6abd2bca8c3e73dde8f6eab"; booster-backend = { url = "github:runtimeverification/hs-backend-booster/ec1da250a8da41dc6b9aeb7786cd4093d3584225"; # NB booster-backend will bring in another dependency on haskell-backend, diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend index c2b8559a11c..cdc83446c30 160000 --- a/haskell-backend/src/main/native/haskell-backend +++ b/haskell-backend/src/main/native/haskell-backend @@ -1 +1 @@ -Subproject commit c2b8559a11c4d22c6ddc02ac7620b7a5ece65931 +Subproject commit cdc83446c302961cd6abd2bca8c3e73dde8f6eab From 5093cad17c508d4e7c03a404a2df109a3ea32aa3 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 10 Oct 2023 15:59:07 +0000 Subject: [PATCH 21/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version 303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8944e3f507d..241d643961e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/cdc83446c302961cd6abd2bca8c3e73dde8f6eab"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/ec1da250a8da41dc6b9aeb7786cd4093d3584225"; + url = "github:runtimeverification/hs-backend-booster/303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index ec1da250a8d..303d568ed2a 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit ec1da250a8da41dc6b9aeb7786cd4093d3584225 +Subproject commit 303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba From fb62c53c6991edf886d1b04f9c6e0da92d46e07e Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 10 Oct 2023 15:59:52 +0000 Subject: [PATCH 22/32] flake.nix, flake.lock: update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 422844d61fd..f92a6bc0dca 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1696847202, - "narHash": "sha256-Agg1dtNnt936bBOvnwHKgDKINW1G/9OAVuUjWr+WjH0=", + "lastModified": 1696953328, + "narHash": "sha256-8lhxyMGvmZjnTLKfe8oXnF3T4fKqqbaoiUDeXyMIoes=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "ec1da250a8da41dc6b9aeb7786cd4093d3584225", + "rev": "303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "ec1da250a8da41dc6b9aeb7786cd4093d3584225", + "rev": "303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba", "type": "github" } }, @@ -439,17 +439,17 @@ "z3-src": "z3-src" }, "locked": { - "lastModified": 1696504623, - "narHash": "sha256-+/kBMs0Fcqrh9MTjeONST/kxxFVYU//EQl2fQCCVdeI=", + "lastModified": 1696881510, + "narHash": "sha256-NBYDOHpFy0/EGQtg1VeJWn7c8ciAZkhoflf0ZOTsVQs=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", + "rev": "cdc83446c302961cd6abd2bca8c3e73dde8f6eab", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", + "rev": "cdc83446c302961cd6abd2bca8c3e73dde8f6eab", "type": "github" } }, @@ -465,17 +465,17 @@ "z3-src": "z3-src_2" }, "locked": { - "lastModified": 1696504623, - "narHash": "sha256-+/kBMs0Fcqrh9MTjeONST/kxxFVYU//EQl2fQCCVdeI=", + "lastModified": 1696881510, + "narHash": "sha256-NBYDOHpFy0/EGQtg1VeJWn7c8ciAZkhoflf0ZOTsVQs=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", + "rev": "cdc83446c302961cd6abd2bca8c3e73dde8f6eab", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "c2b8559a11c4d22c6ddc02ac7620b7a5ece65931", + "rev": "cdc83446c302961cd6abd2bca8c3e73dde8f6eab", "type": "github" } }, From e0158776f97b9f708148f1cc125c62205a799aae Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Tue, 10 Oct 2023 13:01:14 -0500 Subject: [PATCH 23/32] add pkg-config dependency --- .github/workflows/Dockerfile.stack-deps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Dockerfile.stack-deps b/.github/workflows/Dockerfile.stack-deps index 6e4b9b72328..62cd3d47691 100644 --- a/.github/workflows/Dockerfile.stack-deps +++ b/.github/workflows/Dockerfile.stack-deps @@ -9,7 +9,8 @@ RUN apt-get update \ && apt-get upgrade --yes \ && apt-get install --yes \ curl \ - libtinfo-dev + libtinfo-dev \ + pkg-config RUN curl -sSL https://get.haskellstack.org/ | sh @@ -31,4 +32,4 @@ RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot ENV LC_ALL=C.UTF-8 ADD --chown=$USER:$GROUP hs-backend-booster/src/main/native/hs-backend-booster/stack.yaml /home/$USER/.tmp-booster/ ADD --chown=$USER:$GROUP hs-backend-booster/src/main/native/hs-backend-booster/package.yaml /home/$USER/.tmp-booster/ -RUN cd /home/$USER/.tmp-booster && stack build --only-snapshot \ No newline at end of file +RUN cd /home/$USER/.tmp-booster && stack build --only-snapshot From 799aa0cb7dc20e625be6e7361c161a04a4716fc7 Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 10 Oct 2023 18:28:48 +0000 Subject: [PATCH 24/32] deps/hs-backend-booster_release: Set Version 5a283f7c85c5b4f66ff477b494c5d138c54706e6 --- deps/hs-backend-booster_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release index 3379f6d41fd..70e31b8f616 100644 --- a/deps/hs-backend-booster_release +++ b/deps/hs-backend-booster_release @@ -1 +1 @@ -303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba +5a283f7c85c5b4f66ff477b494c5d138c54706e6 From 919680b246e2f90dbe09345e0c540e7a6f6afb66 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 10 Oct 2023 18:29:59 +0000 Subject: [PATCH 25/32] flake.nix, hs-backend-booster/src/main/native/hs-backend-booster: update to version 5a283f7c85c5b4f66ff477b494c5d138c54706e6 --- flake.nix | 2 +- hs-backend-booster/src/main/native/hs-backend-booster | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 241d643961e..8823dd35c94 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; haskell-backend.url = "github:runtimeverification/haskell-backend/cdc83446c302961cd6abd2bca8c3e73dde8f6eab"; booster-backend = { - url = "github:runtimeverification/hs-backend-booster/303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba"; + url = "github:runtimeverification/hs-backend-booster/5a283f7c85c5b4f66ff477b494c5d138c54706e6"; # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster index 303d568ed2a..5a283f7c85c 160000 --- a/hs-backend-booster/src/main/native/hs-backend-booster +++ b/hs-backend-booster/src/main/native/hs-backend-booster @@ -1 +1 @@ -Subproject commit 303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba +Subproject commit 5a283f7c85c5b4f66ff477b494c5d138c54706e6 From 1eb772c9a137c2a0f0a89a64f08edc7c0fbf1abb Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 10 Oct 2023 18:30:48 +0000 Subject: [PATCH 26/32] flake.nix, flake.lock: update --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f92a6bc0dca..9bd8cf12e34 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,17 @@ ] }, "locked": { - "lastModified": 1696953328, - "narHash": "sha256-8lhxyMGvmZjnTLKfe8oXnF3T4fKqqbaoiUDeXyMIoes=", + "lastModified": 1696961955, + "narHash": "sha256-HvYHO0Jo7NeV0u2Qi883rsuMyergBCcnbh/lbCGiFug=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba", + "rev": "5a283f7c85c5b4f66ff477b494c5d138c54706e6", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "303d568ed2a6bbe0b7d71d9df65b22b43b0c39ba", + "rev": "5a283f7c85c5b4f66ff477b494c5d138c54706e6", "type": "github" } }, From cdbd3af5fdc47686b9a17790126ee1017846cff0 Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Tue, 10 Oct 2023 14:04:36 -0500 Subject: [PATCH 27/32] add another missing dependency --- .github/workflows/Dockerfile.stack-deps | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Dockerfile.stack-deps b/.github/workflows/Dockerfile.stack-deps index 62cd3d47691..0bb07c8cfd1 100644 --- a/.github/workflows/Dockerfile.stack-deps +++ b/.github/workflows/Dockerfile.stack-deps @@ -9,6 +9,7 @@ RUN apt-get update \ && apt-get upgrade --yes \ && apt-get install --yes \ curl \ + libsecp256k1-dev \ libtinfo-dev \ pkg-config From 29bdeb6bbff3e3c0f783419caf391be0cd15605f Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Tue, 10 Oct 2023 14:49:14 -0500 Subject: [PATCH 28/32] add missing package again --- .github/workflows/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index d250f1c033d..e2c89bd8ff7 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -47,6 +47,7 @@ RUN apt-get update \ libncurses5-dev \ libnss3-dev \ libreadline-dev \ + libsecp256k1-dev \ libsqlite3-dev \ libssl-dev \ libyaml-dev \ From 993e36fab1fa968d5c9e004bf3824346154d9526 Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Wed, 11 Oct 2023 12:47:23 -0500 Subject: [PATCH 29/32] fix arch packaging --- package/arch/Dockerfile | 1 + package/arch/Dockerfile.stack-deps | 2 ++ package/arch/PKGBUILD | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/arch/Dockerfile b/package/arch/Dockerfile index 1dfbce7dd9c..9cd5c8568b6 100644 --- a/package/arch/Dockerfile +++ b/package/arch/Dockerfile @@ -27,6 +27,7 @@ RUN pacman -Sy --noconfirm archlinux-keyring \ hub \ jdk-openjdk \ jemalloc \ + libsecp256k1 \ libyaml \ lld \ llvm \ diff --git a/package/arch/Dockerfile.stack-deps b/package/arch/Dockerfile.stack-deps index 42d333b5952..2c4c3954a4c 100644 --- a/package/arch/Dockerfile.stack-deps +++ b/package/arch/Dockerfile.stack-deps @@ -6,7 +6,9 @@ RUN pacman -Sy --noconfirm archlinux-keyring \ && pacman -Syyu --noconfirm \ && pacman -S --noconfirm \ clang \ + libsecp256k1 \ make \ + pkgconf \ stack # The image is built specifically for an environment with this user/group diff --git a/package/arch/PKGBUILD b/package/arch/PKGBUILD index 562d5f62cc4..79e754c33e6 100644 --- a/package/arch/PKGBUILD +++ b/package/arch/PKGBUILD @@ -8,7 +8,7 @@ arch=('x86_64') url="https://github.com/runtimeverification/k" license=('custom') groups=() -depends=( 'bison' 'clang' 'diffutils' 'flex' 'fmt' 'gawk' 'gcc' 'gettext' 'gmp' 'grep' 'java-runtime' 'jemalloc' 'libyaml' 'lld' 'llvm' 'make' 'mpfr' 'patch' 'python' 'tar' 'z3' ) +depends=( 'bison' 'clang' 'diffutils' 'flex' 'fmt' 'gawk' 'gcc' 'gettext' 'gmp' 'grep' 'java-runtime' 'jemalloc' 'libsecp256k1' 'libyaml' 'lld' 'llvm' 'make' 'mpfr' 'patch' 'python' 'tar' 'z3' ) makedepends=( 'boost' 'cmake' 'jdk-openjdk' 'maven' 'python' 'zlib' ) checkdepends=() optdepends=() From 3f591fa80ebc54dda406a5e3940e754c67308f0c Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Wed, 11 Oct 2023 12:48:52 -0500 Subject: [PATCH 30/32] remove remaining references to focal --- package/debian/compat.focal | 1 - package/debian/control.focal | 18 ----------------- package/debian/rules.focal | 39 ------------------------------------ 3 files changed, 58 deletions(-) delete mode 100644 package/debian/compat.focal delete mode 100644 package/debian/control.focal delete mode 100755 package/debian/rules.focal diff --git a/package/debian/compat.focal b/package/debian/compat.focal deleted file mode 100644 index ec635144f60..00000000000 --- a/package/debian/compat.focal +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/package/debian/control.focal b/package/debian/control.focal deleted file mode 100644 index 0d94ac2922f..00000000000 --- a/package/debian/control.focal +++ /dev/null @@ -1,18 +0,0 @@ -Source: kframework -Section: devel -Priority: optional -Maintainer: Dwight Guth -Build-Depends: clang-12 , cmake , debhelper (>=9) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libyaml-dev , maven , openjdk-11-jdk , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev -Standards-Version: 3.9.6 -Homepage: https://github.com/runtimeverification/k - -Package: kframework -Architecture: any -Section: devel -Priority: optional -Depends: bison , clang-12 , default-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-12 , llvm-12 , pkg-config -Recommends: z3 -Description: K framework toolchain - Includes K Framework compiler for K language definitions, and K interpreter - and prover for programs written in languages defined in K. -Homepage: https://github.com/runtimeverification/k diff --git a/package/debian/rules.focal b/package/debian/rules.focal deleted file mode 100755 index 500d34c1e09..00000000000 --- a/package/debian/rules.focal +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotector - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -DESTDIR=$(shell pwd)/debian/kframework -PREFIX=/usr -PYTHON_VERSION=python3.8 -PYTHON_DEB_VERSION=python3 -export DESTDIR -export PREFIX - -%: - dh $@ - -override_dh_auto_build: - mvn --batch-mode package -DskipTests -Dllvm.backend.prefix=$(PREFIX) -Dllvm.backend.destdir=$(DESTDIR) - -override_dh_auto_install: - package/package - -override_dh_strip: - dh_strip -Xliballoc.a -Xlibarithmetic.a -XlibAST.a -Xlibutil.a -XlibParser.a -Xlibcollect.a -Xlibcollections.a -Xlibjson.a -Xlibstrings.a -Xlibmeta.a -Xlibio.a - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - From a4368c82be2bcf4f7335d33686c83e8f977dd51f Mon Sep 17 00:00:00 2001 From: Dwight Guth Date: Wed, 11 Oct 2023 12:53:00 -0500 Subject: [PATCH 31/32] fix debian and ubuntu --- package/debian/Dockerfile | 1 + package/debian/control.bookworm | 4 ++-- package/debian/control.jammy | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/debian/Dockerfile b/package/debian/Dockerfile index 740695c6ccd..17f432244b6 100644 --- a/package/debian/Dockerfile +++ b/package/debian/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update \ libncurses5-dev \ libnss3-dev \ libreadline-dev \ + libsecp256k1-dev \ libsqlite3-dev \ libssl-dev \ libyaml-dev \ diff --git a/package/debian/control.bookworm b/package/debian/control.bookworm index 7a03ddd4132..dffbfae42c7 100644 --- a/package/debian/control.bookworm +++ b/package/debian/control.bookworm @@ -2,7 +2,7 @@ Source: kframework Section: devel Priority: optional Maintainer: Dwight Guth -Build-Depends: clang-14 , cmake , debhelper (>=9) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libyaml-dev , maven , openjdk-17-jdk , zlib1g-dev +Build-Depends: clang-14 , cmake , debhelper (>=9) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , zlib1g-dev Standards-Version: 3.9.6 Homepage: https://github.com/runtimeverification/k @@ -10,7 +10,7 @@ Package: kframework Architecture: any Section: devel Priority: optional -Depends: bison , clang-14 , default-jre-headless , flex , gcc , g++ , libboost-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libyaml-0-2 , libz3-4 , lld-14 , pkg-config , llvm-14 +Depends: bison , clang-14 , default-jre-headless , flex , gcc , g++ , libboost-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-1 , libyaml-0-2 , libz3-4 , lld-14 , pkg-config , llvm-14 Recommends: z3 Description: K framework toolchain Includes K Framework compiler for K language definitions, and K interpreter diff --git a/package/debian/control.jammy b/package/debian/control.jammy index de8d652e60b..30972fdf9c1 100644 --- a/package/debian/control.jammy +++ b/package/debian/control.jammy @@ -2,7 +2,7 @@ Source: kframework Section: devel Priority: optional Maintainer: Dwight Guth -Build-Depends: clang-14 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev +Build-Depends: clang-14 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev Standards-Version: 3.9.6 Homepage: https://github.com/runtimeverification/k @@ -10,7 +10,7 @@ Package: kframework Architecture: any Section: devel Priority: optional -Depends: bison , clang-14 , default-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-14 , llvm-14 , pkg-config +Depends: bison , clang-14 , default-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-0 , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-14 , llvm-14 , pkg-config Recommends: z3 Description: K framework toolchain Includes K Framework compiler for K language definitions, and K interpreter From b8d10036ae09cf563425e69145bce8bcb3d64ab4 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 12 Oct 2023 06:23:28 +0000 Subject: [PATCH 32/32] flake.nix, flake.lock: update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9bd8cf12e34..88ee862d917 100644 --- a/flake.lock +++ b/flake.lock @@ -1227,11 +1227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1696697597, - "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": {