diff --git a/cabal.project b/cabal.project index 004c83542d6..2f1013462d9 100644 --- a/cabal.project +++ b/cabal.project @@ -11,24 +11,24 @@ constraints: source-repository-package type: git location: https://github.com/input-output-hk/cardano-prelude - tag: b83730dccab14111d62144b048084eec7900d091 + tag: 56fadcea03417771f4b3666fd1dfc9bad8df1484 source-repository-package type: git location: https://github.com/input-output-hk/cardano-prelude - tag: b83730dccab14111d62144b048084eec7900d091 + tag: 56fadcea03417771f4b3666fd1dfc9bad8df1484 subdir: test source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 31aafc8d5c090c4443a12d588c923badac929843 + tag: 0e26a4f00324100b4c34f2a9c7606ae03e94d7a2 subdir: binary source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 31aafc8d5c090c4443a12d588c923badac929843 + tag: 0e26a4f00324100b4c34f2a9c7606ae03e94d7a2 subdir: binary/test source-repository-package @@ -58,9 +58,9 @@ source-repository-package type: git location: https://github.com/input-output-hk/iohk-monitoring-framework subdir: contra-tracer - tag: c85d57a95d919336afea7e0eff00e834bd6b4b58 + tag: e22be186e0b1018260ed7c5166871f82a869b94d source-repository-package type: git location: https://github.com/input-output-hk/goblins - tag: 6ea969b31c2bbaa7ba78b8e83b53a36bedfae10e + tag: b5e99cf153a3abb1b764f80095f6a930ba056048 diff --git a/nix/.stack.nix/cardano-binary-test.nix b/nix/.stack.nix/cardano-binary-test.nix index 0588a48331c..54bd4d6f81b 100644 --- a/nix/.stack.nix/cardano-binary-test.nix +++ b/nix/.stack.nix/cardano-binary-test.nix @@ -38,8 +38,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "31aafc8d5c090c4443a12d588c923badac929843"; - sha256 = "1swdpgpp3ds671cac5myarvcmrvrhz19p2jmr4zj01lj86crld2h"; + rev = "0e26a4f00324100b4c34f2a9c7606ae03e94d7a2"; + sha256 = "0l9lzk7aal1jbj0a1s9k2i5fw4wrzv3wl3jblgr41hqn76xhq82m"; }); postUnpack = "sourceRoot+=/binary/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-binary.nix b/nix/.stack.nix/cardano-binary.nix index 5ef943ea180..9ebc8d9a470 100644 --- a/nix/.stack.nix/cardano-binary.nix +++ b/nix/.stack.nix/cardano-binary.nix @@ -59,8 +59,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "31aafc8d5c090c4443a12d588c923badac929843"; - sha256 = "1swdpgpp3ds671cac5myarvcmrvrhz19p2jmr4zj01lj86crld2h"; + rev = "0e26a4f00324100b4c34f2a9c7606ae03e94d7a2"; + sha256 = "0l9lzk7aal1jbj0a1s9k2i5fw4wrzv3wl3jblgr41hqn76xhq82m"; }); postUnpack = "sourceRoot+=/binary; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-prelude-test.nix b/nix/.stack.nix/cardano-prelude-test.nix index fe34c94f19e..b0206eb47d9 100644 --- a/nix/.stack.nix/cardano-prelude-test.nix +++ b/nix/.stack.nix/cardano-prelude-test.nix @@ -42,8 +42,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-prelude"; - rev = "b83730dccab14111d62144b048084eec7900d091"; - sha256 = "00vnsl521bc2qbv4v3j00afprx8d58n8gfgcbhs2xpp8dywrfa5i"; + rev = "56fadcea03417771f4b3666fd1dfc9bad8df1484"; + sha256 = "1dljg11kpdd24lq7jdkqr2h7wnm1vxgnr2dwiw2wgxdf6m5i5vzr"; }); postUnpack = "sourceRoot+=/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-prelude.nix b/nix/.stack.nix/cardano-prelude.nix index 9a2b7534146..b5c7f5abd11 100644 --- a/nix/.stack.nix/cardano-prelude.nix +++ b/nix/.stack.nix/cardano-prelude.nix @@ -69,7 +69,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-prelude"; - rev = "b83730dccab14111d62144b048084eec7900d091"; - sha256 = "00vnsl521bc2qbv4v3j00afprx8d58n8gfgcbhs2xpp8dywrfa5i"; + rev = "56fadcea03417771f4b3666fd1dfc9bad8df1484"; + sha256 = "1dljg11kpdd24lq7jdkqr2h7wnm1vxgnr2dwiw2wgxdf6m5i5vzr"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-sl-x509.nix b/nix/.stack.nix/cardano-sl-x509.nix index cb39c869572..6299a23c0fb 100644 --- a/nix/.stack.nix/cardano-sl-x509.nix +++ b/nix/.stack.nix/cardano-sl-x509.nix @@ -23,13 +23,15 @@ (hsPkgs.asn1-types) (hsPkgs.base64-bytestring) (hsPkgs.bytestring) + (hsPkgs.cardano-prelude) (hsPkgs.cryptonite) (hsPkgs.data-default-class) (hsPkgs.directory) + (hsPkgs.exceptions) (hsPkgs.filepath) (hsPkgs.hourglass) (hsPkgs.ip) - (hsPkgs.universum) + (hsPkgs.text) (hsPkgs.unordered-containers) (hsPkgs.x509) (hsPkgs.x509-store) @@ -42,8 +44,9 @@ depends = [ (hsPkgs.base) (hsPkgs.QuickCheck) + (hsPkgs.cardano-prelude) (hsPkgs.cardano-sl-x509) - (hsPkgs.universum) + (hsPkgs.exceptions) (hsPkgs.hedgehog) ]; }; @@ -52,7 +55,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-sl-x509"; - rev = "ec96c64c665b741c17b4e38f611315bae9b0b054"; - sha256 = "0jfh07cp9kry7h5xdxy26ddm4zz00fckj3hvg2iqm4gy151s567q"; + rev = "43a036c5bbe68ca2e9cbe611eab7982e2348fe49"; + sha256 = "1aw7ns8lv51fjf45k8yzils2j7a6bqzy8hn65kb3z0dn1qsm8x88"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/contra-tracer.nix b/nix/.stack.nix/contra-tracer.nix index 1bb10748f77..65400ed88c9 100644 --- a/nix/.stack.nix/contra-tracer.nix +++ b/nix/.stack.nix/contra-tracer.nix @@ -24,8 +24,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "c85d57a95d919336afea7e0eff00e834bd6b4b58"; - sha256 = "1ia9z6bgavf2ng49d8f9anlsy9jln8ab20a92spkr2rd17c51qhv"; + rev = "e22be186e0b1018260ed7c5166871f82a869b94d"; + sha256 = "1nihpxmkhlhx3sfnwxprhfa0f70rc97zkvhd66hl3wcifgjp40aj"; }); postUnpack = "sourceRoot+=/contra-tracer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/goblins.nix b/nix/.stack.nix/goblins.nix index c76ae9fe362..55cae5cb708 100644 --- a/nix/.stack.nix/goblins.nix +++ b/nix/.stack.nix/goblins.nix @@ -50,7 +50,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/goblins"; - rev = "6ea969b31c2bbaa7ba78b8e83b53a36bedfae10e"; - sha256 = "1v9zr777j4piz202c2sy3c4clcdmarqyxc3xngwb6c5yydk6qs6d"; + rev = "b5e99cf153a3abb1b764f80095f6a930ba056048"; + sha256 = "14iac7x5d1akd96j2w0m8jg24qhgshyc8m9ljqs8bw73kaiqszzx"; }); } \ No newline at end of file diff --git a/stack.yaml b/stack.yaml index e78d0b3d009..092406876a9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/b83730dccab14111d62144b048084eec7900d091/snapshot.yaml +resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/56fadcea03417771f4b3666fd1dfc9bad8df1484/snapshot.yaml packages: - cardano-ledger @@ -15,13 +15,13 @@ extra-deps: - generic-monoid-0.1.0.0 - git: https://github.com/input-output-hk/cardano-prelude - commit: b83730dccab14111d62144b048084eec7900d091 + commit: 56fadcea03417771f4b3666fd1dfc9bad8df1484 subdirs: - . - test - git: https://github.com/input-output-hk/cardano-base - commit: 31aafc8d5c090c4443a12d588c923badac929843 + commit: 0e26a4f00324100b4c34f2a9c7606ae03e94d7a2 subdirs: - binary - binary/test @@ -35,12 +35,12 @@ extra-deps: # Needed for `cardano-ledger-specs` - git: https://github.com/input-output-hk/goblins - commit: 6ea969b31c2bbaa7ba78b8e83b53a36bedfae10e + commit: b5e99cf153a3abb1b764f80095f6a930ba056048 - moo-1.2 - gray-code-0.3.1 - git: https://github.com/input-output-hk/iohk-monitoring-framework - commit: c85d57a95d919336afea7e0eff00e834bd6b4b58 + commit: e22be186e0b1018260ed7c5166871f82a869b94d subdirs: - contra-tracer @@ -49,7 +49,7 @@ extra-deps: # Extracted from cardano-sl since it's quite useful - git: https://github.com/input-output-hk/cardano-sl-x509 - commit: ec96c64c665b741c17b4e38f611315bae9b0b054 + commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 - Unique-0.4.7.6