diff --git a/nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff b/nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff new file mode 100644 index 0000000..f4e9783 --- /dev/null +++ b/nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff @@ -0,0 +1,21 @@ +diff --git a/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs b/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs +index a0e9c8359..9943c7b66 100644 +--- a/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs ++++ b/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs +@@ -142,6 +142,7 @@ import Cardano.Ledger.UTxO (UTxO (..)) + import Control.Monad (replicateM) + import Control.Monad.Identity (Identity) + import Control.Monad.Trans.Fail.String (errorFail) ++import qualified Data.ByteString + import Data.GenValidity + import Data.Int (Int64) + import Data.Map.Strict (Map) +@@ -497,7 +498,7 @@ instance Crypto c => Arbitrary (PoolParams c) where + <*> arbitrary + + instance Arbitrary PoolMetadata where +- arbitrary = PoolMetadata <$> arbitrary <*> arbitrary ++ arbitrary = PoolMetadata <$> arbitrary <*> (Data.ByteString.pack <$> vectorOf 32 arbitrary) + + instance Arbitrary StakePoolRelay where + arbitrary = genericArbitraryU diff --git a/nix/cardano-node--apply-patches.diff b/nix/cardano-node--apply-patches.diff new file mode 100644 index 0000000..2f89203 --- /dev/null +++ b/nix/cardano-node--apply-patches.diff @@ -0,0 +1,16 @@ +diff --git a/nix/haskell.nix b/nix/haskell.nix +index ec137f412..cdeb9877b 100644 +--- a/nix/haskell.nix ++++ b/nix/haskell.nix +@@ -110,6 +110,11 @@ let + # + modules = + [ ++ ({ lib, pkgs, ... }: { ++ packages.cardano-ledger-core.patches = [ ++ ./cardano-ledger-core--Arbitrary-PoolMetadata.diff ++ ]; ++ }) + ({ lib, pkgs, ... }: { + packages.cardano-tracer.package.buildable = with pkgs.stdenv.hostPlatform; lib.mkForce (!isMusl); + packages.cardano-node-chairman.components.tests.chairman-tests.buildable = lib.mkForce pkgs.stdenv.hostPlatform.isUnix; diff --git a/nix/internal.nix b/nix/internal.nix index 4f37769..d502a74 100644 --- a/nix/internal.nix +++ b/nix/internal.nix @@ -39,6 +39,9 @@ in rec { cp -r ${../testgen-hs} ./testgen-hs sed -r '/^packages:/ a\ testgen-hs' -i cabal.project sed -r 's/other-modules:\s*/ , /g' -i cardano-submit-api/cardano-submit-api.cabal + + patch -p1 -i ${./cardano-node--apply-patches.diff} + cp ${./cardano-ledger-core--Arbitrary-PoolMetadata.diff} nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff ''); inherit (unpatched) rev shortRev lastModified lastModifiedDate; };