From 0e7dc62ccfaeff32b5fc925952d0f9a5ad1f24ae Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 26 Jul 2023 14:08:19 +0200 Subject: [PATCH 1/2] arion-compose.cabal: Assume base package will remain compatible Having to bump base is causing more breakage than what it fixes. --- arion-compose.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arion-compose.cabal b/arion-compose.cabal index ce406b5..6217b53 100644 --- a/arion-compose.cabal +++ b/arion-compose.cabal @@ -30,7 +30,7 @@ source-repository head location: https://github.com/hercules-ci/arion common common - build-depends: base >=4.12.0.0 && <4.17 + build-depends: base >=4.12.0.0 && <4.99 , aeson >=2 , aeson-pretty , async From 22ef4649d8910612bcd5e8d18a82f5441bbb0bfb Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 26 Jul 2023 14:09:49 +0200 Subject: [PATCH 2/2] Remove nix run -c --- run-arion-via-nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-arion-via-nix b/run-arion-via-nix index b04cdb3..f652987 100755 --- a/run-arion-via-nix +++ b/run-arion-via-nix @@ -3,4 +3,4 @@ # For manual testing of a hacked arion built via Nix. # Works when called from outside the project directory. -exec nix run -f "$(dirname ${BASH_SOURCE[0]})" arion -c arion "$@" +exec nix run -f "$(dirname ${BASH_SOURCE[0]})" arion "$@"