diff --git a/cabal.project b/cabal.project index fe39a51ab59..f294de680d0 100644 --- a/cabal.project +++ b/cabal.project @@ -50,11 +50,11 @@ repository cardano-haskell-packages d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee -- repeating the index-state for hackage to work around hackage.nix parsing limitation -index-state: 2023-06-06T00:00:00Z +index-state: 2023-11-26T21:52:49Z index-state: - , hackage.haskell.org 2023-06-06T00:00:00Z - , cardano-haskell-packages 2023-06-05T06:39:32Z + , hackage.haskell.org 2023-11-26T21:52:49Z + , cardano-haskell-packages 2023-11-27T10:31:25Z packages: lib/address-derivation-discovery @@ -109,8 +109,7 @@ source-repository-package location: https://github.com/input-output-hk/cardano-addresses tag: 44d5a9eb3505b6bfbf281d40fa88531c3253b771 --sha256: 16rja48ryfjw3531kf15w0h3cdmscqgs8l1z1i2mvahq1vlhr2y6 - subdir: command-line - core + subdir: core package cardano-addresses ghc-options: -Wno-incomplete-uni-patterns @@ -121,13 +120,6 @@ source-repository-package tag: a91add165152fa36f08e95fafe7da24f1dba4690 --sha256: 1ia8vlqghis92cla8qmqa6kh8f3jn29b01fshyk5hmgy5373s684 -source-repository-package - type: git - location: https://github.com/input-output-hk/bech32.git - tag: e341e7f83d7b73f10baa87e946818b2c493cc5f5 - --sha256: 1d891bpc1q1m1gqj02b4iv3kr4g9w7knlkq43hwbl9dn5k78aydc - subdir: bech32 - source-repository-package type: git location: https://github.com/cardano-foundation/cardano-wallet-client.git @@ -176,12 +168,17 @@ constraints: , cardano-api ^>=8.2 , cardano-slotting >= 0.1 , ouroboros-network ^>= 0.8.1.0 + , cardano-cli == 8.1.2 + + -- `cardano-cli-8.1.2` uses `optparse-applicative-fork-0.16.2.0` + -- and `cardano-wallet` uses `cardano-cli` as a dependency, so + -- it needs to use the same version of `optparse-applicative-fork`. + -- Otherwise, we'd use the latest version of `optparse-applicative`. + , optparse-applicative-fork == 0.16.2.0 -- TH Name shadowing warnings need to be addressed when bumping to 2.13.3.5 , persistent == 2.13.3.3 - -- Haddock is broken in this release. Waiting for the next release - -- Related to: https://github.com/haskell/cabal/issues/8554 if impl(ghc == 8.10.7) constraints: process == 1.6.13.2 diff --git a/flake.lock b/flake.lock index 55c15fa8563..ad55bc58e93 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1687545169, - "narHash": "sha256-odkMdGM8WsflO/IzGRah90KHVrlWs5yYWhCTgVh3wig=", + "lastModified": 1701253812, + "narHash": "sha256-Cm47K4OeinrufxdwlLkPOnDrghJ7cOLxJrtmAhvd2+c=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "1eacb7fae052b01c3eaf172b5cc403d600d225e3", + "rev": "46639a56b5450baaa960a095967f4f47355e9a9c", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1686070892, - "narHash": "sha256-0yAYqvCg2/aby4AmW0QQK9RKnU1siQczfbUC6hOU02w=", + "lastModified": 1689937110, + "narHash": "sha256-qbd7y3zJucW8GtRYVROg0HPzaXI3hAz/1vT46DE/8uI=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "596cf203a0a1ba252a083a79d384325000faeb49", + "rev": "4e27319575bc0f0516d72d9fb4403b1f16e50833", "type": "github" }, "original": { @@ -66,6 +66,22 @@ "type": "github" } }, + "HTTP_3": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -149,7 +165,41 @@ "type": "github" } }, + "cabal-32_3": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, "cabal-34": { + "flake": false, + "locked": { + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "owner": "haskell", + "repo": "cabal", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_2": { "flake": false, "locked": { "lastModified": 1645834128, @@ -166,7 +216,7 @@ "type": "github" } }, - "cabal-34_2": { + "cabal-34_3": { "flake": false, "locked": { "lastModified": 1645834128, @@ -184,6 +234,23 @@ } }, "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", + "owner": "haskell", + "repo": "cabal", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_2": { "flake": false, "locked": { "lastModified": 1669081697, @@ -200,7 +267,7 @@ "type": "github" } }, - "cabal-36_2": { + "cabal-36_3": { "flake": false, "locked": { "lastModified": 1669081697, @@ -217,9 +284,36 @@ "type": "github" } }, - "cardano-automation": { + "cardano-addresses": { "inputs": { + "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "haskellNix": "haskellNix", + "iohkNix": "iohkNix", + "nixpkgs": [ + "cardano-addresses", + "haskellNix", + "nixpkgs-2105" + ] + }, + "locked": { + "lastModified": 1690961525, + "narHash": "sha256-xosM6Q4Yql1FDD9QpB9mujY2IOAluBlGGVw6nxFRMps=", + "owner": "IntersectMBO", + "repo": "cardano-addresses", + "rev": "44d5a9eb3505b6bfbf281d40fa88531c3253b771", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "repo": "cardano-addresses", + "rev": "44d5a9eb3505b6bfbf281d40fa88531c3253b771", + "type": "github" + } + }, + "cardano-automation": { + "inputs": { + "flake-utils": "flake-utils_3", "haskellNix": [ "cardano-node-runtime", "haskellNix" @@ -249,7 +343,7 @@ }, "cardano-mainnet-mirror": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1642701714, @@ -274,14 +368,14 @@ "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "hackageNix": "hackageNix", - "haskellNix": "haskellNix", + "haskellNix": "haskellNix_2", "hostNixpkgs": [ "cardano-node-runtime", "nixpkgs" ], - "iohkNix": "iohkNix", + "iohkNix": "iohkNix_2", "nix2container": "nix2container", "nixpkgs": [ "cardano-node-runtime", @@ -298,16 +392,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1687190129, - "narHash": "sha256-JCa9+QhZ2RVSIKkhz2WCZqTKCgdUSuezWS2YsQ5vhM4=", + "lastModified": 1690209950, + "narHash": "sha256-d0V8N+y/OarYv6GQycGXnbPly7GeJRBEeE1017qj9eI=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "6f79e5c3ea109a70cd01910368e011635767305a", + "rev": "d2d90b48c5577b4412d5c9c9968b55f8ab4b9767", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "8.1.1", + "ref": "8.1.2", "repo": "cardano-node", "type": "github" } @@ -344,6 +438,22 @@ "type": "github" } }, + "cardano-shell_3": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -464,6 +574,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1632802058, + "narHash": "sha256-7IySNHriQjzOZ88DDk6VDPf1GoUaOrOeUdukY62o52o=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "5523c47f13259b981c49b26e28499724a5125fd8", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1647532380, @@ -480,7 +606,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1672831974, @@ -497,7 +623,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -513,7 +639,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1635892615, @@ -529,7 +655,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1672831974, @@ -547,6 +673,36 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -561,7 +717,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_4": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -577,7 +733,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_5": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -592,7 +748,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -607,7 +763,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_7": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -622,16 +778,16 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_8": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -640,23 +796,24 @@ "type": "github" } }, - "flake-utils_7": { + "ghc-8.6.5-iohk": { + "flake": false, "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", - "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", - "repo": "flake-utils", + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", "type": "github" } }, - "ghc-8.6.5-iohk": { + "ghc-8.6.5-iohk_2": { "flake": false, "locked": { "lastModified": 1600920045, @@ -673,7 +830,7 @@ "type": "github" } }, - "ghc-8.6.5-iohk_2": { + "ghc-8.6.5-iohk_3": { "flake": false, "locked": { "lastModified": 1600920045, @@ -690,9 +847,46 @@ "type": "github" } }, + "ghc98X": { + "flake": false, + "locked": { + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99": { + "flake": false, + "locked": { + "lastModified": 1697054644, + "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", + "ref": "refs/heads/master", + "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", + "revCount": 62040, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -712,11 +906,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1690158464, - "narHash": "sha256-GgXtAOc7WutIYNzl5cznwxag8Fo0KfKsOsjf/7uZO98=", + "lastModified": 1649121452, + "narHash": "sha256-1eZb0AVM7pIHWD1CgYOZiOXtGFFSs51tejh2eDeS7Ug=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "b0da1d610cf7fbf48854c92fd73ca7ebca5eb4b7", + "rev": "40a7f28b012509a91f4f313e219223e4ab370ca1", "type": "github" }, "original": { @@ -741,6 +935,22 @@ "type": "github" } }, + "hackage_2": { + "flake": false, + "locked": { + "lastModified": 1701217424, + "narHash": "sha256-7/Eh/Ym3SetuVfZoW+pfA2cT76LGLIsZyBpYQ5+9zR8=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "ad5612ab4a24a31e2e27c6d946b71215cb3d97f2", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", @@ -748,36 +958,29 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": [ - "cardano-node-runtime", - "hackageNix" - ], - "hls-1.10": "hls-1.10", + "hackage": "hackage", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", - "iserv-proxy": "iserv-proxy", + "nix-tools": "nix-tools", "nixpkgs": [ - "cardano-node-runtime", + "cardano-addresses", "nixpkgs" ], "nixpkgs-2003": "nixpkgs-2003", "nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1685495397, - "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", + "lastModified": 1649141593, + "narHash": "sha256-9USYJIOvkMpOu4xmp8fp7p8VYNz8REy/oRbPN5nhTKY=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", + "rev": "9987a666f2fba42c330cb6ad35d7deb102264d9a", "type": "github" }, "original": { @@ -793,36 +996,85 @@ "cabal-34": "cabal-34_2", "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", "hackage": [ - "hackage" + "cardano-node-runtime", + "hackageNix" ], - "hls-1.10": "hls-1.10_2", - "hls-2.0": "hls-2.0", + "hls-1.10": "hls-1.10", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", - "iserv-proxy": "iserv-proxy_2", + "iserv-proxy": "iserv-proxy", "nixpkgs": [ + "cardano-node-runtime", "nixpkgs" ], "nixpkgs-2003": "nixpkgs-2003_2", "nixpkgs-2105": "nixpkgs-2105_2", "nixpkgs-2111": "nixpkgs-2111_2", - "nixpkgs-2205": "nixpkgs-2205_2", - "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-unstable": "nixpkgs-unstable_2", "old-ghc-nix": "old-ghc-nix_2", "stackage": "stackage_2" }, "locked": { - "lastModified": 1690159878, - "narHash": "sha256-xzKTgKSF7wPGXRypnzpKdA6DhbhIod5B0M9lUXyaTuc=", + "lastModified": 1685495397, + "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "b0290ac43deb1f579966f381d43a5694104520d6", + "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_3": { + "inputs": { + "HTTP": "HTTP_3", + "cabal-32": "cabal-32_3", + "cabal-34": "cabal-34_3", + "cabal-36": "cabal-36_3", + "cardano-shell": "cardano-shell_3", + "flake-compat": "flake-compat_6", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", + "ghc98X": "ghc98X", + "ghc99": "ghc99", + "hackage": [ + "hackage" + ], + "hls-1.10": "hls-1.10_2", + "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hpc-coveralls": "hpc-coveralls_3", + "hydra": "hydra_3", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_3", + "nixpkgs-2105": "nixpkgs-2105_3", + "nixpkgs-2111": "nixpkgs-2111_3", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-unstable": "nixpkgs-unstable_3", + "old-ghc-nix": "old-ghc-nix_3", + "stackage": "stackage_3" + }, + "locked": { + "lastModified": 1701219018, + "narHash": "sha256-tJwUM+ilUIozNzCZSrfMnQSZn4VfeGm8Y4O9C8dUrW4=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "f4ef1f56e5962319d9a09f5cc92349e9a55878e7", "type": "github" }, "original": { @@ -876,13 +1128,80 @@ "type": "github" }, "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hpc-coveralls": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, - "hpc-coveralls": { + "hpc-coveralls_2": { "flake": false, "locked": { "lastModified": 1607498076, @@ -898,7 +1217,7 @@ "type": "github" } }, - "hpc-coveralls_2": { + "hpc-coveralls_3": { "flake": false, "locked": { "lastModified": 1607498076, @@ -917,6 +1236,30 @@ "hydra": { "inputs": { "nix": "nix", + "nixpkgs": [ + "cardano-addresses", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "owner": "NixOS", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_2": { + "inputs": { + "nix": "nix_2", "nixpkgs": [ "cardano-node-runtime", "haskellNix", @@ -938,9 +1281,9 @@ "type": "indirect" } }, - "hydra_2": { + "hydra_3": { "inputs": { - "nix": "nix_2", + "nix": "nix_3", "nixpkgs": [ "haskellNix", "hydra", @@ -985,6 +1328,27 @@ } }, "iohkNix": { + "inputs": { + "nixpkgs": [ + "cardano-addresses", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1633442149, + "narHash": "sha256-w9dUg+8po6LvZYu29Pr7lyUt/QlRgx3Phi0rhnz+CbQ=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "dc03db8b910aabba75931e524368df14eb9f7852", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_2": { "inputs": { "blst": "blst", "nixpkgs": [ @@ -1008,7 +1372,7 @@ "type": "github" } }, - "iohkNix_2": { + "iohkNix_3": { "inputs": { "blst": "blst_2", "nixpkgs": [ @@ -1018,11 +1382,11 @@ "sodium": "sodium_2" }, "locked": { - "lastModified": 1687457666, - "narHash": "sha256-Fpf3SHzt3aAt2lyQzrrhWGt5NAL0LDS/mBYTp9+jbfA=", + "lastModified": 1701223254, + "narHash": "sha256-k02Q+vuYHETqDMfnC4ORpHNKWUDpVWTeiETCmf7+gBA=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "694dcf154be8b276fb1196552dadbc3aedcc8613", + "rev": "ac6932d5f18c6f249a392fe4edbc2ca15257a512", "type": "github" }, "original": { @@ -1051,11 +1415,11 @@ "iserv-proxy_2": { "flake": false, "locked": { - "lastModified": 1670983692, - "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", "ref": "hkm/remote-iserv", - "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", - "revCount": 10, + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -1097,6 +1461,22 @@ "type": "github" } }, + "lowdown-src_3": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "n2c": { "inputs": { "flake-utils": [ @@ -1129,27 +1509,27 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", "owner": "NixOS", "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.11.0", + "ref": "2.6.0", "repo": "nix", "type": "github" } }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "cardano-node-runtime", "tullia", @@ -1182,10 +1562,26 @@ "type": "github" } }, + "nix-tools": { + "flake": false, + "locked": { + "lastModified": 1644395812, + "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1671269339, @@ -1203,8 +1599,8 @@ }, "nix2container_2": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1658567952, @@ -1223,7 +1619,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1241,6 +1637,27 @@ "type": "github" } }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_9", + "nixpkgs-regression": "nixpkgs-regression_3" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, "nixago": { "inputs": { "flake-utils": [ @@ -1278,15 +1695,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-21.05-small", "type": "indirect" } }, @@ -1322,7 +1740,39 @@ "type": "github" } }, + "nixpkgs-2003_3": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2105": { + "locked": { + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_2": { "locked": { "lastModified": 1659914493, "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", @@ -1338,7 +1788,7 @@ "type": "github" } }, - "nixpkgs-2105_2": { + "nixpkgs-2105_3": { "locked": { "lastModified": 1659914493, "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", @@ -1355,6 +1805,22 @@ } }, "nixpkgs-2111": { + "locked": { + "lastModified": 1648744337, + "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_2": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1370,7 +1836,7 @@ "type": "github" } }, - "nixpkgs-2111_2": { + "nixpkgs-2111_3": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -1404,11 +1870,11 @@ }, "nixpkgs-2205_2": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { @@ -1436,11 +1902,11 @@ }, "nixpkgs-2211_2": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -1452,11 +1918,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1685338297, - "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", "type": "github" }, "original": { @@ -1467,6 +1933,21 @@ } }, "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, + "nixpkgs-regression_2": { "locked": { "lastModified": 1643052045, "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", @@ -1482,7 +1963,7 @@ "type": "github" } }, - "nixpkgs-regression_2": { + "nixpkgs-regression_3": { "locked": { "lastModified": 1643052045, "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", @@ -1499,6 +1980,22 @@ } }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { "locked": { "lastModified": 1682656005, "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", @@ -1514,13 +2011,13 @@ "type": "github" } }, - "nixpkgs-unstable_2": { + "nixpkgs-unstable_3": { "locked": { - "lastModified": 1685347552, - "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { @@ -1530,13 +2027,13 @@ "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs-unstable_4": { "locked": { - "lastModified": 1687502512, - "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { @@ -1546,6 +2043,20 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -1561,7 +2072,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -1576,7 +2087,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -1592,7 +2103,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -1607,7 +2118,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1674407282, "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", @@ -1623,7 +2134,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -1639,7 +2150,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -1704,6 +2215,23 @@ "type": "github" } }, + "old-ghc-nix_3": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "ops-lib": { "flake": false, "locked": { @@ -1723,21 +2251,22 @@ "root": { "inputs": { "CHaP": "CHaP", + "cardano-addresses": "cardano-addresses", "cardano-node-runtime": "cardano-node-runtime", "customConfig": "customConfig_2", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_6", - "hackage": "hackage", - "haskellNix": "haskellNix_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_8", + "hackage": "hackage_2", + "haskellNix": "haskellNix_3", "hostNixpkgs": [ "nixpkgs" ], - "iohkNix": "iohkNix_2", + "iohkNix": "iohkNix_3", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" ], - "nixpkgs-unstable": "nixpkgs-unstable_3" + "nixpkgs-unstable": "nixpkgs-unstable_4" } }, "secp256k1": { @@ -1809,6 +2338,22 @@ } }, "stackage": { + "flake": false, + "locked": { + "lastModified": 1649034935, + "narHash": "sha256-QVnuwt+rC2hzbrLq6PjUjkRHxk3iPjC98GT1v92jfp8=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "0b47e88ff3416adb726b067a33ec0d385df4735e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_2": { "flake": false, "locked": { "lastModified": 1685491814, @@ -1824,14 +2369,14 @@ "type": "github" } }, - "stackage_2": { + "stackage_3": { "flake": false, "locked": { - "lastModified": 1690157437, - "narHash": "sha256-AgsGXKRxGqg3OIdNGVpyRJjWbz3v/5hnFDXruB+bn2w=", + "lastModified": 1701216595, + "narHash": "sha256-N3ARXU5rPu/g8ncMQRBiNR1rSNEysyhoHXs3Dvrvbpc=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "bb7a652bd9621fff862cf2d3b65379faae476a54", + "rev": "b76857de5714cf20e04e5dbbb4de3a2a2ae52bd9", "type": "github" }, "original": { @@ -1851,7 +2396,7 @@ "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_7", "incl": "incl", "makes": [ "cardano-node-runtime", @@ -1867,7 +2412,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nosys": "nosys", "yants": "yants" }, @@ -1904,7 +2449,7 @@ "inputs": { "nix-nomad": "nix-nomad", "nix2container": "nix2container_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "std": "std" }, "locked": { diff --git a/flake.nix b/flake.nix index 28e03197ad2..7e09de7b241 100644 --- a/flake.nix +++ b/flake.nix @@ -142,12 +142,16 @@ flake = false; }; customConfig.url = "github:input-output-hk/empty-flake"; - cardano-node-runtime.url = "github:input-output-hk/cardano-node?ref=8.1.1"; + cardano-node-runtime.url = "github:input-output-hk/cardano-node?ref=8.1.2"; + cardano-addresses = { + url = "github:IntersectMBO/cardano-addresses?rev=44d5a9eb3505b6bfbf281d40fa88531c3253b771"; + flake = false; + }; }; outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils, haskellNix, iohkNix, CHaP, customConfig, cardano-node-runtime, - ... }: + cardano-addresses, ... }: let inherit (nixpkgs) lib; config = import ./nix/config.nix lib customConfig; @@ -185,11 +189,13 @@ inherit system; inherit (haskellNix) config; overlays = [ +haskellNix.overlay + iohkNix.overlays.utils iohkNix.overlays.crypto iohkNix.overlays.haskell-nix-extra iohkNix.overlays.cardano-lib - haskellNix.overlay + # Cardano deployments (import ./nix/overlays/cardano-deployments.nix) # Our own utils (cardanoWalletLib) @@ -208,12 +214,14 @@ nodePkgs = cardano-node-runtime.legacyPackages.${system}; nodeProject = cardano-node-runtime.project.${system}; + cardano-address = cardano-addresses.packages.${system}."cardano-addresses-cli:exe:cardano-address"; project = (import ./nix/haskell.nix CHaP pkgs.haskell-nix nixpkgs-unstable.legacyPackages.${system} nodePkgs + cardano-address ).appendModule [{ gitrev = if config.gitrev != null @@ -238,7 +246,7 @@ # Adrestia tool belt inherit (project.hsPkgs.bech32.components.exes) bech32; - inherit (project.hsPkgs.cardano-addresses-cli.components.exes) cardano-address; + inherit cardano-address; # Cardano cardano-cli = nodeProject.hsPkgs.cardano-cli.components.exes.cardano-cli; diff --git a/lib/wallet-benchmarks/bench/memory-benchmark.hs b/lib/wallet-benchmarks/bench/memory-benchmark.hs index 08c6c0549f2..4cd2196ecb4 100644 --- a/lib/wallet-benchmarks/bench/memory-benchmark.hs +++ b/lib/wallet-benchmarks/bench/memory-benchmark.hs @@ -1,5 +1,4 @@ {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE RecordWildCards #-} import Prelude @@ -59,7 +58,7 @@ import qualified Cardano.BM.Setup as Log import qualified Cardano.Launcher as C import qualified Cardano.Launcher.Node as C import qualified Cardano.Launcher.Wallet as C -import qualified "optparse-applicative" Options.Applicative as O +import qualified Options.Applicative as O import qualified System.Process as S -- See ADP-1910 for Options.Applicative usage diff --git a/lib/wallet-e2e/cardano-wallet-e2e.cabal b/lib/wallet-e2e/cardano-wallet-e2e.cabal index b83390c4410..49b6032801a 100644 --- a/lib/wallet-e2e/cardano-wallet-e2e.cabal +++ b/lib/wallet-e2e/cardano-wallet-e2e.cabal @@ -119,10 +119,10 @@ executable wallet-e2e build-depends: , base ^>=4.14.3.0 , cardano-wallet-e2e - , optparse-applicative ^>=0.17.1 + , optparse-applicative ^>=0.18.1 , path ^>=0.9.2 , path-io ^>=1.7.0 , relude ^>=1.2.0.0 - , sydtest ^>=0.15 + , sydtest ^>=0.15.1.1 , tagged ^>=0.8.7 , with-utf8 ^>=1.0.2.4 diff --git a/lib/wallet/api/http/Cardano/CLI.hs b/lib/wallet/api/http/Cardano/CLI.hs index 12def15a563..8fe1a83fe46 100644 --- a/lib/wallet/api/http/Cardano/CLI.hs +++ b/lib/wallet/api/http/Cardano/CLI.hs @@ -12,7 +12,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NumericUnderscores #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} @@ -32,7 +31,6 @@ module Cardano.CLI , runCli -- * Commands - , cmdMnemonic , cmdWallet , cmdWalletCreate , cmdByronWalletCreate @@ -41,7 +39,6 @@ module Cardano.CLI , cmdStakePool , cmdNetwork , cmdVersion - , cmdKey -- * Option & Argument Parsers , optionT @@ -326,7 +323,7 @@ import Cardano.Wallet.Api.Types.Transaction import GHC.Num ( Natural ) -import "optparse-applicative" Options.Applicative +import Options.Applicative ( ArgumentFields , CommandFields , Mod @@ -361,7 +358,7 @@ import "optparse-applicative" Options.Applicative , switch , value ) -import "optparse-applicative" Options.Applicative.Types +import Options.Applicative.Types ( ReadM (..) , readerAsk ) @@ -386,7 +383,7 @@ import System.Console.ANSI , SGR (..) , hCursorBackward , hSetSGR - , hSupportsANSIWithoutEmulation + , hSupportsANSI ) import System.Directory ( XdgDirectory (..) @@ -432,8 +429,6 @@ import UnliftIO.Exception import qualified Cardano.BM.Configuration.Model as CM import qualified Cardano.BM.Data.BackendKind as CM import qualified Cardano.BM.Data.Observable as Obs -import qualified Command.Key as Key -import qualified Command.RecoveryPhrase as RecoveryPhrase import qualified Data.Aeson as Aeson import qualified Data.Aeson.Encode.Pretty as Aeson import qualified Data.Aeson.Types as Aeson @@ -471,20 +466,6 @@ runCli = join . customExecParser preferences where preferences = prefs showHelpOnEmpty -{------------------------------------------------------------------------------- - Commands - 'key' --------------------------------------------------------------------------------} - -cmdKey :: Mod CommandFields (IO ()) -cmdKey = Key.mod Key.run - -{------------------------------------------------------------------------------- - Commands - 'recovery-phrase' --------------------------------------------------------------------------------} - -cmdMnemonic :: Mod CommandFields (IO ()) -cmdMnemonic = RecoveryPhrase.mod RecoveryPhrase.run - {------------------------------------------------------------------------------- Commands - 'wallet' -------------------------------------------------------------------------------} @@ -1508,7 +1489,7 @@ walletStyleOption walletStyleOption defaultStyle accepted = option (eitherReader fromTextS) ( long "wallet-style" <> metavar "WALLET_STYLE" - <> helpDoc (Just (vsep typeOptions)) + <> helpDoc (vsep typeOptions) <> value defaultStyle ) where @@ -1977,8 +1958,8 @@ putErrLn = hPutErrLn stderr -- the ANSI control characters will be printed in grey (too bad). enableWindowsANSI :: IO () enableWindowsANSI = do - void $ hSupportsANSIWithoutEmulation stdout - void $ hSupportsANSIWithoutEmulation stderr + void $ hSupportsANSI stdout + void $ hSupportsANSI stderr {------------------------------------------------------------------------------- Processing of Sensitive Data diff --git a/lib/wallet/bench/src/Cardano/Wallet/BenchShared.hs b/lib/wallet/bench/src/Cardano/Wallet/BenchShared.hs index 5b45a404207..16676624677 100644 --- a/lib/wallet/bench/src/Cardano/Wallet/BenchShared.hs +++ b/lib/wallet/bench/src/Cardano/Wallet/BenchShared.hs @@ -1,6 +1,5 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE TypeApplications #-} -- | @@ -94,8 +93,7 @@ import Fmt import GHC.Generics ( Generic ) --- See ADP-1910 -import "optparse-applicative" Options.Applicative +import Options.Applicative ( HasValue , Mod , Parser diff --git a/lib/wallet/cardano-wallet.cabal b/lib/wallet/cardano-wallet.cabal index 13fdf2d0862..14e1bff183b 100644 --- a/lib/wallet/cardano-wallet.cabal +++ b/lib/wallet/cardano-wallet.cabal @@ -106,7 +106,7 @@ library , nothunks , ntp-client , OddWord - , optparse-applicative + , optparse-applicative-fork , ouroboros-consensus , ouroboros-consensus-cardano , ouroboros-network @@ -282,7 +282,6 @@ library cardano-wallet-api-http , binary , bytestring , cardano-addresses - , cardano-addresses-cli , cardano-api , cardano-balance-tx:{cardano-balance-tx, internal} , cardano-binary @@ -320,7 +319,7 @@ library cardano-wallet-api-http , network-uri , ntp-client , OddWord - , optparse-applicative + , optparse-applicative-fork , prettyprinter , quiet , random @@ -534,7 +533,7 @@ executable cardano-wallet , iohk-monitoring-extra , lobemo-backend-ekg , network-uri - , optparse-applicative + , optparse-applicative-fork , text , text-class , transformers @@ -642,7 +641,7 @@ test-suite unit , nothunks , OddWord , openapi3 ==3.2.3 - , optparse-applicative + , optparse-applicative-fork , ouroboros-consensus , ouroboros-consensus-cardano , ouroboros-network @@ -653,7 +652,7 @@ test-suite unit , QuickCheck , quickcheck-classes , quickcheck-instances - , quickcheck-state-machine >=0.6.0 + , quickcheck-state-machine ^>=0.7.3 , random , regex-pcre-builtin , retry diff --git a/lib/wallet/exe/cardano-wallet.hs b/lib/wallet/exe/cardano-wallet.hs index 0a1bc4e3e20..7ce4d242a91 100644 --- a/lib/wallet/exe/cardano-wallet.hs +++ b/lib/wallet/exe/cardano-wallet.hs @@ -5,7 +5,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} @@ -49,8 +48,6 @@ import Cardano.CLI , Mode (..) , cli , cmdAddress - , cmdKey - , cmdMnemonic , cmdNetwork , cmdStakePool , cmdTransaction @@ -164,7 +161,7 @@ import Main.Utf8 import Network.URI ( URI ) -import "optparse-applicative" Options.Applicative +import Options.Applicative ( CommandFields , Mod , Parser @@ -204,8 +201,6 @@ main = withUtf8 $ do enableWindowsANSI runCli $ cli $ mempty <> cmdServe - <> cmdMnemonic - <> cmdKey <> cmdWallet cmdWalletCreate walletClient <> cmdAddress addressClient <> cmdTransaction transactionClient walletClient diff --git a/lib/wallet/exe/mock-token-metadata-server.hs b/lib/wallet/exe/mock-token-metadata-server.hs index 8c3052a24b5..90c1edd93ef 100644 --- a/lib/wallet/exe/mock-token-metadata-server.hs +++ b/lib/wallet/exe/mock-token-metadata-server.hs @@ -1,5 +1,4 @@ {-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE PackageImports #-} module Main where @@ -21,8 +20,7 @@ import Control.Monad import Network.Wai.Middleware.RequestLogger ( logStdoutDev ) --- See ADP-1910 -import "optparse-applicative" Options.Applicative +import Options.Applicative ( ParserInfo , argument , auto diff --git a/lib/wallet/src/Cardano/Wallet/CLI.hs b/lib/wallet/src/Cardano/Wallet/CLI.hs index e292e85de69..010a4663939 100644 --- a/lib/wallet/src/Cardano/Wallet/CLI.hs +++ b/lib/wallet/src/Cardano/Wallet/CLI.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PackageImports #-} - module Cardano.Wallet.CLI ( networkConfigurationOption , nodeSocketOption @@ -7,7 +5,7 @@ module Cardano.Wallet.CLI where import Cardano.Launcher.Node -import "optparse-applicative" Options.Applicative +import Options.Applicative import Prelude import Cardano.Wallet.Network.Config diff --git a/lib/wallet/test/data/Cardano/CLISpec/--help b/lib/wallet/test/data/Cardano/CLISpec/--help index 81fec2bd074..feabacd938e 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/--help +++ b/lib/wallet/test/data/Cardano/CLISpec/--help @@ -12,8 +12,6 @@ Available options: -h,--help Show this help text Available commands: - recovery-phrase About recovery phrases - key About public/private keys wallet About wallets transaction About transactions address About addresses diff --git a/lib/wallet/test/data/Cardano/CLISpec/address create --help b/lib/wallet/test/data/Cardano/CLISpec/address create --help index bdf7a9a39f7..3ae308507a2 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/address create --help +++ b/lib/wallet/test/data/Cardano/CLISpec/address create --help @@ -1,5 +1,7 @@ -Usage: address create [--port INT] [--address-index INDEX] - WALLET_ID +Usage: address create + [--port INT] + [--address-index INDEX] + WALLET_ID Create a new random address. Only available for random wallets. The address index is optional, give none to let the wallet diff --git a/lib/wallet/test/data/Cardano/CLISpec/key --help b/lib/wallet/test/data/Cardano/CLISpec/key --help deleted file mode 100644 index 055c9742d10..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/key --help +++ /dev/null @@ -1,41 +0,0 @@ -Usage: key COMMAND - - About public/private keys - -Available options: - -h,--help Show this help text - -Available commands: - from-recovery-phrase Convert a recovery phrase to an - extended private key - child Derive child keys from a parent - public/private key - public Get the public counterpart of a - private key - inspect Show information about a key - hash Get the hash of a public key - walletid Shows the cardano-wallet wallet ID for - a given key - -Example: - $ cardano-wallet recovery-phrase generate --size 15 \ - | cardano-wallet key from-recovery-phrase Shelley > root.prv - - $ cat root.prv \ - | cardano-wallet key child 1852H/1815H/0H \ - | tee acct.prv \ - | cardano-wallet key public --with-chain-code > acct.pub - - $ cardano-wallet key inspect <<< $(cat acct.prv) - { - "key_type": "private", - "chain_code": "67bef6f80df02c7452e20e76ffb4bb57cae8aac2adf042b21a6b19e4f7b1f511", - "extended_key": "90ead3efad7aacac242705ede323665387f49ed847bed025eb333708ccf6aa54403482a867daeb18f38c57d6cddd7e6fd6aed4a3209f7425a3d1c5d9987a9c5f" - } - - $ cardano-wallet key inspect <<< $(cat acct.pub) - { - "key_type": "public", - "chain_code": "67bef6f80df02c7452e20e76ffb4bb57cae8aac2adf042b21a6b19e4f7b1f511", - "extended_key": "d306350ee88f51fb710252e27f0c40006c58e994761b383e02d400e2be59b3cc" - } diff --git a/lib/wallet/test/data/Cardano/CLISpec/key child --help b/lib/wallet/test/data/Cardano/CLISpec/key child --help deleted file mode 100644 index c4fa1c680d7..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/key child --help +++ /dev/null @@ -1,11 +0,0 @@ -Usage: key child DERIVATION-PATH - - Derive child keys from a parent public/private key - -Available options: - -h,--help Show this help text - DERIVATION-PATH Slash-separated derivation path. - Hardened indexes are marked with a 'H' - (e.g. 1852H/1815H/0H/0). - -The parent key is read from stdin. diff --git a/lib/wallet/test/data/Cardano/CLISpec/key from-recovery-phrase --help b/lib/wallet/test/data/Cardano/CLISpec/key from-recovery-phrase --help deleted file mode 100644 index a043469b332..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/key from-recovery-phrase --help +++ /dev/null @@ -1,51 +0,0 @@ -Usage: key from-recovery-phrase STYLE [--passphrase FORMAT] - [--sensitive | --silent] - [--from-file FILE] - - Convert a recovery phrase to an extended private key - -Available options: - -h,--help Show this help text - STYLE Byron | Icarus | Shelley | Shared - --passphrase FORMAT (from-mnemonic | from-hex | - from-base64 | from-utf8 | from-octets) - User chosen passphrase to be read from - stdin for the generation phase. Valid - for Icarus, Shelley and Shared styles. - Accepting mnemonic (9- or 12 words) or - arbitrary passphrase encoded as - base16, base64, plain utf8 or raw - bytes in the form of octet array. - --sensitive Input is shown as * in interactive - mode. - --silent Input is not shown in interactive - mode. - --from-file FILE Passphrase from specified filepath. - -The recovery phrase without passphrase is read from stdin. - -Example: - $ cardano-wallet recovery-phrase generate \ - | cardano-wallet key from-recovery-phrase Icarus - -The recovery phrase with passphrase can be entered interactively or from file. -In both cases passhrase can take form of mnemonic, base16, base64, utf8 or octet array. -In interactive case one can select explicit, sensitive or silent mode. - -Example: - $ cardano-wallet key from-recovery-phrase Shelley --passphrase from-mnemonic --sensitive - Please enter a [9, 12, 15, 18, 21, 24] word mnemonic: - ********************************************************************************************************** - Please enter a 9–12 word second factor: - ************************************************************* - -In case of passphrase reading from file the recovery phrase is read from stdin. - -Example: - $ echo "Secret Secondary Phrase" > sndfactor.prv - $ cardano-wallet recovery-phrase generate \ - | cardano-wallet key from-recovery-phrase Shelley --from-file "./sndfactor.prv" - - $ cardano-wallet recovery-phrase generate --size 12 > sndfactor.prv - $ cardano-wallet recovery-phrase generate \ - | cardano-wallet key from-recovery-phrase Shelley --passphrase from-mnemonic --from-file "./sndfactor.prv" diff --git a/lib/wallet/test/data/Cardano/CLISpec/key inspect --help b/lib/wallet/test/data/Cardano/CLISpec/key inspect --help deleted file mode 100644 index 97df88f297c..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/key inspect --help +++ /dev/null @@ -1,8 +0,0 @@ -Usage: key inspect - - Show information about a key - -Available options: - -h,--help Show this help text - -The parent key is read from stdin. diff --git a/lib/wallet/test/data/Cardano/CLISpec/key public --help b/lib/wallet/test/data/Cardano/CLISpec/key public --help deleted file mode 100644 index f98ef77f3af..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/key public --help +++ /dev/null @@ -1,8 +0,0 @@ -Usage: key public (--without-chain-code | --with-chain-code) - - Get the public counterpart of a private key - -Available options: - -h,--help Show this help text - -The private key is read from stdin.To get extended public key pass '--with-chain-code'.To get public key pass '--without-chain-code'. diff --git a/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase --help b/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase --help deleted file mode 100644 index 2f9b1fb67ad..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase --help +++ /dev/null @@ -1,9 +0,0 @@ -Usage: recovery-phrase COMMAND - - About recovery phrases - -Available options: - -h,--help Show this help text - -Available commands: - generate Generate an English recovery phrase diff --git a/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase generate --help b/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase generate --help deleted file mode 100644 index c9cce3523eb..00000000000 --- a/lib/wallet/test/data/Cardano/CLISpec/recovery-phrase generate --help +++ /dev/null @@ -1,8 +0,0 @@ -Usage: recovery-phrase generate [--size INT] - - Generate an English recovery phrase - -Available options: - -h,--help Show this help text - --size INT Number of mnemonic words to generate. - Must be a multiple of 3. (default: 24) diff --git a/lib/wallet/test/data/Cardano/CLISpec/transaction create --help b/lib/wallet/test/data/Cardano/CLISpec/transaction create --help index 8f31c11a570..f29125af7b4 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/transaction create --help +++ b/lib/wallet/test/data/Cardano/CLISpec/transaction create --help @@ -1,6 +1,9 @@ -Usage: transaction create [--port INT] WALLET_ID - (--payment PAYMENT) [--metadata JSON] - [--ttl DURATION] +Usage: transaction create + [--port INT] + WALLET_ID + (--payment PAYMENT) + [--metadata JSON] + [--ttl DURATION] Create and submit a new transaction. diff --git a/lib/wallet/test/data/Cardano/CLISpec/transaction fees --help b/lib/wallet/test/data/Cardano/CLISpec/transaction fees --help index f48a3e18970..c428877cbcb 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/transaction fees --help +++ b/lib/wallet/test/data/Cardano/CLISpec/transaction fees --help @@ -1,6 +1,9 @@ -Usage: transaction fees [--port INT] WALLET_ID - (--payment PAYMENT) [--metadata JSON] - [--ttl DURATION] +Usage: transaction fees + [--port INT] + WALLET_ID + (--payment PAYMENT) + [--metadata JSON] + [--ttl DURATION] Estimate fees for a transaction. diff --git a/lib/wallet/test/data/Cardano/CLISpec/transaction get --help b/lib/wallet/test/data/Cardano/CLISpec/transaction get --help index 2b727a52059..9a0b4eb6a8f 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/transaction get --help +++ b/lib/wallet/test/data/Cardano/CLISpec/transaction get --help @@ -1,5 +1,8 @@ -Usage: transaction get [--port INT] WALLET_ID TRANSACTION_ID - [--simple-metadata] +Usage: transaction get + [--port INT] + WALLET_ID + TRANSACTION_ID + [--simple-metadata] Get a transaction with specified id. diff --git a/lib/wallet/test/data/Cardano/CLISpec/transaction list --help b/lib/wallet/test/data/Cardano/CLISpec/transaction list --help index a3161e2309b..76039dc6a93 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/transaction list --help +++ b/lib/wallet/test/data/Cardano/CLISpec/transaction list --help @@ -1,7 +1,11 @@ -Usage: transaction list [--port INT] WALLET_ID [--start TIME] - [--end TIME] [--order ORDER] - [--simple-metadata] - [--max_count MAX_COUNT] +Usage: transaction list + [--port INT] + WALLET_ID + [--start TIME] + [--end TIME] + [--order ORDER] + [--simple-metadata] + [--max_count MAX_COUNT] List the transactions associated with a wallet. diff --git a/lib/wallet/test/data/Cardano/CLISpec/wallet create from-public-key --help b/lib/wallet/test/data/Cardano/CLISpec/wallet create from-public-key --help index 8aad56735ba..f66968afdcf 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/wallet create from-public-key --help +++ b/lib/wallet/test/data/Cardano/CLISpec/wallet create from-public-key --help @@ -1,6 +1,8 @@ Usage: wallet create from-public-key - [--port INT] WALLET_NAME [--address-pool-gap INT] - ACCOUNT_PUBLIC_KEY + [--port INT] + WALLET_NAME + [--address-pool-gap INT] + ACCOUNT_PUBLIC_KEY Create a wallet using a public account key. diff --git a/lib/wallet/test/data/Cardano/CLISpec/wallet create from-recovery-phrase --help b/lib/wallet/test/data/Cardano/CLISpec/wallet create from-recovery-phrase --help index 739eb6c0e10..1b0ab3bf63d 100644 --- a/lib/wallet/test/data/Cardano/CLISpec/wallet create from-recovery-phrase --help +++ b/lib/wallet/test/data/Cardano/CLISpec/wallet create from-recovery-phrase --help @@ -1,5 +1,7 @@ Usage: wallet create from-recovery-phrase - [--port INT] WALLET_NAME [--address-pool-gap INT] + [--port INT] + WALLET_NAME + [--address-pool-gap INT] Create a new wallet using a recovery phrase. diff --git a/lib/wallet/test/unit/Cardano/CLISpec.hs b/lib/wallet/test/unit/Cardano/CLISpec.hs index 6b2b5644d9c..377ad18ddcd 100644 --- a/lib/wallet/test/unit/Cardano/CLISpec.hs +++ b/lib/wallet/test/unit/Cardano/CLISpec.hs @@ -3,7 +3,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeApplications #-} @@ -21,8 +20,6 @@ import Cardano.CLI , TxId , cli , cmdAddress - , cmdKey - , cmdMnemonic , cmdNetwork , cmdStakePool , cmdTransaction @@ -66,8 +63,7 @@ import Data.Text.Class , TextDecodingError (..) , toText ) --- See ADP-1910 -import "optparse-applicative" Options.Applicative +import Options.Applicative ( ParserInfo , ParserPrefs , ParserResult (..) @@ -141,8 +137,6 @@ spec = do let goldenDir = $(getTestData) "Cardano" "CLISpec" mapM_ (usageGolden goldenDir) [ ["--help"] - , ["recovery-phrase", "--help"] - , ["recovery-phrase", "generate", "--help"] , ["wallet", "--help"] , ["wallet", "list", "--help"] , ["wallet", "create", "from-recovery-phrase", "--help"] @@ -167,11 +161,6 @@ spec = do , ["network", "information", "--help"] , ["network", "parameters", "--help"] , ["network", "clock", "--help"] - , ["key", "--help"] - , ["key", "from-recovery-phrase", "--help"] - , ["key", "child", "--help"] - , ["key", "public", "--help"] - , ["key", "inspect", "--help"] ] describe "Can perform roundtrip textual encoding & decoding" $ do @@ -397,8 +386,6 @@ defaultPrefs = prefs (mempty <> columns 65) parser :: ParserInfo (IO ()) parser = cli $ mempty - <> cmdMnemonic - <> cmdKey <> cmdWallet cmdWalletCreate walletClient <> cmdTransaction transactionClient walletClient <> cmdAddress addressClient diff --git a/lib/wallet/test/unit/Cardano/Wallet/Shelley/LaunchSpec.hs b/lib/wallet/test/unit/Cardano/Wallet/Shelley/LaunchSpec.hs index b32573e12ef..e0140d0ed86 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/Shelley/LaunchSpec.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/Shelley/LaunchSpec.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PackageImports #-} -- | -- Copyright: © 2020 IOHK -- License: Apache-2.0 @@ -12,7 +11,7 @@ import Prelude import Cardano.Wallet.CLI ( nodeSocketOption ) -import "optparse-applicative" Options.Applicative +import Options.Applicative ( ParserResult (..) , defaultPrefs , execParserPure diff --git a/nix/haskell.nix b/nix/haskell.nix index 4ac85ca7773..a0132d9821c 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -1,7 +1,7 @@ ############################################################################ # Builds Haskell packages with Haskell.nix ############################################################################ -CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ +CHaP: haskell-nix: nixpkgs-recent: nodePkgs: cardano-address: haskell-nix.cabalProject' [ ({ lib, pkgs, buildProject, ... }: { options = { gitrev = lib.mkOption { @@ -128,14 +128,14 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ nativeBuildInputs = with buildProject.hsPkgs; [ nodePkgs.cardano-cli nodePkgs.cardano-node - cardano-addresses-cli.components.exes.cardano-address + cardano-address bech32.components.exes.bech32 pretty-simple.components.exes.pretty-simple ] ++ (with pkgs.buildPackages.buildPackages; [ just adrgen haskellPackages.ghcid - pkgconfig + pkg-config nixpkgs-recent.python3Packages.openapi-spec-validator (ruby_3_1.withPackages (ps: [ ps.rake ps.thor ])) sqlite-interactive @@ -296,18 +296,9 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ # Add shell completions for tools. packages.cardano-cli.components.exes.cardano-cli.postInstall = optparseCompletionPostInstall + setGitRevPostInstall; packages.cardano-node.components.exes.cardano-node.postInstall = optparseCompletionPostInstall + setGitRevPostInstall; - packages.cardano-addresses-cli.components.exes.cardano-address.postInstall = optparseCompletionPostInstall; packages.bech32.components.exes.bech32.postInstall = optparseCompletionPostInstall; }) - # Provide the git revision for cardano-addresses - ({ config, ... }: - { - packages.cardano-addresses-cli.components.library.preBuild = '' - export GITREV=${config.hsPkgs.cardano-addresses-cli.src.rev} - ''; - }) - # Provide the swagger file in an environment variable for # tests because it is located outside of the Cabal package # source tree. @@ -382,13 +373,6 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ } )) - # Silence some warnings about "cleaning component source not - # supported for hpack package" which appear in nix-shell - { - packages.cardano-addresses.cabal-generator = lib.mkForce null; - packages.cardano-addresses-cli.cabal-generator = lib.mkForce null; - } - # Disable scrypt support on ARM64 ({ pkgs, ... }: { packages.address-derivation-discovery.flags.scrypt = !pkgs.stdenv.hostPlatform.isAarch64;