From 4661e4ef134665a7d205273fabb423220cb7d1f8 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 3 Sep 2024 11:31:47 -0400 Subject: [PATCH 1/4] crucible-llvm: Explicitly require llvm-pretty-0.12.1 or greater As of #1226, `crucible-llvm` requires `llvm-pretty-0.12.1` or later to build, but this was not reflected in the `.cabal` file's version bounds. Fix this, and bump the `llvm-pretty` submodule to pin against version 0.12.1. Related to #1246. --- crucible-llvm/crucible-llvm.cabal | 2 +- dependencies/llvm-pretty | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crucible-llvm/crucible-llvm.cabal b/crucible-llvm/crucible-llvm.cabal index 6b6f34185..66e989fea 100644 --- a/crucible-llvm/crucible-llvm.cabal +++ b/crucible-llvm/crucible-llvm.cabal @@ -44,7 +44,7 @@ library extra, lens, itanium-abi >= 0.1.1.1 && < 0.2, - llvm-pretty >= 0.12 && < 0.13, + llvm-pretty >= 0.12.1 && < 0.13, mtl, parameterized-utils >= 2.1.5 && < 2.2, pretty, diff --git a/dependencies/llvm-pretty b/dependencies/llvm-pretty index 725bd01c4..4d9017db6 160000 --- a/dependencies/llvm-pretty +++ b/dependencies/llvm-pretty @@ -1 +1 @@ -Subproject commit 725bd01c4be76538cf9606696b780415d901c040 +Subproject commit 4d9017db63a53fd1c64edac7eb9de9070ec5d879 From 939933419c651a78b99a60f9a262bbcd4828ee7f Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 3 Sep 2024 11:36:22 -0400 Subject: [PATCH 2/4] crucible: Explicitly require what4-1.6.1 or greater As of #1211, `crucible` requires `what4-1.6.1` or later to build, but this was not reflected in the `.cabal` file's version bounds. Fix this, and also bump the `what4` submodule to version 1.6.1. Fixes #1246. --- crucible/crucible.cabal | 2 +- dependencies/what4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crucible/crucible.cabal b/crucible/crucible.cabal index 548fba7ee..4da2d8839 100644 --- a/crucible/crucible.cabal +++ b/crucible/crucible.cabal @@ -65,7 +65,7 @@ library transformers, unordered-containers, vector, - what4 >= 0.4 + what4 >= 1.6.1 default-extensions: NondecreasingIndentation diff --git a/dependencies/what4 b/dependencies/what4 index 494ac6416..0cdce4130 160000 --- a/dependencies/what4 +++ b/dependencies/what4 @@ -1 +1 @@ -Subproject commit 494ac6416ed01eab6ae5d1be427d0aaae4c4bb91 +Subproject commit 0cdce4130ebee865d9f771b54b64674d04bcea7c From 591614e580043fc4b16837afe4c32b0fd115c08e Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 3 Sep 2024 11:45:12 -0400 Subject: [PATCH 3/4] Bump llvm-pretty submodule to development version 0.12.1.0.99 --- dependencies/llvm-pretty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/llvm-pretty b/dependencies/llvm-pretty index 4d9017db6..399abd4f8 160000 --- a/dependencies/llvm-pretty +++ b/dependencies/llvm-pretty @@ -1 +1 @@ -Subproject commit 4d9017db63a53fd1c64edac7eb9de9070ec5d879 +Subproject commit 399abd4f86bb22da13430eff4689d27fea93fdc6 From 5aa3038c48303e52f0af28b9e18cfc0978c9e99c Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 3 Sep 2024 11:41:05 -0400 Subject: [PATCH 4/4] Bump what4 submodule to development version 1.6.1.0.99 --- dependencies/what4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/what4 b/dependencies/what4 index 0cdce4130..94613390a 160000 --- a/dependencies/what4 +++ b/dependencies/what4 @@ -1 +1 @@ -Subproject commit 0cdce4130ebee865d9f771b54b64674d04bcea7c +Subproject commit 94613390a1bbd8b08cdb4272d85884943b63286a