From b6ccc4769b8f14b9405f188d737dc954371978e5 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Fri, 1 Mar 2024 07:03:13 +0000 Subject: [PATCH 1/8] Update nix2container, PR was merged. --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index aa6c17d5b0..0e36fb645a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,7 @@ inputs.n2c.follows = "n2c"; }; - # Use upstream when https://github.com/nlewo/nix2container/pull/82 is merged - n2c.url = "github:shlevy/nix2container/no-Size-on-dir"; + n2c.url = "github:nlewo/nix2container"; marlowe-plutus.url = "github:input-output-hk/marlowe-plutus"; From d5a96c2d4ffc053ad8d15bafa36b8d99d5dbcc15 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Fri, 1 Mar 2024 07:57:00 +0000 Subject: [PATCH 2/8] bump haskell.nix --- flake.lock | 124 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 97 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 6552e6cc50..334e3b4a10 100644 --- a/flake.lock +++ b/flake.lock @@ -1346,11 +1346,11 @@ "ghc99_2": { "flake": false, "locked": { - "lastModified": 1697054644, - "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", "ref": "refs/heads/master", - "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", - "revCount": 62040, + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -1510,9 +1510,12 @@ "hls-2.2": "hls-2.2_2", "hls-2.3": "hls-2.3_2", "hls-2.4": "hls-2.4_2", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", "iserv-proxy": "iserv-proxy_2", + "nix-tools-static": "nix-tools-static", "nixpkgs": [ "haskell-nix", "nixpkgs-unstable" @@ -1523,16 +1526,17 @@ "nixpkgs-2205": "nixpkgs-2205_2", "nixpkgs-2211": "nixpkgs-2211_2", "nixpkgs-2305": "nixpkgs-2305_2", + "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-unstable": "nixpkgs-unstable_2", "old-ghc-nix": "old-ghc-nix_2", "stackage": "stackage_2" }, "locked": { - "lastModified": 1698022192, - "narHash": "sha256-qf8o096ErY5hJPdWqk8fmJqtXB5qsm35f2kOEmvQM3o=", + "lastModified": 1709254212, + "narHash": "sha256-/hmW5alo7oFijRffiDIQyEQqe5Xd4I2kApDjRJKXdjk=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c390991becb2a45a0963274e7924d3deaefcea29", + "rev": "aee4b65312c7751a271c445cb82d5a6dc5ec4cef", "type": "github" }, "original": { @@ -1931,16 +1935,16 @@ "hls-2.4_2": { "flake": false, "locked": { - "lastModified": 1696939266, - "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.4.0.0", + "ref": "2.4.0.1", "repo": "haskell-language-server", "type": "github" } @@ -1962,6 +1966,40 @@ "type": "github" } }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -2485,16 +2523,15 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1687444661, - "narHash": "sha256-z9n7ATBXeDqz5a8+4HJ9fhU6KMyg7zZX0wrhLdVG7bQ=", - "owner": "shlevy", + "lastModified": 1708764364, + "narHash": "sha256-+pOtDvmuVTg0Gi58hKDUyrNla5NbyUvt3Xs3gLR0Fws=", + "owner": "nlewo", "repo": "nix2container", - "rev": "0b09c33e2ba7964bc13b4a91247ee6eb04ebde64", + "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", "type": "github" }, "original": { - "owner": "shlevy", - "ref": "no-Size-on-dir", + "owner": "nlewo", "repo": "nix2container", "type": "github" } @@ -2609,6 +2646,23 @@ "type": "github" } }, + "nix-tools-static": { + "flake": false, + "locked": { + "lastModified": 1706266250, + "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", + "owner": "input-output-hk", + "repo": "haskell-nix-example", + "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "haskell-nix-example", + "type": "github" + } + }, "nix2container": { "inputs": { "flake-utils": "flake-utils_2", @@ -3062,11 +3116,11 @@ }, "nixpkgs-2305_2": { "locked": { - "lastModified": 1695416179, - "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { @@ -3092,6 +3146,22 @@ "type": "github" } }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -3222,17 +3292,17 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -4194,11 +4264,11 @@ "stackage_2": { "flake": false, "locked": { - "lastModified": 1698019774, - "narHash": "sha256-MXoKr4WS/wG/RA9VOiHH26dYOraZ1q8QayeA0rpfQUU=", + "lastModified": 1709251823, + "narHash": "sha256-EgmDABIQnPHOTagXuBzmD84h1l1Dw9TZ3zwgetWiZlw=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "87572456de828c621db6fc4082a93e34413e1d5d", + "rev": "251007143b04000735d067c3585c5b8501afb753", "type": "github" }, "original": { From c8a860135773f9713071aed57265cfc8bd6e4714 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Fri, 1 Mar 2024 08:03:42 +0000 Subject: [PATCH 3/8] Update CHaP url --- RELEASE.md | 2 +- cabal.project | 2 +- flake.nix | 2 +- nix/project.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index ae1571ec74..a554a8bf6f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -95,7 +95,7 @@ dropped. ## Step 6: Publish Haskell Libraries to CHaP -See [here](https://input-output-hk.github.io/cardano-haskell-packages/#how-to-add-a-new-package-version). +See [here](https://chap.intersectmbo.org/#how-to-add-a-new-package-version). ## Step 7: Publish a Release on GitHub diff --git a/cabal.project b/cabal.project index 372db9ccc7..88b5619d13 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,5 @@ repository cardano-haskell-packages - url: https://input-output-hk.github.io/cardano-haskell-packages + url: https://chap.intersectmbo.org/ secure: True root-keys: 3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f diff --git a/flake.nix b/flake.nix index 0e36fb645a..455c58ed63 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }; CHaP = { - url = "github:input-output-hk/cardano-haskell-packages?ref=repo"; + url = "github:intersectmbo/cardano-haskell-packages?ref=repo"; flake = false; }; diff --git a/nix/project.nix b/nix/project.nix index 4d75bd7d1e..9e9b1da6ec 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -24,7 +24,7 @@ let shell.withHoogle = false; inputMap = { - "https://input-output-hk.github.io/cardano-haskell-packages" = inputs.iogx.inputs.CHaP; + "https://chap.intersectmbo.org/" = inputs.iogx.inputs.CHaP; }; modules = [{ From 4fec8d3103ae0ebd0b2205b94d3ebbbe687eaaff Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Fri, 1 Mar 2024 08:04:47 +0000 Subject: [PATCH 4/8] update CHaP, hackage --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 334e3b4a10..f7ff755666 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1705919863, - "narHash": "sha256-XchDMhWE6VKyF2Tywxf/NVIdv7Y6euCe6UbCOAj2q2E=", - "owner": "input-output-hk", + "lastModified": 1709200107, + "narHash": "sha256-33rcyfxpCDnO5MYuSxCaekkmT9MuaWkR9thNTh9hIVs=", + "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "b38131ed654594733eae3ce7d56ee793000de2cf", + "rev": "67562ebf64bd8b0bd0fde4ca0a1e59e5af47e283", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "intersectmbo", "ref": "repo", "repo": "cardano-haskell-packages", "type": "github" @@ -1446,11 +1446,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1706228559, - "narHash": "sha256-wI4Fba5wByZWdRY1fw7ckHfz0TdTkUj0Q6iODCXNuZc=", + "lastModified": 1709252643, + "narHash": "sha256-pZ6+3nPDh0BiWNoVEPZrQqkoQy1JGKhrnBKR6rVoQjg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "c315acf27dac63a684ac71e684f2256671a201cd", + "rev": "ea81da88aa8f7b3662315388a916834ef284b23f", "type": "github" }, "original": { From 40b1964b29e5e3d22eb529bb882387c04365152a Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 3 Mar 2024 08:31:15 +0000 Subject: [PATCH 5/8] bump iogx --- flake.lock | 2652 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 2420 insertions(+), 232 deletions(-) diff --git a/flake.lock b/flake.lock index f7ff755666..5b1398f307 100644 --- a/flake.lock +++ b/flake.lock @@ -35,6 +35,40 @@ } }, "CHaP_3": { + "flake": false, + "locked": { + "lastModified": 1703398734, + "narHash": "sha256-DVaL6dBqgGOOjr3kyHi3NgtD4UrwTVsSMLkpUToyPt4=", + "owner": "input-output-hk", + "repo": "cardano-haskell-packages", + "rev": "dbfa903050eb861fcbd0c22dd5a4746f68d6d42e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "CHaP_4": { + "flake": false, + "locked": { + "lastModified": 1703398734, + "narHash": "sha256-DVaL6dBqgGOOjr3kyHi3NgtD4UrwTVsSMLkpUToyPt4=", + "owner": "input-output-hk", + "repo": "cardano-haskell-packages", + "rev": "dbfa903050eb861fcbd0c22dd5a4746f68d6d42e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "CHaP_5": { "flake": false, "locked": { "lastModified": 1699892661, @@ -99,6 +133,38 @@ "type": "github" } }, + "HTTP_4": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_5": { + "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, @@ -195,6 +261,40 @@ "type": "github" } }, + "blst_4": { + "flake": false, + "locked": { + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + }, + "original": { + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + } + }, + "blst_5": { + "flake": false, + "locked": { + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + }, + "original": { + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + } + }, "cabal-32": { "flake": false, "locked": { @@ -246,6 +346,40 @@ "type": "github" } }, + "cabal-32_4": { + "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-32_5": { + "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": { @@ -297,6 +431,40 @@ "type": "github" } }, + "cabal-34_4": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_5": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, "cabal-36": { "flake": false, "locked": { @@ -348,6 +516,40 @@ "type": "github" } }, + "cabal-36_4": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_5": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, "cardano-automation": { "inputs": { "flake-utils": "flake-utils", @@ -483,6 +685,38 @@ "type": "github" } }, + "cardano-shell_4": { + "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" + } + }, + "cardano-shell_5": { + "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" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat_4", @@ -511,8 +745,8 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_15", + "flake-compat": "flake-compat_13", + "flake-utils": "flake-utils_24", "nixpkgs": [ "std", "paisano-mdbook-preprocessor", @@ -741,7 +975,43 @@ }, "easy-purescript-nix_2": { "inputs": { - "flake-utils": "flake-utils_10" + "flake-utils": "flake-utils_9" + }, + "locked": { + "lastModified": 1696584097, + "narHash": "sha256-a9Hhqf/Fi0FkjRTcQr3pYDhrO9A9tdOkaeVgD23Cdrk=", + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "rev": "d5fe5f4b210a0e4bac42ae0c159596a49c5eb016", + "type": "github" + }, + "original": { + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "type": "github" + } + }, + "easy-purescript-nix_3": { + "inputs": { + "flake-utils": "flake-utils_13" + }, + "locked": { + "lastModified": 1696584097, + "narHash": "sha256-a9Hhqf/Fi0FkjRTcQr3pYDhrO9A9tdOkaeVgD23Cdrk=", + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "rev": "d5fe5f4b210a0e4bac42ae0c159596a49c5eb016", + "type": "github" + }, + "original": { + "owner": "justinwoo", + "repo": "easy-purescript-nix", + "type": "github" + } + }, + "easy-purescript-nix_4": { + "inputs": { + "flake-utils": "flake-utils_19" }, "locked": { "lastModified": 1696584097, @@ -809,7 +1079,7 @@ }, "fenix_2": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_24", "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { @@ -842,24 +1112,23 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_10": { "flake": false, "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "fixes", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, - "flake-compat_3": { + "flake-compat_11": { "flake": false, "locked": { "lastModified": 1672831974, @@ -876,7 +1145,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_12": { "flake": false, "locked": { "lastModified": 1673956053, @@ -892,7 +1161,40 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "fixes", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1672831974, @@ -909,7 +1211,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -925,7 +1227,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1672831974, @@ -942,7 +1244,24 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -958,6 +1277,23 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_9": { "flake": false, "locked": { @@ -994,11 +1330,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -1044,12 +1380,15 @@ } }, "flake-utils_13": { + "inputs": { + "systems": "systems_8" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -1059,12 +1398,15 @@ } }, "flake-utils_14": { + "inputs": { + "systems": "systems_9" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -1074,12 +1416,87 @@ } }, "flake-utils_15": { + "inputs": { + "systems": "systems_10" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_16": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_17": { + "inputs": { + "systems": "systems_12" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_18": { + "inputs": { + "systems": "systems_13" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_19": { + "inputs": { + "systems": "systems_14" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -1103,6 +1520,87 @@ "type": "github" } }, + "flake-utils_20": { + "inputs": { + "systems": "systems_15" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_21": { + "inputs": { + "systems": "systems_16" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_22": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_23": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_24": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "locked": { "lastModified": 1659877975, @@ -1186,11 +1684,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -1268,19 +1766,53 @@ "type": "github" } }, - "ghc98X": { + "ghc-8.6.5-iohk_4": { "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": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_5": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "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", @@ -1325,6 +1857,44 @@ "url": "https://gitlab.haskell.org/ghc/ghc" } }, + "ghc98X_4": { + "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" + } + }, + "ghc98X_5": { + "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": { @@ -1362,6 +1932,42 @@ } }, "ghc99_3": { + "flake": false, + "locked": { + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "ref": "refs/heads/master", + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99_4": { + "flake": false, + "locked": { + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "ref": "refs/heads/master", + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99_5": { "flake": false, "locked": { "lastModified": 1697054644, @@ -1382,6 +1988,8 @@ "gitignore": { "inputs": { "nixpkgs": [ + "iogx", + "iogx-template-haskell", "iogx", "pre-commit-hooks-nix", "nixpkgs" @@ -1402,6 +2010,52 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "iogx", + "iogx-template-vanilla", + "iogx", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "iogx", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "marlowe-plutus", @@ -1476,6 +2130,38 @@ } }, "hackage_2": { + "flake": false, + "locked": { + "lastModified": 1703636672, + "narHash": "sha256-QVADvglA1x9WpQFij73VvdvnqquCUCNBM0BOFHXQz0Y=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "6a9040a7f72c7e629b286a461cf856d987c163ba", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_3": { + "flake": false, + "locked": { + "lastModified": 1703636672, + "narHash": "sha256-QVADvglA1x9WpQFij73VvdvnqquCUCNBM0BOFHXQz0Y=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "6a9040a7f72c7e629b286a461cf856d987c163ba", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_4": { "flake": false, "locked": { "lastModified": 1699834964, @@ -1552,12 +2238,14 @@ "cabal-34": "cabal-34_3", "cabal-36": "cabal-36_3", "cardano-shell": "cardano-shell_3", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", "ghc98X": "ghc98X_3", "ghc99": "ghc99_3", "hackage": [ - "marlowe-plutus", + "iogx", + "iogx-template-haskell", + "iogx", "hackage" ], "hls-1.10": "hls-1.10_3", @@ -1569,7 +2257,9 @@ "hydra": "hydra_3", "iserv-proxy": "iserv-proxy_3", "nixpkgs": [ - "marlowe-plutus", + "iogx", + "iogx-template-haskell", + "iogx", "haskell-nix", "nixpkgs-unstable" ], @@ -1579,10 +2269,120 @@ "nixpkgs-2205": "nixpkgs-2205_3", "nixpkgs-2211": "nixpkgs-2211_3", "nixpkgs-2305": "nixpkgs-2305_3", + "nixpkgs-2311": "nixpkgs-2311_2", "nixpkgs-unstable": "nixpkgs-unstable_3", "old-ghc-nix": "old-ghc-nix_3", "stackage": "stackage_3" }, + "locked": { + "lastModified": 1703638209, + "narHash": "sha256-MeEwFKZGA+DEx54IE4JQQi5ss+kplyikHQFlc2pz3NM=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "3e17b0afaa245a660e02af7323de96153124928b", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskell-nix_3": { + "inputs": { + "HTTP": "HTTP_4", + "cabal-32": "cabal-32_4", + "cabal-34": "cabal-34_4", + "cabal-36": "cabal-36_4", + "cardano-shell": "cardano-shell_4", + "flake-compat": "flake-compat_8", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", + "ghc98X": "ghc98X_4", + "ghc99": "ghc99_4", + "hackage": [ + "iogx", + "iogx-template-vanilla", + "iogx", + "hackage" + ], + "hls-1.10": "hls-1.10_4", + "hls-2.0": "hls-2.0_4", + "hls-2.2": "hls-2.2_4", + "hls-2.3": "hls-2.3_4", + "hls-2.4": "hls-2.4_4", + "hpc-coveralls": "hpc-coveralls_4", + "hydra": "hydra_4", + "iserv-proxy": "iserv-proxy_4", + "nixpkgs": [ + "iogx", + "iogx-template-vanilla", + "iogx", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_4", + "nixpkgs-2105": "nixpkgs-2105_4", + "nixpkgs-2111": "nixpkgs-2111_4", + "nixpkgs-2205": "nixpkgs-2205_4", + "nixpkgs-2211": "nixpkgs-2211_4", + "nixpkgs-2305": "nixpkgs-2305_4", + "nixpkgs-2311": "nixpkgs-2311_3", + "nixpkgs-unstable": "nixpkgs-unstable_4", + "old-ghc-nix": "old-ghc-nix_4", + "stackage": "stackage_4" + }, + "locked": { + "lastModified": 1703638209, + "narHash": "sha256-MeEwFKZGA+DEx54IE4JQQi5ss+kplyikHQFlc2pz3NM=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "3e17b0afaa245a660e02af7323de96153124928b", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskell-nix_4": { + "inputs": { + "HTTP": "HTTP_5", + "cabal-32": "cabal-32_5", + "cabal-34": "cabal-34_5", + "cabal-36": "cabal-36_5", + "cardano-shell": "cardano-shell_5", + "flake-compat": "flake-compat_11", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", + "ghc98X": "ghc98X_5", + "ghc99": "ghc99_5", + "hackage": [ + "marlowe-plutus", + "hackage" + ], + "hls-1.10": "hls-1.10_5", + "hls-2.0": "hls-2.0_5", + "hls-2.2": "hls-2.2_5", + "hls-2.3": "hls-2.3_5", + "hls-2.4": "hls-2.4_5", + "hpc-coveralls": "hpc-coveralls_5", + "hydra": "hydra_5", + "iserv-proxy": "iserv-proxy_5", + "nixpkgs": [ + "marlowe-plutus", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_5", + "nixpkgs-2105": "nixpkgs-2105_5", + "nixpkgs-2111": "nixpkgs-2111_5", + "nixpkgs-2205": "nixpkgs-2205_5", + "nixpkgs-2211": "nixpkgs-2211_5", + "nixpkgs-2305": "nixpkgs-2305_5", + "nixpkgs-unstable": "nixpkgs-unstable_5", + "old-ghc-nix": "old-ghc-nix_5", + "stackage": "stackage_5" + }, "locked": { "lastModified": 1698022192, "narHash": "sha256-qf8o096ErY5hJPdWqk8fmJqtXB5qsm35f2kOEmvQM3o=", @@ -1762,41 +2562,41 @@ "type": "github" } }, - "hls-2.0": { + "hls-1.10_4": { "flake": false, "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.0.0.1", + "ref": "1.10.0.0", "repo": "haskell-language-server", "type": "github" } }, - "hls-2.0_2": { + "hls-1.10_5": { "flake": false, "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.0.0.1", + "ref": "1.10.0.0", "repo": "haskell-language-server", "type": "github" } }, - "hls-2.0_3": { + "hls-2.0": { "flake": false, "locked": { "lastModified": 1687698105, @@ -1813,7 +2613,75 @@ "type": "github" } }, - "hls-2.2": { + "hls-2.0_2": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0_3": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0_4": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0_5": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.2": { "flake": false, "locked": { "lastModified": 1693064058, @@ -1864,6 +2732,40 @@ "type": "github" } }, + "hls-2.2_4": { + "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.2_5": { + "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": { @@ -1915,6 +2817,40 @@ "type": "github" } }, + "hls-2.3_4": { + "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.3_5": { + "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": { @@ -1950,6 +2886,40 @@ } }, "hls-2.4_3": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4_4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4_5": { "flake": false, "locked": { "lastModified": 1696939266, @@ -2048,6 +3018,38 @@ "type": "github" } }, + "hpc-coveralls_4": { + "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_5": { + "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" + } + }, "hydra": { "inputs": { "nix": "nix", @@ -2098,6 +3100,58 @@ "hydra_3": { "inputs": { "nix": "nix_3", + "nixpkgs": [ + "iogx", + "iogx-template-haskell", + "iogx", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_4": { + "inputs": { + "nix": "nix_4", + "nixpkgs": [ + "iogx", + "iogx-template-vanilla", + "iogx", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_5": { + "inputs": { + "nix": "nix_5", "nixpkgs": [ "marlowe-plutus", "haskell-nix", @@ -2200,20 +3254,23 @@ "haskell-nix": [ "haskell-nix" ], - "iohk-nix": "iohk-nix", + "iogx-template-haskell": "iogx-template-haskell", + "iogx-template-vanilla": "iogx-template-vanilla", + "iohk-nix": "iohk-nix_3", + "nix2container": "nix2container_5", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "sphinxcontrib-haddock": "sphinxcontrib-haddock" + "nixpkgs-stable": "nixpkgs-stable_5", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", + "sphinxcontrib-haddock": "sphinxcontrib-haddock_3" }, "locked": { - "lastModified": 1699537966, - "narHash": "sha256-MGGza+vZDRjKj31WhQJDt7CqVVdrFkgkXIcqr0gDiU8=", + "lastModified": 1709222966, + "narHash": "sha256-XS6qdSm3nIZue+gniKV4r29PNg5EWZ6oQURMwhlc/8Y=", "owner": "input-output-hk", "repo": "iogx", - "rev": "c6ce7f034717ed0c0e9c6dd8fa2f898a15439627", + "rev": "fee2fb63921d14dedfe33390ded3ac2db7b35cfd", "type": "github" }, "original": { @@ -2222,31 +3279,139 @@ "type": "github" } }, - "iogx_2": { + "iogx-template-haskell": { "inputs": { - "CHaP": [ - "marlowe-plutus", - "CHaP" - ], - "easy-purescript-nix": "easy-purescript-nix_2", - "flake-utils": "flake-utils_11", - "hackage": [ - "marlowe-plutus", - "hackage" - ], - "haskell-nix": [ - "marlowe-plutus", - "haskell-nix" + "iogx": "iogx_2" + }, + "locked": { + "dir": "templates/haskell", + "lastModified": 1708614239, + "narHash": "sha256-7SWCZzXdjyzCspdlawv3gWsF3Sc4ELuG359USBoSz78=", + "owner": "input-output-hk", + "repo": "iogx", + "rev": "b9d68c8e45b1dab0e1a762ac9d51d49d15b724a6", + "type": "github" + }, + "original": { + "dir": "templates/haskell", + "owner": "input-output-hk", + "repo": "iogx", + "type": "github" + } + }, + "iogx-template-vanilla": { + "inputs": { + "iogx": "iogx_3" + }, + "locked": { + "dir": "templates/vanilla", + "lastModified": 1708614239, + "narHash": "sha256-7SWCZzXdjyzCspdlawv3gWsF3Sc4ELuG359USBoSz78=", + "owner": "input-output-hk", + "repo": "iogx", + "rev": "b9d68c8e45b1dab0e1a762ac9d51d49d15b724a6", + "type": "github" + }, + "original": { + "dir": "templates/vanilla", + "owner": "input-output-hk", + "repo": "iogx", + "type": "github" + } + }, + "iogx_2": { + "inputs": { + "CHaP": "CHaP_3", + "easy-purescript-nix": "easy-purescript-nix_2", + "flake-utils": "flake-utils_10", + "hackage": "hackage_2", + "haskell-nix": "haskell-nix_2", + "iohk-nix": "iohk-nix", + "nix2container": "nix2container_3", + "nixpkgs": [ + "iogx", + "iogx-template-haskell", + "iogx", + "haskell-nix", + "nixpkgs" ], + "nixpkgs-stable": "nixpkgs-stable", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "sphinxcontrib-haddock": "sphinxcontrib-haddock" + }, + "locked": { + "lastModified": 1704707180, + "narHash": "sha256-m3rsKAHYi3WhJVYC9XLT38yJQILRkJ03fA2L5Ej3msM=", + "owner": "input-output-hk", + "repo": "iogx", + "rev": "0578c08bef2d135f6f1e88353276fd3a31acf026", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iogx", + "type": "github" + } + }, + "iogx_3": { + "inputs": { + "CHaP": "CHaP_4", + "easy-purescript-nix": "easy-purescript-nix_3", + "flake-utils": "flake-utils_14", + "hackage": "hackage_3", + "haskell-nix": "haskell-nix_3", "iohk-nix": "iohk-nix_2", + "nix2container": "nix2container_4", "nixpkgs": [ - "marlowe-plutus", + "iogx", + "iogx-template-vanilla", + "iogx", + "haskell-nix", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "sphinxcontrib-haddock": "sphinxcontrib-haddock_2" }, + "locked": { + "lastModified": 1704707180, + "narHash": "sha256-m3rsKAHYi3WhJVYC9XLT38yJQILRkJ03fA2L5Ej3msM=", + "owner": "input-output-hk", + "repo": "iogx", + "rev": "0578c08bef2d135f6f1e88353276fd3a31acf026", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iogx", + "type": "github" + } + }, + "iogx_4": { + "inputs": { + "CHaP": [ + "marlowe-plutus", + "CHaP" + ], + "easy-purescript-nix": "easy-purescript-nix_4", + "flake-utils": "flake-utils_20", + "hackage": [ + "marlowe-plutus", + "hackage" + ], + "haskell-nix": [ + "marlowe-plutus", + "haskell-nix" + ], + "iohk-nix": "iohk-nix_4", + "nixpkgs": [ + "marlowe-plutus", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_7", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", + "sphinxcontrib-haddock": "sphinxcontrib-haddock_4" + }, "locked": { "lastModified": 1699537966, "narHash": "sha256-MGGza+vZDRjKj31WhQJDt7CqVVdrFkgkXIcqr0gDiU8=", @@ -2265,6 +3430,8 @@ "inputs": { "blst": "blst_2", "nixpkgs": [ + "iogx", + "iogx-template-haskell", "iogx", "nixpkgs" ], @@ -2272,11 +3439,11 @@ "sodium": "sodium_2" }, "locked": { - "lastModified": 1696445248, - "narHash": "sha256-2B/fqwyaRAaHVmkf15tKwkFbL5O46TmMw+Rc2viUPEY=", + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "e32040e84180b3c27c0f13587025f6a17a4da520", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", "type": "github" }, "original": { @@ -2289,13 +3456,63 @@ "inputs": { "blst": "blst_3", "nixpkgs": [ - "marlowe-plutus", + "iogx", + "iogx-template-vanilla", "iogx", "nixpkgs" ], "secp256k1": "secp256k1_3", "sodium": "sodium_3" }, + "locked": { + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohk-nix_3": { + "inputs": { + "blst": "blst_4", + "nixpkgs": [ + "iogx", + "nixpkgs" + ], + "secp256k1": "secp256k1_4", + "sodium": "sodium_4" + }, + "locked": { + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohk-nix_4": { + "inputs": { + "blst": "blst_5", + "nixpkgs": [ + "marlowe-plutus", + "iogx", + "nixpkgs" + ], + "secp256k1": "secp256k1_5", + "sodium": "sodium_5" + }, "locked": { "lastModified": 1696445248, "narHash": "sha256-2B/fqwyaRAaHVmkf15tKwkFbL5O46TmMw+Rc2viUPEY=", @@ -2385,6 +3602,40 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, + "iserv-proxy_4": { + "flake": false, + "locked": { + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", + "ref": "hkm/remote-iserv", + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "iserv-proxy_5": { + "flake": false, + "locked": { + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", + "ref": "hkm/remote-iserv", + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -2433,12 +3684,44 @@ "type": "github" } }, + "lowdown-src_4": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_5": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "marlowe-plutus": { "inputs": { - "CHaP": "CHaP_3", - "hackage": "hackage_2", - "haskell-nix": "haskell-nix_2", - "iogx": "iogx_2", + "CHaP": "CHaP_5", + "hackage": "hackage_4", + "haskell-nix": "haskell-nix_4", + "iogx": "iogx_4", "nixpkgs": [ "marlowe-plutus", "haskell-nix", @@ -2519,8 +3802,8 @@ }, "n2c_3": { "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_14" + "flake-utils": "flake-utils_22", + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1708764364, @@ -2571,7 +3854,7 @@ "paisano", "haumea" ], - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1681604203, @@ -2701,6 +3984,63 @@ "type": "github" } }, + "nix2container_3": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1703410130, + "narHash": "sha256-qbJQ8DtdKzFK0fZck7kX64QWkS/3tKefxGjyI+SAQa4=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "6aa8491e73843ac8bf714a3904a45900f356ea44", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_4": { + "inputs": { + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_15" + }, + "locked": { + "lastModified": 1703410130, + "narHash": "sha256-qbJQ8DtdKzFK0fZck7kX64QWkS/3tKefxGjyI+SAQa4=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "6aa8491e73843ac8bf714a3904a45900f356ea44", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_5": { + "inputs": { + "flake-utils": "flake-utils_17", + "nixpkgs": "nixpkgs_17" + }, + "locked": { + "lastModified": 1703410130, + "narHash": "sha256-qbJQ8DtdKzFK0fZck7kX64QWkS/3tKefxGjyI+SAQa4=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "6aa8491e73843ac8bf714a3904a45900f356ea44", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", @@ -2725,7 +4065,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -2743,25 +4083,67 @@ "type": "github" } }, - "nixago": { + "nix_4": { "inputs": { - "flake-utils": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "cardano-node", - "cardano-automation", + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_14", + "nixpkgs-regression": "nixpkgs-regression_4" + }, + "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" + } + }, + "nix_5": { + "inputs": { + "lowdown-src": "lowdown-src_5", + "nixpkgs": "nixpkgs_19", + "nixpkgs-regression": "nixpkgs-regression_5" + }, + "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": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -2906,6 +4288,38 @@ "type": "github" } }, + "nixpkgs-2003_4": { + "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-2003_5": { + "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": 1659914493, @@ -2954,6 +4368,38 @@ "type": "github" } }, + "nixpkgs-2105_4": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_5": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2111": { "locked": { "lastModified": 1659446231, @@ -3002,6 +4448,38 @@ "type": "github" } }, + "nixpkgs-2111_4": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_5": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2205": { "locked": { "lastModified": 1685573264, @@ -3050,269 +4528,635 @@ "type": "github" } }, + "nixpkgs-2205_4": { + "locked": { + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205_5": { + "locked": { + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2211": { "locked": { "lastModified": 1688392541, "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_2": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_3": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_4": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_5": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305": { + "locked": { + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_2": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_3": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_4": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_5": { + "locked": { + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2311_2": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2311_3": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_4": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_5": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2211_2": { + "nixpkgs-stable_5": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" } }, - "nixpkgs-2211_3": { + "nixpkgs-stable_6": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2305": { + "nixpkgs-stable_7": { "locked": { - "lastModified": 1695416179, - "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" } }, - "nixpkgs-2305_2": { + "nixpkgs-stable_8": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2305_3": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1695416179, - "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2311": { + "nixpkgs-unstable_2": { "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-23.11-darwin", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-unstable_3": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, - "nixpkgs-regression_2": { + "nixpkgs-unstable_4": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, - "nixpkgs-regression_3": { + "nixpkgs-unstable_5": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs_10": { "locked": { - "lastModified": 1690680713, - "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", - "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs_11": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs_12": { "locked": { - "lastModified": 1690680713, - "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "lastModified": 1697269602, + "narHash": "sha256-dSzV7Ud+JH4DPVD9od53EgDrxUVQOcSj4KGjggCDVJI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "rev": "9cb540e9c1910d74a7e10736277f6eb9dff51c81", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs_13": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_14": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-unstable_2": { + "nixpkgs_15": { "locked": { - "lastModified": 1694822471, - "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "lastModified": 1697269602, + "narHash": "sha256-dSzV7Ud+JH4DPVD9od53EgDrxUVQOcSj4KGjggCDVJI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "rev": "9cb540e9c1910d74a7e10736277f6eb9dff51c81", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs_16": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { @@ -3322,23 +5166,22 @@ "type": "github" } }, - "nixpkgs_10": { + "nixpkgs_17": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "lastModified": 1697269602, + "narHash": "sha256-dSzV7Ud+JH4DPVD9od53EgDrxUVQOcSj4KGjggCDVJI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "rev": "9cb540e9c1910d74a7e10736277f6eb9dff51c81", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_18": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -3354,7 +5197,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_19": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -3370,7 +5213,22 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_2": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -3386,7 +5244,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_21": { "locked": { "lastModified": 1677612629, "narHash": "sha256-yC+9LfhfwOd5sXFW8TLnDmqVMNYiHXYPGy9BbdpRqfU=", @@ -3401,7 +5259,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_22": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -3417,7 +5275,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_23": { "locked": { "lastModified": 1680758185, "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", @@ -3433,7 +5291,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_24": { "locked": { "lastModified": 1677063315, "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", @@ -3449,21 +5307,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1675940568, @@ -3668,6 +5511,40 @@ "type": "github" } }, + "old-ghc-nix_4": { + "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" + } + }, + "old-ghc-nix_5": { + "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": { @@ -3959,18 +5836,62 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_9", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_12", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1696846637, - "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix_2": { + "inputs": { + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_16", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_16", + "nixpkgs-stable": "nixpkgs-stable_4" + }, + "locked": { + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks-nix_3": { + "inputs": { + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_18", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_18", + "nixpkgs-stable": "nixpkgs-stable_6" + }, + "locked": { + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", "type": "github" }, "original": { @@ -3979,13 +5900,13 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { + "pre-commit-hooks-nix_4": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_12", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_13", - "nixpkgs-stable": "nixpkgs-stable_4" + "flake-compat": "flake-compat_12", + "flake-utils": "flake-utils_21", + "gitignore": "gitignore_4", + "nixpkgs": "nixpkgs_20", + "nixpkgs-stable": "nixpkgs-stable_8" }, "locked": { "lastModified": 1696846637, @@ -4162,6 +6083,40 @@ "type": "github" } }, + "secp256k1_4": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, + "secp256k1_5": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, "sodium": { "flake": false, "locked": { @@ -4213,6 +6168,40 @@ "type": "github" } }, + "sodium_4": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, + "sodium_5": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, "sphinxcontrib-haddock": { "flake": false, "locked": { @@ -4245,6 +6234,38 @@ "type": "github" } }, + "sphinxcontrib-haddock_3": { + "flake": false, + "locked": { + "lastModified": 1594136664, + "narHash": "sha256-O9YT3iCUBHP3CEF88VDLLCO2HSP3HqkNA2q2939RnVY=", + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "rev": "f3956b3256962b2d27d5a4e96edb7951acf5de34", + "type": "github" + }, + "original": { + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "type": "github" + } + }, + "sphinxcontrib-haddock_4": { + "flake": false, + "locked": { + "lastModified": 1594136664, + "narHash": "sha256-O9YT3iCUBHP3CEF88VDLLCO2HSP3HqkNA2q2939RnVY=", + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "rev": "f3956b3256962b2d27d5a4e96edb7951acf5de34", + "type": "github" + }, + "original": { + "owner": "michaelpj", + "repo": "sphinxcontrib-haddock", + "type": "github" + } + }, "stackage": { "flake": false, "locked": { @@ -4278,6 +6299,38 @@ } }, "stackage_3": { + "flake": false, + "locked": { + "lastModified": 1703635755, + "narHash": "sha256-lLvI2HgVSYAPlsxF1zOb+VYBLc9pse0+W49ShuPi/jY=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "ce032ad63ef03ace9f481c508b461743271dfa3e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_4": { + "flake": false, + "locked": { + "lastModified": 1703635755, + "narHash": "sha256-lLvI2HgVSYAPlsxF1zOb+VYBLc9pse0+W49ShuPi/jY=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "ce032ad63ef03ace9f481c508b461743271dfa3e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_5": { "flake": false, "locked": { "lastModified": 1698019774, @@ -4396,7 +6449,7 @@ "blank": "blank_3", "devshell": "devshell_3", "dmerge": "dmerge_3", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_23", "incl": "incl_3", "makes": [ "std", @@ -4410,7 +6463,7 @@ "n2c" ], "nixago": "nixago_3", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_22", "paisano": "paisano_3", "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor_2", "paisano-tui": "paisano-tui_3", @@ -4445,6 +6498,111 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_16": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -4535,6 +6693,36 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tullia": { "inputs": { "nix-nomad": "nix-nomad", From d27c6ac895963dc79c99eb21f4f7be86362fc33d Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 3 Mar 2024 08:40:06 +0000 Subject: [PATCH 6/8] Make nix develop build. --- cabal.project | 34 ++++++++++++++++++++-------- libs/base16-aeson/base16-aeson.cabal | 2 +- nix/project.nix | 2 +- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/cabal.project b/cabal.project index 88b5619d13..43db1a7722 100644 --- a/cabal.project +++ b/cabal.project @@ -200,11 +200,33 @@ constraints: -- failures when other packages depend on cryptonite. -- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508 http-client-tls < 0.3.6.2, - ouroboros-network-framework ==0.10.1.0 + ouroboros-network-framework ==0.10.1.0, + selective >= 0.7 + allow-newer: primitive, - optparse-applicative + optparse-applicative, + eventuo11y-otel:base, + eventuo11y:base, + eventuo11y-dsl:base, + eventuo11y-dsl:template-haskell, + eventuo11y-json:base, + eventuo11y-json:template-haskell, + eventuo11y-extras:transformers, + hasql-dynamic-syntax:transformers, + marlowe-cardano:transformers, + marlowe-cardano:sbv, + cardano-api, + plutus-ledger-api, + prettyprinter-configurable, + plutus-tx, + multiplate, + marlowe-chain-sync:plutus-core, + marlowe-object:zip, + *:transformers, + *:base16, + marlowe-runtime:semigroupoids, source-repository-package @@ -221,11 +243,3 @@ source-repository-package subdir: marlowe-spec-test isabelle --sha256: 1yfbv9bwr71jd2sqfsb5jjq6j5bjfbjpp946fbkhxwwc2npwj0pd - - -source-repository-package - type: git - location: https://github.com/intersectMBO/cardano-api - tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f - subdir: cardano-api - --sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj diff --git a/libs/base16-aeson/base16-aeson.cabal b/libs/base16-aeson/base16-aeson.cabal index 8cabf0b394..0a50f15d27 100644 --- a/libs/base16-aeson/base16-aeson.cabal +++ b/libs/base16-aeson/base16-aeson.cabal @@ -7,7 +7,7 @@ library build-depends: , aeson ^>=2.2 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , bytestring >=0.10.12 && <0.12 , text ^>=2.0 diff --git a/nix/project.nix b/nix/project.nix index 9e9b1da6ec..3f7bc30d50 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -14,7 +14,7 @@ let src = ../.; - compiler-nix-name = "ghc928"; + compiler-nix-name = "ghc964"; flake.variants.profiled.modules = [{ enableProfiling = true; From 15dad823884361aee22da8a1324f27140cc0ed3b Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 4 Mar 2024 09:31:13 +0000 Subject: [PATCH 7/8] cleanup --- cabal.project | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/cabal.project b/cabal.project index 43db1a7722..d7172d6aa5 100644 --- a/cabal.project +++ b/cabal.project @@ -194,39 +194,15 @@ source-repository-package --sha256: sha256-69iE7LrigHTSKJrgq6uGU+U4j+NtBwR4ae18vsLyVvI= subdir: core --- These constraints needed for plutus-apps -constraints: - -- 0.3.6.2 switched from cryptonite to crypton, and this causes linker - -- failures when other packages depend on cryptonite. - -- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508 - http-client-tls < 0.3.6.2, - ouroboros-network-framework ==0.10.1.0, - selective >= 0.7 - allow-newer: - primitive, - optparse-applicative, eventuo11y-otel:base, eventuo11y:base, eventuo11y-dsl:base, eventuo11y-dsl:template-haskell, eventuo11y-json:base, eventuo11y-json:template-haskell, - eventuo11y-extras:transformers, - hasql-dynamic-syntax:transformers, - marlowe-cardano:transformers, - marlowe-cardano:sbv, - cardano-api, - plutus-ledger-api, - prettyprinter-configurable, - plutus-tx, - multiplate, - marlowe-chain-sync:plutus-core, - marlowe-object:zip, - *:transformers, - *:base16, - marlowe-runtime:semigroupoids, + source-repository-package @@ -243,3 +219,10 @@ source-repository-package subdir: marlowe-spec-test isabelle --sha256: 1yfbv9bwr71jd2sqfsb5jjq6j5bjfbjpp946fbkhxwwc2npwj0pd + +source-repository-package + type: git + location: https://github.com/intersectMBO/cardano-api + tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f + subdir: cardano-api + --sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj \ No newline at end of file From 7b56cef0e1fe5e88013de3524f52baeab873aaae Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 4 Mar 2024 12:08:22 +0000 Subject: [PATCH 8/8] make it build with 9.6 --- eventuo11y-extras/eventuo11y-extras.cabal | 2 +- .../hasql-dynamic-syntax.cabal | 7 +--- .../src/Data/ByteString/Base16/Aeson.hs | 7 ++-- marlowe-actus/src/Actus/Marlowe.hs | 3 +- .../oracle/Language/Marlowe/Oracle/Process.hs | 3 +- marlowe-apps/pipe/Main.hs | 3 +- .../Language/Marlowe/Runtime/App/Transact.hs | 3 +- .../Runtime/ChainIndexer/NodeClient.hs | 13 +++++-- marlowe-chain-sync/marlowe-chain-sync.cabal | 20 +++++----- .../Language/Marlowe/Runtime/ChainSync/Api.hs | 25 ++++++------ .../ChainSync/Database/PostgreSQL/Alonzo.hs | 1 + .../ChainSync/Database/PostgreSQL/Cardano.hs | 2 +- .../ChainSync/Database/PostgreSQL/Types.hs | 3 +- .../cli-test/Language/Marlowe/CLI/Test.hs | 4 +- .../Language/Marlowe/CLI/Test/Runner.hs | 4 +- .../command/Language/Marlowe/CLI/Command.hs | 3 +- .../Language/Marlowe/CLI/Command/Contract.hs | 3 +- .../Language/Marlowe/CLI/Command/Format.hs | 3 +- .../Language/Marlowe/CLI/Command/Input.hs | 2 +- .../Language/Marlowe/CLI/Command/Parse.hs | 10 ++++- .../Language/Marlowe/CLI/Command/Role.hs | 3 +- .../Language/Marlowe/CLI/Command/Run.hs | 3 +- .../Language/Marlowe/CLI/Command/Template.hs | 3 +- .../Language/Marlowe/CLI/Command/Test.hs | 3 +- .../Marlowe/CLI/Command/Transaction.hs | 3 +- .../Language/Marlowe/CLI/Command/Util.hs | 3 +- marlowe-cli/src/Contrib/Cardano/Debug.hs | 1 + .../src/Language/Marlowe/CLI/Analyze.hs | 3 +- marlowe-cli/src/Language/Marlowe/CLI/Codec.hs | 3 +- .../src/Language/Marlowe/CLI/Examples.hs | 2 +- .../src/Language/Marlowe/CLI/Export.hs | 3 +- .../src/Language/Marlowe/CLI/Format.hs | 3 +- marlowe-cli/src/Language/Marlowe/CLI/IO.hs | 3 +- .../src/Language/Marlowe/CLI/Merkle.hs | 3 +- marlowe-cli/src/Language/Marlowe/CLI/Run.hs | 3 +- .../src/Language/Marlowe/CLI/Transaction.hs | 3 +- marlowe-client/marlowe-client.cabal | 2 +- .../Marlowe/Runtime/Integration/Common.hs | 4 +- .../Marlowe/Runtime/Integration/Contract.hs | 14 ++++--- .../Marlowe/Runtime/Integration/Create.hs | 1 - marlowe-object/marlowe-object.cabal | 6 +-- .../src/Language/Marlowe/Object/Bundler.hs | 1 - .../src/Language/Marlowe/Object/Link.hs | 4 +- .../src/Language/Marlowe/Object/Types.hs | 18 +++++---- marlowe-protocols/marlowe-protocols.cabal | 4 +- .../src/Network/Protocol/Codec/Spec.hs | 3 +- .../src/Network/Protocol/Driver/Trace.hs | 7 ++-- .../src/Network/Protocol/Query/Client.hs | 1 - marlowe-runtime-web/marlowe-runtime-web.cabal | 2 +- .../Marlowe/Runtime/Web/Server/DTO.hs | 1 + .../Marlowe/Runtime/Web/Server/Util.hs | 1 + .../src/Language/Marlowe/Runtime/Web/Types.hs | 12 +++--- .../Marlowe/Runtime/Contract/Store/File.hs | 14 +++---- .../Marlowe/Runtime/Transaction/Gen.hs | 1 - marlowe-runtime/marlowe-runtime.cabal | 38 +++++++++---------- .../src/Language/Marlowe/Runtime/Core/Api.hs | 11 +++--- .../Marlowe/Runtime/Core/ScriptRegistry.hs | 4 +- .../Marlowe/Runtime/Transaction/ApiSpec.hs | 1 - .../Language/Marlowe/Runtime/Transaction.hs | 3 +- marlowe-test/marlowe-test.cabal | 3 +- marlowe-test/src/Spec/Marlowe/Reference.hs | 3 +- .../test/Spec/Marlowe/Semantics/Compute.hs | 4 +- marlowe/marlowe-cardano.cabal | 4 +- .../Marlowe/Analysis/Safety/Transaction.hs | 4 +- 64 files changed, 193 insertions(+), 144 deletions(-) diff --git a/eventuo11y-extras/eventuo11y-extras.cabal b/eventuo11y-extras/eventuo11y-extras.cabal index 519b8adfcf..c93f84fbf6 100644 --- a/eventuo11y-extras/eventuo11y-extras.cabal +++ b/eventuo11y-extras/eventuo11y-extras.cabal @@ -60,5 +60,5 @@ library , some >=1 && <2 , stm ^>=2.5 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 diff --git a/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal b/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal index 1e1cbf39f7..146d21f626 100644 --- a/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal +++ b/hasql-dynamic-syntax/hasql-dynamic-syntax.cabal @@ -69,7 +69,7 @@ library , scientific ^>=0.3.7 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , uuid >=1.3 && <2 , vector ^>=0.13 @@ -78,9 +78,6 @@ test-suite hasql-dynamic-syntax-test hs-source-dirs: test type: exitcode-stdio-1.0 main-is: Spec.hs - build-depends: - , base >=4.9 && <5 - , hspec - + build-depends: hspec build-tool-depends: hspec-discover:hspec-discover ghc-options: -threaded diff --git a/libs/base16-aeson/src/Data/ByteString/Base16/Aeson.hs b/libs/base16-aeson/src/Data/ByteString/Base16/Aeson.hs index 7fb63cc5ad..5dc374f863 100644 --- a/libs/base16-aeson/src/Data/ByteString/Base16/Aeson.hs +++ b/libs/base16-aeson/src/Data/ByteString/Base16/Aeson.hs @@ -11,9 +11,10 @@ import Data.Aeson (FromJSON, ToJSON (toJSON)) import Data.Aeson qualified as A import Data.Aeson qualified as Aeson import Data.Aeson.Types qualified as A +import Data.Base16.Types (extractBase16) import Data.Bifunctor (first) import Data.ByteString qualified as BSS -import Data.ByteString.Base16 (decodeBase16, encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import Data.ByteString.Base16 qualified as Base16 import Data.ByteString.Lazy qualified as BSL import Data.Text qualified as T @@ -26,11 +27,11 @@ newtype EncodeBase16 = EncodeBase16 BSS.ByteString unBase16 (EncodeBase16 bs) = bs instance ToJSON EncodeBase16 where - toJSON (EncodeBase16 bs) = toJSON . encodeBase16 $ bs + toJSON (EncodeBase16 bs) = toJSON . extractBase16 . encodeBase16 $ bs instance FromJSON EncodeBase16 where parseJSON v = do - let base16Parser = either (fail . T.unpack) pure . decodeBase16 . TE.encodeUtf8 + let base16Parser = either (fail . T.unpack) pure . decodeBase16Untyped . TE.encodeUtf8 EncodeBase16 <$> Aeson.withText "ByteString" base16Parser v byteStringToJSON :: BSS.ByteString -> Aeson.Value diff --git a/marlowe-actus/src/Actus/Marlowe.hs b/marlowe-actus/src/Actus/Marlowe.hs index 4153de2990..a38a2e31f6 100644 --- a/marlowe-actus/src/Actus/Marlowe.hs +++ b/marlowe-actus/src/Actus/Marlowe.hs @@ -42,7 +42,8 @@ import Actus.Model ( validateTerms, ) import Control.Applicative ((<|>)) -import Control.Monad.Reader (Reader, filterM, runReader, withReader) +import Control.Monad (filterM) +import Control.Monad.Reader (Reader, runReader, withReader) import Data.List as L (foldl', groupBy) import Data.Maybe (isNothing) import Data.Time (LocalTime (..), UTCTime (UTCTime), nominalDiffTimeToSeconds, timeOfDayToTime) diff --git a/marlowe-apps/oracle/Language/Marlowe/Oracle/Process.hs b/marlowe-apps/oracle/Language/Marlowe/Oracle/Process.hs index a25f2c5985..3acbad2bc0 100644 --- a/marlowe-apps/oracle/Language/Marlowe/Oracle/Process.hs +++ b/marlowe-apps/oracle/Language/Marlowe/Oracle/Process.hs @@ -5,7 +5,8 @@ module Language.Marlowe.Oracle.Process where import Control.Monad (void) -import Control.Monad.Except (ExceptT (ExceptT), liftIO, runExceptT) +import Control.Monad.Except (ExceptT (ExceptT), runExceptT) +import Control.Monad.IO.Class (liftIO) import Data.Maybe (mapMaybe) import Data.Text (Text) import Language.Marlowe.Core.V1.Semantics.Types ( diff --git a/marlowe-apps/pipe/Main.hs b/marlowe-apps/pipe/Main.hs index 4436cf8754..2040b2c9a1 100644 --- a/marlowe-apps/pipe/Main.hs +++ b/marlowe-apps/pipe/Main.hs @@ -5,7 +5,8 @@ module Main ( main, ) where -import Control.Monad.Except (liftIO, runExceptT) +import Control.Monad.Except (runExceptT) +import Control.Monad.IO.Class (liftIO) import Data.Aeson (eitherDecode, encode) import Data.Text (Text) import Language.Marlowe.Runtime.App.Parser (getConfigParser) diff --git a/marlowe-apps/src/Language/Marlowe/Runtime/App/Transact.hs b/marlowe-apps/src/Language/Marlowe/Runtime/App/Transact.hs index cff8e24f37..53b2e3872b 100644 --- a/marlowe-apps/src/Language/Marlowe/Runtime/App/Transact.hs +++ b/marlowe-apps/src/Language/Marlowe/Runtime/App/Transact.hs @@ -24,7 +24,8 @@ module Language.Marlowe.Runtime.App.Transact ( import Control.Concurrent (threadDelay) import Control.Monad (join, when) -import Control.Monad.Except (ExceptT (..), catchError, liftIO, throwError) +import Control.Monad.Except (ExceptT (..), catchError, throwError) +import Control.Monad.IO.Class (liftIO) import Language.Marlowe.Core.V1.Semantics.Types (Contract, Input) import Language.Marlowe.Runtime.App.Types ( App, diff --git a/marlowe-chain-sync/chain-indexer/Language/Marlowe/Runtime/ChainIndexer/NodeClient.hs b/marlowe-chain-sync/chain-indexer/Language/Marlowe/Runtime/ChainIndexer/NodeClient.hs index f1e1dafb0e..656e52d576 100644 --- a/marlowe-chain-sync/chain-indexer/Language/Marlowe/Runtime/ChainIndexer/NodeClient.hs +++ b/marlowe-chain-sync/chain-indexer/Language/Marlowe/Runtime/ChainIndexer/NodeClient.hs @@ -54,6 +54,7 @@ import Control.Concurrent.Component import Control.Concurrent.STM (STM, TVar, modifyTVar, newTVar, readTVar, writeTVar) import Control.Monad (guard, when) import Control.Monad.IO.Class (liftIO) +import Data.Base16.Types (extractBase16) import Data.ByteString.Base16 (encodeBase16) import Data.IORef (IORef) import Data.IntMap.Lazy (IntMap) @@ -236,7 +237,7 @@ pipelinedClient costModel maxCost changesVar getIntersectionPoints = (At (BlockHeader _ hash no) : _) -> logInfo $ fromString $ - printf "Tip of local chain: %s (#%d)" (encodeBase16 (serialiseToRawBytes hash)) (unBlockNo no) + printf "Tip of local chain: %s (#%d)" (extractBase16 (encodeBase16 (serialiseToRawBytes hash))) (unBlockNo no) _ -> logInfo "Local chain empty" pure $ SendMsgFindIntersect @@ -350,7 +351,7 @@ mkClientStNext lastLog costModel maxCost changesVar slotNoToBlockNo pipelineDeci fromString $ printf "Rolled forward to block %s (#%d of %d) (%d%%)" - (encodeBase16 (serialiseToRawBytes hash)) + (extractBase16 (encodeBase16 (serialiseToRawBytes hash))) localBlockNo remoteBlockNo ((localBlockNo * 100) `div` remoteBlockNo) @@ -383,7 +384,11 @@ mkClientStNext lastLog costModel maxCost changesVar slotNoToBlockNo pipelineDeci logInfo case snd tip of ChainTipAtGenesis -> "Local node rolled back to genesis." ChainTip _ hash no -> - fromString $ printf "Local node switched to new tip %s (#%d)" (encodeBase16 (serialiseToRawBytes hash)) (unBlockNo no) + fromString $ + printf + "Local node switched to new tip %s (#%d)" + (extractBase16 (encodeBase16 (serialiseToRawBytes hash))) + (unBlockNo no) let remote = case fst tip of Origin -> 0 At r -> unBlockNo r @@ -393,7 +398,7 @@ mkClientStNext lastLog costModel maxCost changesVar slotNoToBlockNo pipelineDeci fromString $ printf "Rolled back to block %s (#%d of %d) (%d%%)" - (encodeBase16 (serialiseToRawBytes hash)) + (extractBase16 (encodeBase16 (serialiseToRawBytes hash))) local remote ((local * 100) `div` remote) diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal index 5da77197c5..a5789ebe73 100644 --- a/marlowe-chain-sync/marlowe-chain-sync.cabal +++ b/marlowe-chain-sync/marlowe-chain-sync.cabal @@ -72,7 +72,7 @@ library , aeson ^>=2.2 , attoparsec , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 , cardano-api ^>=8.37 @@ -147,7 +147,7 @@ library libchainsync , ouroboros-network-protocols ^>=0.6.0 , stm ^>=2.5 , text ^>=2.0 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , vector ^>=0.13 @@ -167,7 +167,7 @@ library chain-indexer build-depends: , async-components ==0.1.1.0 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , bytestring >=0.10.12 && <0.12 , cardano-api ^>=8.37 , cardano-crypto-wrapper ^>=1.5 @@ -197,7 +197,7 @@ library chain-indexer , stm-delay ^>=0.1.1 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , vector ^>=0.13 , witherable ^>=0.4 @@ -210,7 +210,7 @@ library plutus-compat other-modules: build-depends: , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , cardano-api ^>=8.37 , cardano-ledger-binary ^>=1.2 , cardano-ledger-byron ^>=1.0 @@ -228,7 +228,7 @@ library gen build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=8.37 + , cardano-api ^>=8.37.0 , cardano-api-gen ^>=8.1 , containers ^>=0.6.5 , hedgehog-quickcheck ^>=0.1 @@ -277,7 +277,7 @@ executable marlowe-chain-indexer , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=8.37 + , cardano-api ^>=8.37.0 , cardano-crypto-wrapper ^>=1.5 , cardano-ledger-byron ^>=1.0 , eventuo11y >=0.9 && <0.11 @@ -292,7 +292,7 @@ executable marlowe-chain-indexer , postgresql-libpq ^>=0.9 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 executable marlowe-chain-sync @@ -310,7 +310,7 @@ executable marlowe-chain-sync , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=8.37 + , cardano-api ^>=8.37.0 , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 @@ -339,7 +339,7 @@ executable marlowe-chain-copy build-depends: , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=8.37 + , cardano-api ^>=8.37.0 , cassava , marlowe-chain-sync ==0.0.6 , optparse-applicative diff --git a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Api.hs b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Api.hs index e359cf9726..afd8d9065a 100644 --- a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Api.hs +++ b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Api.hs @@ -57,11 +57,12 @@ import qualified Data.Aeson.KeyMap as KeyMap import Data.Aeson.Text (encodeToLazyText) import Data.Aeson.Types (Parser, parseFail, toJSONKeyText) import qualified Data.Attoparsec.ByteString.Char8 as Atto +import Data.Base16.Types (extractBase16) import Data.Bifunctor (Bifunctor (..), bimap) import Data.Binary (Binary (..), get, getWord8, put, putWord8) import Data.ByteString (ByteString) import qualified Data.ByteString as BS -import Data.ByteString.Base16 (decodeBase16, encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import qualified Data.ByteString.Char8 as BSC import Data.Foldable (Foldable (..)) import Data.Function (on) @@ -268,7 +269,7 @@ instance FromJSON Metadata where go (Aeson.String s) | Just s' <- T.stripPrefix "0x" s , let bs' = T.encodeUtf8 s' - , Right bs <- decodeBase16 bs' + , Right bs <- (decodeBase16Untyped) bs' , not (BSC.any (\c -> c >= 'A' && c <= 'F') bs') = pure $ MetadataBytes bs go (Aeson.String s) = pure $ MetadataText s @@ -312,7 +313,7 @@ instance FromJSON Metadata where _ <- Atto.string "0x" remaining <- Atto.takeByteString when (BSC.any hexUpper remaining) $ fail ("Unexpected uppercase hex characters in " <> show remaining) - case decodeBase16 remaining of + case (decodeBase16Untyped $ remaining) of Right bs -> return bs _ -> fail ("Expecting base16 encoded string, found: " <> show remaining) where @@ -449,7 +450,7 @@ instance Variations Datum where instance ToJSON Datum where toJSON = \case - B bs -> toJSON (encodeBase16 bs) + B bs -> toJSON (extractBase16 . encodeBase16 $ bs) I i -> toJSON i List elems -> A.object @@ -535,22 +536,22 @@ instance Monoid Tokens where newtype Base16 = Base16 {unBase16 :: ByteString} instance Show Base16 where - show = show . encodeBase16 . unBase16 + show = show . extractBase16 . encodeBase16 . unBase16 instance IsString Base16 where - fromString = either (error . T.unpack) Base16 . decodeBase16 . encodeUtf8 . T.pack + fromString = either (error . T.unpack) Base16 . decodeBase16Untyped . encodeUtf8 . T.pack instance FromJSON Base16 where - parseJSON = either (parseFail . T.unpack) (pure . Base16) . decodeBase16 . encodeUtf8 <=< parseJSON + parseJSON = either (parseFail . T.unpack) (pure . Base16) . decodeBase16Untyped . encodeUtf8 <=< parseJSON instance FromJSONKey Base16 where - fromJSONKey = FromJSONKeyTextParser $ either (parseFail . T.unpack) (pure . Base16) . decodeBase16 . encodeUtf8 + fromJSONKey = FromJSONKeyTextParser $ either (parseFail . T.unpack) (pure . Base16) . decodeBase16Untyped . encodeUtf8 instance ToJSON Base16 where - toJSON = toJSON . encodeBase16 . unBase16 + toJSON = toJSON . extractBase16 . encodeBase16 . unBase16 instance ToJSONKey Base16 where - toJSONKey = toJSONKeyText $ encodeBase16 . unBase16 + toJSONKey = toJSONKeyText $ extractBase16 . encodeBase16 . unBase16 newtype DatumHash = DatumHash {unDatumHash :: ByteString} deriving stock (Eq, Ord, Generic) @@ -590,14 +591,14 @@ parseTxOutRef :: Text -> Maybe TxOutRef parseTxOutRef val = case T.splitOn "#" val of [txId, txIx] -> TxOutRef - <$> (TxId <$> either (const Nothing) Just (decodeBase16 . encodeUtf8 $ txId)) + <$> (TxId <$> either (const Nothing) Just (decodeBase16Untyped . encodeUtf8 $ txId)) <*> (TxIx <$> readMaybe (T.unpack txIx)) _ -> Nothing renderTxOutRef :: TxOutRef -> Text renderTxOutRef TxOutRef{..} = mconcat - [ encodeBase16 $ unTxId txId + [ extractBase16 . encodeBase16 $ unTxId txId , "#" , T.pack $ show $ unTxIx txIx ] diff --git a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Alonzo.hs b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Alonzo.hs index 902112f657..431b795b2c 100644 --- a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Alonzo.hs +++ b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Alonzo.hs @@ -2,6 +2,7 @@ {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE TypeOperators #-} module Language.Marlowe.Runtime.ChainSync.Database.PostgreSQL.Alonzo where diff --git a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Cardano.hs b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Cardano.hs index e46308571c..b951c9086b 100644 --- a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Cardano.hs +++ b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Cardano.hs @@ -25,7 +25,7 @@ blockToRows (BlockInMode _ block) = , case block of ByronBlock (C.ByronBlock (LB.ABOBBlock (LB.ABlock _ body _)) _ _) -> (\tx -> byronTxRow slotNo hash (byronTxId tx) $ taTx tx) <$> aUnTxPayload (LB.bodyTxPayload body) - ByronBlock C.ByronBlock{} -> [] + ByronBlock (C.ByronBlock{}) -> [] _ -> case block of Block _ txs -> txRow <$> txs ) diff --git a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Types.hs b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Types.hs index f28da40843..a8224f4501 100644 --- a/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Types.hs +++ b/marlowe-chain-sync/src/Language/Marlowe/Runtime/ChainSync/Database/PostgreSQL/Types.hs @@ -4,6 +4,7 @@ module Language.Marlowe.Runtime.ChainSync.Database.PostgreSQL.Types where import Cardano.Api +import Data.Base16.Types (extractBase16) import Data.ByteString (ByteString) import Data.ByteString.Base16 (encodeBase16) import Data.Csv @@ -14,7 +15,7 @@ import GHC.Generics (Generic) newtype Bytea = Bytea ByteString instance ToField Bytea where - toField (Bytea bs) = "\\x" <> encodeUtf8 (encodeBase16 bs) + toField (Bytea bs) = "\\x" <> encodeUtf8 (extractBase16 . encodeBase16 $ bs) newtype SqlBool = SqlBool Bool diff --git a/marlowe-cli/cli-test/Language/Marlowe/CLI/Test.hs b/marlowe-cli/cli-test/Language/Marlowe/CLI/Test.hs index 1195b216ec..2f9b1eba55 100644 --- a/marlowe-cli/cli-test/Language/Marlowe/CLI/Test.hs +++ b/marlowe-cli/cli-test/Language/Marlowe/CLI/Test.hs @@ -35,8 +35,8 @@ import Control.Concurrent.STM ( ) import Control.Lens ((^.)) import Control.Monad.Error.Class (throwError) -import Control.Monad.Except (MonadError, MonadIO, catchError) -import Control.Monad.IO.Class (liftIO) +import Control.Monad.Except (MonadError, catchError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Reader (ReaderT (runReaderT)) import Control.Monad.Reader.Class (MonadReader) import Data.Aeson.Encode.Pretty qualified as A diff --git a/marlowe-cli/cli-test/Language/Marlowe/CLI/Test/Runner.hs b/marlowe-cli/cli-test/Language/Marlowe/CLI/Test/Runner.hs index 3768cdb391..e6d86e7393 100644 --- a/marlowe-cli/cli-test/Language/Marlowe/CLI/Test/Runner.hs +++ b/marlowe-cli/cli-test/Language/Marlowe/CLI/Test/Runner.hs @@ -52,9 +52,9 @@ import Control.Exception (Exception, SomeException, onException, throwIO) import Control.Lens (makeLenses, view, views, (^.)) import Control.Monad (unless, void, when) import Control.Monad.Error.Class (throwError) -import Control.Monad.Except (MonadError, MonadIO, runExceptT) +import Control.Monad.Except (MonadError, runExceptT) import Control.Monad.Extra (whenM) -import Control.Monad.IO.Class (liftIO) +import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Reader (MonadReader, ReaderT (runReaderT), asks, withReaderT) import Control.Monad.Trans.Class (lift) import Data.Aeson (FromJSON, ToJSON, (.=)) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command.hs index 929844a6ec..32d1cfda2e 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command.hs @@ -32,7 +32,8 @@ import Cardano.Api ( babbageEraOnwardsToShelleyBasedEra, shelleyBasedEraConstraints, ) -import Control.Monad.Except (MonadError, MonadIO, liftIO, runExceptT) +import Control.Monad.Except (MonadError, runExceptT) +import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Foldable (Foldable (fold), asum) import Language.Marlowe.CLI.Command.Contract (ContractCommand, parseContractCommand, runContractCommand) import Language.Marlowe.CLI.Command.Format (FormatCommand, parseFormatCommand, runFormatCommand) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Contract.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Contract.hs index c8a6e89413..e9a877ef57 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Contract.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Contract.hs @@ -21,7 +21,8 @@ module Language.Marlowe.CLI.Command.Contract ( ) where import Cardano.Api (NetworkId (..), StakeAddressReference (..)) -import Control.Monad.Except (MonadError, MonadIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO) import Control.Monad.Reader.Class (MonadReader) import Data.Map qualified as Map import Data.Maybe (fromMaybe) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Format.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Format.hs index c21ffb0702..00cf1bfbb5 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Format.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Format.hs @@ -22,7 +22,8 @@ module Language.Marlowe.CLI.Command.Format ( parseFormatCommand, ) where -import Control.Monad.Except (MonadError, MonadIO (..)) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO (..)) import Data.Char (toUpper) import Language.Marlowe.CLI.Format ( maybeWriteJson, diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Input.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Input.hs index 80d208d95a..fb9dc771e3 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Input.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Input.hs @@ -17,7 +17,7 @@ module Language.Marlowe.CLI.Command.Input ( runInputCommand, ) where -import Control.Monad.Except (MonadIO) +import Control.Monad.IO.Class (MonadIO) import Language.Marlowe.CLI.Command.Parse (parseParty, parseToken) import Language.Marlowe.CLI.Run (makeChoice, makeDeposit, makeNotification) import Language.Marlowe.Core.V1.Semantics.Types (AccountId, ChoiceName, ChosenNum, Party, Token) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Parse.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Parse.hs index 03d0c52040..3dcb37080d 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Parse.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Parse.hs @@ -2,6 +2,8 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} +-- for the Alternative Either a instance +{-# OPTIONS_GHC -Wno-orphans #-} ----------------------------------------------------------------------------- -- @@ -80,7 +82,7 @@ import Cardano.Api ( valueFromList, ) import Cardano.Api.Shelley (StakeAddress (..), fromShelleyStakeCredential) -import Control.Applicative ((<|>)) +import Control.Applicative -- ((<|>)) import Data.List.Split (splitOn) import Language.Marlowe.CLI.Types ( OutputQuery (..), @@ -111,6 +113,12 @@ import Options.Applicative qualified as O import PlutusLedgerApi.Common (MajorProtocolVersion) import PlutusLedgerApi.Common.Versions (alonzoPV, vasilPV) +-- | Backport from Control.Monad.Trans.Error, because we use Alternative Either here. +instance (Monoid e) => Alternative (Either e) where + empty = Left mempty + Left _ <|> n = n + m <|> _ = m + -- | Parser for network ID. parseNetworkId :: O.Mod O.OptionFields NetworkId -> O.Parser NetworkId parseNetworkId network = diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Role.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Role.hs index 7bc2f94ee8..31d5e5dc02 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Role.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Role.hs @@ -21,7 +21,8 @@ module Language.Marlowe.CLI.Command.Role ( ) where import Cardano.Api (NetworkId (..), StakeAddressReference (..)) -import Control.Monad.Except (MonadError, MonadIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO) import Control.Monad.Reader.Class (MonadReader) import Data.Map qualified as Map import Data.Maybe (fromMaybe) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Run.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Run.hs index b2e119bb49..3c89f0e7b2 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Run.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Run.hs @@ -29,7 +29,8 @@ import Cardano.Api ( StakeAddressReference (..), TxIn, ) -import Control.Monad.Except (MonadError, MonadIO, liftIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Foldable (asum) import Data.Maybe (fromMaybe) import Language.Marlowe.CLI.Analyze (analyze) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Template.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Template.hs index 808d263558..15c0f0b7ef 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Template.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Template.hs @@ -25,7 +25,8 @@ module Language.Marlowe.CLI.Command.Template ( ) where import Actus.Marlowe (defaultRiskFactors, genContract') -import Control.Monad.Except (MonadError, MonadIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO) import Data.Map qualified as Map import GHC.Generics (Generic) import Language.Marlowe.CLI.Command.Parse ( diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Test.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Test.hs index d2fc95626a..1ca992c10d 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Test.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Test.hs @@ -21,7 +21,8 @@ module Language.Marlowe.CLI.Command.Test ( ) where import Cardano.Api (BabbageEraOnwards, IsShelleyBasedEra, NetworkId) -import Control.Monad.Except (MonadError, MonadIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO) import Data.Maybe (fromMaybe) import Language.Marlowe.CLI.Command.Parse (parseAddress, parseNetworkId) import Language.Marlowe.CLI.Test (runTestSuite) diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Transaction.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Transaction.hs index afadbc10b1..c80cf297b3 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Transaction.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Transaction.hs @@ -38,7 +38,8 @@ import Cardano.Api ( babbageEraOnwardsToShelleyBasedEra, shelleyBasedEraConstraints, ) -import Control.Monad.Except (MonadError, MonadIO, liftIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Maybe (fromMaybe) import Language.Marlowe.CLI.Command.Parse ( parseAddress, diff --git a/marlowe-cli/command/Language/Marlowe/CLI/Command/Util.hs b/marlowe-cli/command/Language/Marlowe/CLI/Command/Util.hs index acd0ef1d63..2f8ae8a5a0 100644 --- a/marlowe-cli/command/Language/Marlowe/CLI/Command/Util.hs +++ b/marlowe-cli/command/Language/Marlowe/CLI/Command/Util.hs @@ -38,7 +38,8 @@ import Cardano.Api ( ) import Control.Applicative ((<|>)) import Control.Category ((>>>)) -import Control.Monad.Except (MonadError, MonadIO, liftIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Reader (MonadReader) import Data.List.NonEmpty qualified as L import Data.List.Split (splitOn) diff --git a/marlowe-cli/src/Contrib/Cardano/Debug.hs b/marlowe-cli/src/Contrib/Cardano/Debug.hs index 73c531b7c3..d54e9e3706 100644 --- a/marlowe-cli/src/Contrib/Cardano/Debug.hs +++ b/marlowe-cli/src/Contrib/Cardano/Debug.hs @@ -8,6 +8,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} +{-# LANGUAGE TypeOperators #-} -- | A local copy of the cardano-cli `Contrib.Cardano.CLI.Run.Friendly` -- | because I'm not able to use `cardano-cli` lib in our current setup. diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Analyze.hs b/marlowe-cli/src/Language/Marlowe/CLI/Analyze.hs index 7c35fefb21..7c2a22f138 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Analyze.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Analyze.hs @@ -28,7 +28,8 @@ module Language.Marlowe.CLI.Analyze ( ) where import Control.Monad (guard, liftM2, (<=<)) -import Control.Monad.Except (MonadError (throwError), MonadIO (..)) +import Control.Monad.Except (MonadError (throwError)) +import Control.Monad.IO.Class (MonadIO (..)) import Data.Aeson (object, (.=)) import Data.Bifunctor (bimap) import Data.Foldable (toList) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Codec.hs b/marlowe-cli/src/Language/Marlowe/CLI/Codec.hs index 9754c4f0ab..22742ebbbb 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Codec.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Codec.hs @@ -16,7 +16,8 @@ module Language.Marlowe.CLI.Codec ( encodeBech32, ) where -import Control.Monad.Except (MonadError, MonadIO, liftIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Language.Marlowe.CLI.IO (liftCli, liftCliMaybe) import Language.Marlowe.CLI.Types (CliError) import System.IO (hPutStrLn, stderr) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Examples.hs b/marlowe-cli/src/Language/Marlowe/CLI/Examples.hs index c70989ab3e..477e801635 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Examples.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Examples.hs @@ -15,7 +15,7 @@ module Language.Marlowe.CLI.Examples ( makeExample, ) where -import Control.Monad.Except (MonadIO, liftIO) +import Control.Monad.IO.Class (MonadIO (..), liftIO) import Data.Aeson.Encode.Pretty (encodePretty) import Data.ByteString.Lazy qualified as LBS (writeFile) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Export.hs b/marlowe-cli/src/Language/Marlowe/CLI/Export.hs index 5705df9587..5d992a2e76 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Export.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Export.hs @@ -80,7 +80,8 @@ import Cardano.Api ( ) import Cardano.Api.Shelley (fromPlutusData) import Control.Monad (join, when) -import Control.Monad.Except (MonadError, MonadIO, liftEither, liftIO) +import Control.Monad.Except (MonadError, liftEither) +import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Aeson (encode) import Language.Marlowe.CLI.IO ( decodeFileStrict, diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Format.hs b/marlowe-cli/src/Language/Marlowe/CLI/Format.hs index 76f562a8ab..fbcc97c77b 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Format.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Format.hs @@ -23,7 +23,8 @@ module Language.Marlowe.CLI.Format ( ) where import Control.Monad.Combinators as C -import Control.Monad.Except (MonadError, MonadIO, liftEither, liftIO) +import Control.Monad.Except (MonadError, liftEither) +import Control.Monad.IO.Class (MonadIO, liftIO) import Data.Bifunctor (first) import Data.ByteString.Base16 qualified as Base16 import Data.ByteString.Char8 qualified as BS (getContents, pack) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/IO.hs b/marlowe-cli/src/Language/Marlowe/CLI/IO.hs index 07a59a5965..8abacb2979 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/IO.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/IO.hs @@ -94,7 +94,8 @@ import Contrib.Control.Concurrent (threadDelay) import Control.Concurrent.STM (atomically, readTVar, readTVarIO, writeTVar) import Control.Error (note) import Control.Monad (when, (<=<)) -import Control.Monad.Except (MonadError (..), MonadIO, liftEither, liftIO) +import Control.Monad.Except (MonadError (..), liftEither) +import Control.Monad.IO.Class (MonadIO (..), liftIO) import Control.Monad.Reader (MonadReader) import Data.Aeson (FromJSON (..), ToJSON) import Data.Aeson.Encode.Pretty (encodePretty) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Merkle.hs b/marlowe-cli/src/Language/Marlowe/CLI/Merkle.hs index e5e44c9333..6a6eda11fe 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Merkle.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Merkle.hs @@ -19,7 +19,8 @@ module Language.Marlowe.CLI.Merkle ( demerkleize, ) where -import Control.Monad.Except (MonadError, MonadIO) +import Control.Monad.Except (MonadError) +import Control.Monad.IO.Class (MonadIO) import Control.Monad.Reader (runReaderT) import Control.Monad.Writer (runWriter) import Language.Marlowe.CLI.IO (decodeFileStrict, maybeWriteJson) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Run.hs b/marlowe-cli/src/Language/Marlowe/CLI/Run.hs index 1711475ffe..3dc23fdef4 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Run.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Run.hs @@ -89,7 +89,8 @@ import Cardano.Api.Shelley qualified as CS import Cardano.Chain.Common (addrToBase58) import Cardano.Ledger.BaseTypes qualified as LC (Network (..)) import Control.Monad (forM_, guard, unless, void, when) -import Control.Monad.Except (MonadError, MonadIO, catchError, liftIO, throwError) +import Control.Monad.Except (MonadError, catchError, throwError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Reader (MonadReader) import Data.Bifunctor (Bifunctor (..), bimap) import Data.Function (on) diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Transaction.hs b/marlowe-cli/src/Language/Marlowe/CLI/Transaction.hs index 3beed71b4b..7a30179383 100644 --- a/marlowe-cli/src/Language/Marlowe/CLI/Transaction.hs +++ b/marlowe-cli/src/Language/Marlowe/CLI/Transaction.hs @@ -187,7 +187,8 @@ import Contrib.Data.Foldable (foldMapFlipped, tillFirstMatch) import Control.Arrow ((***)) import Control.Error (MaybeT (MaybeT, runMaybeT), hoistMaybe, mapMaybe, note) import Control.Monad (forM, unless, void, when) -import Control.Monad.Except (MonadError, MonadIO, liftEither, liftIO, runExcept, throwError) +import Control.Monad.Except (MonadError, liftEither, runExcept, throwError) +import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Reader (MonadReader) import Control.Monad.Trans (lift) import Data.Aeson (ToJSON (toJSON)) diff --git a/marlowe-client/marlowe-client.cabal b/marlowe-client/marlowe-client.cabal index 206a54b386..c7adad6c34 100644 --- a/marlowe-client/marlowe-client.cabal +++ b/marlowe-client/marlowe-client.cabal @@ -71,6 +71,6 @@ library , pipes ^>=4.3.16 , resourcet >=1.3 && <2 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , transformers-base ^>=0.4 , unliftio ^>=0.2.1 diff --git a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Common.hs b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Common.hs index b9340dc9f6..f63fb3fb4f 100644 --- a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Common.hs +++ b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Common.hs @@ -43,7 +43,7 @@ import Control.Monad.Trans.Class (lift) import Data.Aeson (FromJSON (..), Value (..), decodeFileStrict, eitherDecodeStrict) import Data.Aeson.Types (parseFail) import Data.ByteString (ByteString) -import Data.ByteString.Base16 (decodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped) import Data.Foldable (fold) import Data.Function (on) import Data.Functor (($>)) @@ -322,7 +322,7 @@ newtype CliHash = CliHash {unCliHash :: ByteString} instance FromJSON CliHash where parseJSON = \case - String s -> either (parseFail . T.unpack) (pure . CliHash) $ decodeBase16 $ encodeUtf8 s + String s -> either (parseFail . T.unpack) (pure . CliHash) $ decodeBase16Untyped $ encodeUtf8 s _ -> parseFail "Expected a string" data CliBlockHeader = CliBlockHeader diff --git a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Contract.hs b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Contract.hs index 6e6dae342d..4727227fb8 100644 --- a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Contract.hs +++ b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Contract.hs @@ -8,7 +8,6 @@ module Language.Marlowe.Runtime.Integration.Contract where import Cardano.Api (ScriptData (ScriptDataBytes), hashScriptDataBytes, unsafeHashableScriptData) import Colog (HasLog (..), LogAction, Message) -import Control.Applicative (Applicative (..)) import Control.Arrow (Arrow (..), returnA) import Control.Concurrent.Component import Control.Monad (foldM, unless) @@ -16,12 +15,14 @@ import Control.Monad.Event.Class (Inject (..), NoopEventT (runNoopEventT)) import Control.Monad.Reader (ReaderT, ask, runReaderT) import Control.Monad.Trans.Resource (ResourceT, runResourceT) import Control.Monad.Writer (execWriter, runWriter) -import Data.ByteString.Base16 (decodeBase16', encodeBase16) +import Data.Base16.Types (extractBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import Data.Either (fromRight) import Data.Foldable (for_) import Data.Function (on) import qualified Data.Map as Map import qualified Data.Set as Set +import Data.Text.Encoding (encodeUtf8) import Language.Marlowe.Core.V1.Merkle (deepMerkleize) import Language.Marlowe.Core.V1.Plate (extractAll) import Language.Marlowe.Core.V1.Semantics (TransactionInput (..), TransactionOutput (..), computeTransaction) @@ -256,7 +257,8 @@ transferSpec = do hash <- expectJust "failed to push contract" $ runLoad $ pushContract contract ObjectBundle bundle <- expectJust "failed to export contract" $ runTransfer $ exportContract 100 hash Api.ContractWithAdjacency{closure} <- expectJust "failed to get contract" $ runQuery $ Api.getContract hash - liftIO $ Set.fromList (unLabel . _label <$> bundle) `shouldBe` Set.map (encodeBase16 . unDatumHash) closure + liftIO $ + Set.fromList (unLabel . _label <$> bundle) `shouldBe` Set.map (extractBase16 . encodeBase16 . unDatumHash) closure prop "Labels are hashes" \contract -> runContractTest do hash <- expectJust "failed to push contract" $ runLoad $ pushContract contract @@ -265,7 +267,7 @@ transferSpec = do LinkedContract c -> pure (LinkedContract c, c) a -> fail $ "Unexpected non-contract object in exported bundle " <> show a (linked, _) <- expectRight "" $ linkBundle' bundle expectOnlyContracts mempty - liftIO $ for_ linked \(Label label, c) -> label `shouldBe` encodeBase16 (unDatumHash $ hashContract c) + liftIO $ for_ linked \(Label label, c) -> label `shouldBe` extractBase16 (encodeBase16 (unDatumHash $ hashContract c)) prop "import . export" \contract -> do ObjectBundle bundle <- runContractTest do @@ -274,7 +276,9 @@ transferSpec = do hashes <- runContractTest $ expectRight "failed to import bundle" $ runTransfer $ importBundle $ ObjectBundle bundle hashes `shouldBe` Map.fromList - ((_label &&& DatumHash . fromRight (error "fromRight: left") . decodeBase16' . unLabel . _label) <$> bundle) + ( (_label &&& DatumHash . fromRight (error "fromRight: left") . decodeBase16Untyped . encodeUtf8 . unLabel . _label) + <$> bundle + ) prop "incremental" \contract -> runContractTest do hash <- expectJust "failed to push contract" $ runLoad $ pushContract contract diff --git a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Create.hs b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Create.hs index 320f76e162..17b6622e9a 100644 --- a/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Create.hs +++ b/marlowe-integration-tests/test/Language/Marlowe/Runtime/Integration/Create.hs @@ -19,7 +19,6 @@ import Cardano.Api ( valueToList, ) import qualified Cardano.Api as C -import Control.Applicative (liftA2) import Control.Monad (guard) import Control.Monad.IO.Class (liftIO) import Control.Monad.Reader (ask) diff --git a/marlowe-object/marlowe-object.cabal b/marlowe-object/marlowe-object.cabal index feeb571966..89e29cf2e2 100644 --- a/marlowe-object/marlowe-object.cabal +++ b/marlowe-object/marlowe-object.cabal @@ -60,7 +60,7 @@ library , aeson ^>=2.2 , aeson-record ==0.1.0.0 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 , cardano-api ^>=8.37 @@ -76,10 +76,10 @@ library , plutus-ledger-api ^>=1.15 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , unordered-containers ^>=0.2.19 - , zip ^>=1.7.2 + , zip ^>=2.0 library gen import: lang diff --git a/marlowe-object/src/Language/Marlowe/Object/Bundler.hs b/marlowe-object/src/Language/Marlowe/Object/Bundler.hs index ced5047edd..6db76a18fd 100644 --- a/marlowe-object/src/Language/Marlowe/Object/Bundler.hs +++ b/marlowe-object/src/Language/Marlowe/Object/Bundler.hs @@ -10,7 +10,6 @@ -- object definition and replaces usages with a reference. module Language.Marlowe.Object.Bundler where -import Control.Applicative (Applicative (liftA2)) import Control.Monad.Cont (ContT) import Control.Monad.Except (MonadError (..)) import Control.Monad.IO.Class (MonadIO (..)) diff --git a/marlowe-object/src/Language/Marlowe/Object/Link.hs b/marlowe-object/src/Language/Marlowe/Object/Link.hs index 10c36a8c00..4b30960d05 100644 --- a/marlowe-object/src/Language/Marlowe/Object/Link.hs +++ b/marlowe-object/src/Language/Marlowe/Object/Link.hs @@ -26,13 +26,13 @@ import Cardano.Api.Shelley ( import Cardano.Ledger.BaseTypes (Network (..)) import qualified Cardano.Ledger.BaseTypes as Ledger import Cardano.Ledger.Credential (Ptr (..)) -import Control.Applicative (liftA2) import Control.Lens (Fold, folding, makePrisms, traverseOf_, (^.)) import Control.Monad (when) import Control.Monad.Trans.RWS (RWS, evalRWS) import qualified Control.Monad.Trans.RWS as RWS import Control.Monad.Trans.State import Data.Aeson (FromJSON, ToJSON) +import Data.Base16.Types (extractBase16) import Data.Bifunctor (Bifunctor (..)) import Data.Binary (Binary) import Data.ByteString.Base16 (encodeBase16) @@ -506,7 +506,7 @@ fromLinkedObject lbl = \case hashLabel :: (ToData a) => Text -> a -> O.Label hashLabel prefix a = - O.Label $ prefix <> "-" <> encodeBase16 (fromBuiltin $ dataHash a) + O.Label $ prefix <> "-" <> extractBase16 (encodeBase16 (fromBuiltin $ dataHash a)) linkedChildren :: Fold LinkedObject LinkedObject linkedChildren = folding \case diff --git a/marlowe-object/src/Language/Marlowe/Object/Types.hs b/marlowe-object/src/Language/Marlowe/Object/Types.hs index 933f02f409..5360b87f8f 100644 --- a/marlowe-object/src/Language/Marlowe/Object/Types.hs +++ b/marlowe-object/src/Language/Marlowe/Object/Types.hs @@ -26,16 +26,17 @@ import Cardano.Api ( serialiseToBech32, ) import Cardano.Api.Byron (ShelleyAddr) -import Control.Applicative (empty, liftA2) +import Control.Applicative (empty) import Control.Lens (Lens', Plated (..), Prism', makeLensesFor, makePrisms, prism', traversal) import Control.Monad (join) import Data.Aeson hiding (Object, String, Value) import qualified Data.Aeson as A hiding (Object) import Data.Aeson.Applicative (parseObject) import Data.Aeson.Types (parseFail, toJSONKeyText) +import Data.Base16.Types (extractBase16) import Data.Binary (Binary (..), getWord8, putWord8) import Data.ByteString (ByteString) -import Data.ByteString.Base16 (decodeBase16', encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import qualified Data.ByteString.Char8 as BS8 import Data.Either (fromRight) import Data.Foldable (asum) @@ -47,6 +48,7 @@ import Data.Maybe (isJust) import Data.String (IsString (..)) import Data.Text (Text) import qualified Data.Text as T +import Data.Text.Encoding (encodeUtf8) import qualified Data.Text.Encoding as T import Data.Time (UTCTime, nominalDiffTimeToSeconds, secondsToNominalDiffTime) import Data.Time.Clock.POSIX (posixSecondsToUTCTime, utcTimeToPOSIXSeconds) @@ -721,23 +723,23 @@ instance Show Base16 where instance Read Base16 where readPrec = do String s <- lexP - Right parsed <- pure $ decodeBase16' $ T.pack s + Right parsed <- pure $ decodeBase16Untyped $ BS8.pack s pure $ Base16 parsed instance IsString Base16 where - fromString = either (error . showString "fromString(Base16): " . T.unpack) Base16 . decodeBase16' . T.pack + fromString = either (error . showString "fromString(Base16): " . T.unpack) Base16 . decodeBase16Untyped . BS8.pack instance ToJSON Base16 where - toJSON = A.String . encodeBase16 . unBase16 + toJSON = A.String . extractBase16 . encodeBase16 . unBase16 instance ToJSONKey Base16 where - toJSONKey = toJSONKeyText $ encodeBase16 . unBase16 + toJSONKey = toJSONKeyText $ extractBase16 . encodeBase16 . unBase16 instance FromJSON Base16 where - parseJSON = withText "Base16" $ either (fail . T.unpack) (pure . Base16) . decodeBase16' + parseJSON = withText "Base16" $ either (fail . T.unpack) (pure . Base16) . decodeBase16Untyped . encodeUtf8 instance FromJSONKey Base16 where - fromJSONKey = FromJSONKeyTextParser $ either (fail . T.unpack) (pure . Base16) . decodeBase16' + fromJSONKey = FromJSONKeyTextParser $ either (fail . T.unpack) (pure . Base16) . decodeBase16Untyped . encodeUtf8 data Bound = Bound Integer Integer deriving stock (Show, Read, Generic, Eq, Ord) diff --git a/marlowe-protocols/marlowe-protocols.cabal b/marlowe-protocols/marlowe-protocols.cabal index 18edd54b57..bfd83a8f6f 100644 --- a/marlowe-protocols/marlowe-protocols.cabal +++ b/marlowe-protocols/marlowe-protocols.cabal @@ -77,7 +77,7 @@ library build-depends: , async-components ==0.1.1.0 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 , co-log ^>=0.6 @@ -97,6 +97,6 @@ library , stm ^>=2.5 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 diff --git a/marlowe-protocols/src/Network/Protocol/Codec/Spec.hs b/marlowe-protocols/src/Network/Protocol/Codec/Spec.hs index 9e5b04ec2a..9efe3ce72a 100644 --- a/marlowe-protocols/src/Network/Protocol/Codec/Spec.hs +++ b/marlowe-protocols/src/Network/Protocol/Codec/Spec.hs @@ -7,6 +7,7 @@ module Network.Protocol.Codec.Spec where +import Data.Base16.Types (extractBase16) import qualified Data.ByteString as BS import Data.ByteString.Lazy (ByteString, fromStrict, toChunks) import qualified Data.ByteString.Lazy as LBS @@ -256,7 +257,7 @@ codecGoldenTests protocolName = describe "Message Golden Tests" do AnyMessageAndAgency tok message <- NE.toList variations pure ( "Show: " <> showsPrecMessage 0 tok message "" - , "Binary: " <> TL.unpack (encodeBase16 $ encode tok message) + , "Binary: " <> TL.unpack (extractBase16 . encodeBase16 $ encode tok message) ) checkPropCodec diff --git a/marlowe-protocols/src/Network/Protocol/Driver/Trace.hs b/marlowe-protocols/src/Network/Protocol/Driver/Trace.hs index 86bd2e50d9..02304ec1d5 100644 --- a/marlowe-protocols/src/Network/Protocol/Driver/Trace.hs +++ b/marlowe-protocols/src/Network/Protocol/Driver/Trace.hs @@ -16,6 +16,7 @@ import Control.Monad.Event.Class import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Resource (runResourceT) +import Data.Base16.Types (extractBase16) import Data.Binary (get, put) import Data.Binary.Get (runGet) import Data.Binary.Put (runPut) @@ -455,10 +456,10 @@ renderDriverSelectorOTel = \case ClientAgency tok' -> showsPrecClientHasAgency 0 tok' "" ServerAgency tok' -> showsPrecServerHasAgency 0 tok' "" ) - , ("typed-protocols.driver_state_before_span", toAttribute $ foldMap encodeBase16 state) + , ("typed-protocols.driver_state_before_span", toAttribute $ foldMap (extractBase16 . encodeBase16) state) ] - RecvMessageStateBeforeMessage state -> [("typed-protocols.driver_state_before_message", toAttribute $ foldMap encodeBase16 state)] - RecvMessageStateAfterMessage state -> [("typed-protocols.driver_state_after_message", toAttribute $ foldMap encodeBase16 state)] + RecvMessageStateBeforeMessage state -> [("typed-protocols.driver_state_before_message", toAttribute $ foldMap (extractBase16 . encodeBase16) state)] + RecvMessageStateAfterMessage state -> [("typed-protocols.driver_state_after_message", toAttribute $ foldMap (extractBase16 . encodeBase16) state)] RecvMessageMessage msg -> messageToAttributes $ AnyMessageAndAgency tok msg } diff --git a/marlowe-protocols/src/Network/Protocol/Query/Client.hs b/marlowe-protocols/src/Network/Protocol/Query/Client.hs index 69e15e22e2..bffe5c08a7 100644 --- a/marlowe-protocols/src/Network/Protocol/Query/Client.hs +++ b/marlowe-protocols/src/Network/Protocol/Query/Client.hs @@ -9,7 +9,6 @@ -- driver and a codec. module Network.Protocol.Query.Client where -import Control.Applicative (liftA2) import Control.Monad (join) import Control.Monad.Event.Class (MonadEvent) import Control.Monad.IO.Class (MonadIO (..)) diff --git a/marlowe-runtime-web/marlowe-runtime-web.cabal b/marlowe-runtime-web/marlowe-runtime-web.cabal index efdc03a5cc..c4415e5839 100644 --- a/marlowe-runtime-web/marlowe-runtime-web.cabal +++ b/marlowe-runtime-web/marlowe-runtime-web.cabal @@ -66,7 +66,7 @@ library build-depends: , aeson ^>=2.2 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , bytestring >=0.10.12 && <0.12 , containers ^>=0.6.5 , http-media ^>=0.8 diff --git a/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/DTO.hs b/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/DTO.hs index 60fed4d0f1..cdbf697769 100644 --- a/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/DTO.hs +++ b/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/DTO.hs @@ -4,6 +4,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -- | This module defines the data-transfer object (DTO) translation layer for diff --git a/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/Util.hs b/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/Util.hs index d9bc1a4208..180c514ae3 100644 --- a/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/Util.hs +++ b/marlowe-runtime-web/server/Language/Marlowe/Runtime/Web/Server/Util.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE TypeOperators #-} module Language.Marlowe.Runtime.Web.Server.Util where diff --git a/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Types.hs b/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Types.hs index 132bf58c95..5f3d00cef9 100644 --- a/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Types.hs +++ b/marlowe-runtime-web/src/Language/Marlowe/Runtime/Web/Types.hs @@ -23,7 +23,7 @@ import Data.Aeson.Types (Parser, parseFail, toJSONKeyText) import Data.Bifunctor (first) import Data.ByteString (ByteString) import qualified Data.ByteString as BS -import Data.ByteString.Base16 (decodeBase16, encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import Data.Char (isSpace) import Data.Foldable (fold) import Data.Map (Map) @@ -49,6 +49,8 @@ import Data.OpenApi ( required, toParamSchema, ) + +import Data.Base16.Types (extractBase16) import qualified Data.OpenApi as OpenApi import Data.OpenApi.Schema (ToSchema (..)) import Data.Set (Set) @@ -78,10 +80,10 @@ newtype Base16 = Base16 {unBase16 :: ByteString} deriving (Eq, Ord) instance Show Base16 where - show = T.unpack . encodeBase16 . unBase16 + show = T.unpack . extractBase16 . encodeBase16 . unBase16 instance IsString Base16 where - fromString = either (error . T.unpack) Base16 . decodeBase16 . encodeUtf8 . T.pack + fromString = either (error . T.unpack) Base16 . decodeBase16Untyped . encodeUtf8 . T.pack instance ToJSON Base16 where toJSON = String . toUrlPiece @@ -97,10 +99,10 @@ instance FromJSONKey Base16 where fromJSONKey = FromJSONKeyTextParser $ either (parseFail . T.unpack) pure . parseUrlPiece instance ToHttpApiData Base16 where - toUrlPiece = encodeBase16 . unBase16 + toUrlPiece = extractBase16 . encodeBase16 . unBase16 instance FromHttpApiData Base16 where - parseUrlPiece = fmap Base16 . decodeBase16 . encodeUtf8 + parseUrlPiece = fmap Base16 . decodeBase16Untyped . encodeUtf8 instance ToSchema Base16 where declareNamedSchema _ = NamedSchema Nothing <$> declareSchema (Proxy @String) diff --git a/marlowe-runtime/contract/Language/Marlowe/Runtime/Contract/Store/File.hs b/marlowe-runtime/contract/Language/Marlowe/Runtime/Contract/Store/File.hs index 46d9e76537..caee9e8d31 100644 --- a/marlowe-runtime/contract/Language/Marlowe/Runtime/Contract/Store/File.hs +++ b/marlowe-runtime/contract/Language/Marlowe/Runtime/Contract/Store/File.hs @@ -5,15 +5,15 @@ module Language.Marlowe.Runtime.Contract.Store.File ( ) where import Codec.Compression.GZip (compress, decompress) -import Control.Applicative (liftA2) import Control.DeepSeq (force) import Control.Monad (guard, unless, when) import Control.Monad.Catch (MonadMask) import Control.Monad.Trans.Maybe (MaybeT (..)) +import Data.Base16.Types (extractBase16) import Data.Binary (Word64, get, put) import Data.Binary.Get (runGet) import Data.Binary.Put (runPut) -import Data.ByteString.Base16 (decodeBase16, encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import qualified Data.ByteString.Lazy as LBS import Data.Foldable (fold, foldl') import Data.Function (on) @@ -127,7 +127,7 @@ createContractStore ContractStoreOptions{..} = do roots <- readTVar gcRootsVar maybe retrySTM pure roots let getClosure (DatumHash hash) = runMaybeT do - let path = contractStoreDirectory (T.unpack $ encodeBase16 hash) <.> "closure" + let path = contractStoreDirectory (T.unpack $ extractBase16 (encodeBase16 hash)) <.> "closure" guard =<< doesFileExist path liftIO $ Set.fromList . runGet get <$> LBS.readFile path liveContracts <- foldMap fold <$> pooledMapConcurrently getClosure (Set.toList @DatumHash gcRoots) @@ -135,7 +135,7 @@ createContractStore ContractStoreOptions{..} = do freedSpace <- sum . catMaybes <$> pooledForConcurrently storeFiles \file -> runMaybeT do let path = contractStoreDirectory file - fileHash <- MaybeT $ pure $ either (const Nothing) Just $ decodeBase16 $ encodeUtf8 $ T.pack $ takeBaseName path + fileHash <- MaybeT $ pure $ either (const Nothing) Just $ decodeBase16Untyped $ encodeUtf8 $ T.pack $ takeBaseName path lastModified <- getModificationTime path now <- liftIO getCurrentTime guard $ now `diffUTCTime` lastModified >= minContractAge @@ -157,7 +157,7 @@ createContractStore ContractStoreOptions{..} = do , closure = Set.singleton closeHash } | otherwise = (if lock then withLockFile lockingParameters lockfile else id) $ runMaybeT do - let mkFilePath = (contractStoreDirectory ) . (T.unpack (encodeBase16 $ unDatumHash contractHash) <.>) + let mkFilePath = (contractStoreDirectory ) . (T.unpack (extractBase16 . encodeBase16 $ unDatumHash contractHash) <.>) let contractFilePath = mkFilePath "contract" let adjacencyFilePath = mkFilePath "adjacency" let closureFilePath = mkFilePath "closure" @@ -207,7 +207,7 @@ createContractStore ContractStoreOptions{..} = do -- Returns a list of file-writing actions to save the contents of a -- contract record. flushContractRecord ContractRecord{..} = - let basePath = directory T.unpack (encodeBase16 $ unDatumHash hash) + let basePath = directory T.unpack (extractBase16 . encodeBase16 $ unDatumHash hash) writeIndex name hashes = do let filePath = basePath <.> name -- Do not compress the index files for speed. @@ -289,7 +289,7 @@ createContractStore ContractStoreOptions{..} = do if HashMap.member hash buffer then pure True else do - let contractFileName = T.unpack (encodeBase16 $ unDatumHash hash) <.> ".contract" + let contractFileName = T.unpack (extractBase16 . encodeBase16 $ unDatumHash hash) <.> ".contract" let stagingAreaPath = directory contractFileName let storePath = contractStoreDirectory contractFileName on (liftA2 (||)) doesFileExist stagingAreaPath storePath diff --git a/marlowe-runtime/gen/Language/Marlowe/Runtime/Transaction/Gen.hs b/marlowe-runtime/gen/Language/Marlowe/Runtime/Transaction/Gen.hs index 8e656f8d27..522d4ee857 100644 --- a/marlowe-runtime/gen/Language/Marlowe/Runtime/Transaction/Gen.hs +++ b/marlowe-runtime/gen/Language/Marlowe/Runtime/Transaction/Gen.hs @@ -11,7 +11,6 @@ import Cardano.Api ( ShelleyBasedEra (ShelleyBasedEraBabbage, ShelleyBasedEraConway), shelleyBasedEra, ) -import Control.Applicative (liftA2) import qualified Data.ByteString.Char8 as BS import Data.Foldable (fold) import qualified Data.List.NonEmpty as NE diff --git a/marlowe-runtime/marlowe-runtime.cabal b/marlowe-runtime/marlowe-runtime.cabal index 451b1b30f0..efdb105384 100644 --- a/marlowe-runtime/marlowe-runtime.cabal +++ b/marlowe-runtime/marlowe-runtime.cabal @@ -196,7 +196,7 @@ library build-depends: , aeson ^>=2.2 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 , cardano-api ^>=8.37 @@ -290,7 +290,7 @@ library indexer , stm ^>=2.5 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , vector ^>=0.13 , witherable ^>=0.4 @@ -331,7 +331,7 @@ library sync-api , ouroboros-network-api ^>=0.6.0 , plutus-ledger-api ^>=1.15 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 @@ -381,7 +381,7 @@ library contract , aeson ^>=2.2 , async-components ==0.1.1.0 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 , co-log ^>=0.6 @@ -405,7 +405,7 @@ library contract , resourcet >=1.3 && <2 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 , unordered-containers ^>=0.2.19 @@ -466,7 +466,7 @@ library sync , profunctors >=5.6 && <6 , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , vector ^>=0.13 , witherable ^>=0.4 @@ -493,7 +493,7 @@ library tx-api , nonempty-containers ^>=0.3.4 , plutus-core ^>=1.15 , plutus-ledger-api ^>=1.15 - , semigroupoids ^>=5.3 + , semigroupoids ^>=6.0 , text ^>=2.0 , time >=1.9 && <2 @@ -517,7 +517,7 @@ library tx , async , async-components ==0.1.1.0 , base >=4.9 && <5 - , base16 ^>=0.3.2 + , base16 ^>=1.0 , bytestring >=0.10.12 && <0.12 , cardano-api ^>=8.37 , cardano-ledger-core ^>=1.9 @@ -544,7 +544,7 @@ library tx , stm ^>=2.5 , strict-sop-core , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , unliftio ^>=0.2.1 , witherable ^>=0.4 @@ -577,7 +577,7 @@ library proxy , marlowe-protocols ==0.3.0.0 , marlowe-runtime:{contract-api, proxy-api, sync-api, tx-api} ==0.0.6 , resourcet >=1.3 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , typed-protocols ^>=0.1 , unliftio ^>=0.2.1 @@ -612,7 +612,7 @@ library config , marlowe-chain-sync ==0.0.6 , marlowe-runtime ==0.0.6 , network >=3.1 && <4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , split ^>=0.2.3 , text ^>=2.0 @@ -641,7 +641,7 @@ executable marlowe-indexer , mtl >=2.2 && <3 , network >=3.1 && <4 , nonempty-containers ^>=0.3.4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , postgresql-libpq ^>=0.9 , text ^>=2.0 , unliftio ^>=0.2.1 @@ -672,7 +672,7 @@ executable marlowe-sync , marlowe-runtime:{sync, sync-api} ==0.0.6 , mtl >=2.2 && <3 , network >=3.1 && <4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , postgresql-libpq ^>=0.9 , text ^>=2.0 , unliftio ^>=0.2.1 @@ -699,7 +699,7 @@ executable marlowe-tx , marlowe-protocols ==0.3.0.0 , marlowe-runtime:{marlowe-runtime, contract-api, tx, tx-api} ==0.0.6 , network >=3.1 && <4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , text ^>=2.0 , time @@ -725,7 +725,7 @@ executable marlowe-contract , marlowe-protocols ==0.3.0.0 , marlowe-runtime:{config, contract, contract-api, sync-api} ==0.0.6 , network >=3.1 && <4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , text ^>=2.0 , time , typed-protocols ^>=0.1 @@ -751,7 +751,7 @@ executable marlowe-proxy , marlowe-protocols ==0.3.0.0 , marlowe-runtime:{config, contract-api, proxy, proxy-api, sync-api, tx-api} ==0.0.6 , network >=3.1 && <4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , text ^>=2.0 ghc-options: -threaded @@ -785,7 +785,7 @@ executable marlowe-runtime , mtl >=2.2 && <3 , network >=3.1 && <4 , nonempty-containers ^>=0.3.4 - , optparse-applicative ^>=0.16.1 + , optparse-applicative ^>=0.18.1 , postgresql-libpq ^>=0.9 , text ^>=2.0 , time @@ -848,7 +848,7 @@ test-suite marlowe-runtime-test , strict-sop-core , text ^>=2.0 , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , typed-protocols ^>=0.1 , vector ^>=0.13 @@ -880,7 +880,7 @@ test-suite indexer-test , sop-extras , strict-sop-core , time >=1.9 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 build-tool-depends: hspec-discover:hspec-discover ghc-options: -threaded diff --git a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/Api.hs b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/Api.hs index 40221611da..de74c604f2 100644 --- a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/Api.hs +++ b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/Api.hs @@ -24,12 +24,13 @@ import Data.Aeson ( encode, ) import Data.Aeson.Types (Parser, parse, parseFail, toJSONKeyText) +import Data.Base16.Types (extractBase16) import Data.Bifunctor (first) import Data.Binary (Binary (..), Get, Put, getWord8, putWord8) import Data.Binary.Get (getWord32be) import Data.Binary.Put (putWord32be) import Data.ByteString (ByteString) -import Data.ByteString.Base16 (decodeBase16, encodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped, encodeBase16) import Data.Either (fromRight) import Data.Kind (Type) import qualified Data.List.NonEmpty as NE @@ -503,16 +504,16 @@ payoutDatumToJSON = \case MarloweV1 -> \case Chain.AssetId policyId tokenName -> toJSON - ( String . encodeBase16 . unPolicyId $ policyId - , String . encodeBase16 . unTokenName $ tokenName + ( String . extractBase16 . encodeBase16 . unPolicyId $ policyId + , String . extractBase16 . encodeBase16 . unTokenName $ tokenName ) payoutDatumFromJSON :: MarloweVersion v -> Value -> Parser (PayoutDatum v) payoutDatumFromJSON = \case MarloweV1 -> \json -> do (p, t) <- parseJSON json - p' <- either (parseFail . T.unpack) (pure . Chain.PolicyId) . decodeBase16 . encodeUtf8 $ t - t' <- either (parseFail . T.unpack) (pure . Chain.TokenName) . decodeBase16 . encodeUtf8 $ p + p' <- either (parseFail . T.unpack) (pure . Chain.PolicyId) . decodeBase16Untyped . encodeUtf8 $ t + t' <- either (parseFail . T.unpack) (pure . Chain.TokenName) . decodeBase16Untyped . encodeUtf8 $ p pure $ Chain.AssetId p' t' datumToJSON :: MarloweVersion v -> Datum v -> Value diff --git a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs index 08f62fe386..cb7c610c8b 100644 --- a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs +++ b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs @@ -7,7 +7,7 @@ import Cardano.Api (AsType (..), NetworkId (..), NetworkMagic (..), PlutusScript import Data.Aeson (FromJSON, FromJSONKey, ToJSON (..), ToJSONKey) import Data.Binary (Binary) import Data.ByteString (ByteString) -import Data.ByteString.Base16 (decodeBase16) +import Data.ByteString.Base16 (decodeBase16Untyped) import Data.Foldable (asum) import Data.Map (Map) import qualified Data.Map as Map @@ -811,7 +811,7 @@ readHex = either (error . show) id . deserialiseFromCBOR (AsPlutusScript AsPlutusScriptV2) . either (error . T.unpack) id - . decodeBase16 + . decodeBase16Untyped -- | The set of known script hash sets for Marlowe V1. v1Scripts :: Set MarloweScripts diff --git a/marlowe-runtime/test/Language/Marlowe/Runtime/Transaction/ApiSpec.hs b/marlowe-runtime/test/Language/Marlowe/Runtime/Transaction/ApiSpec.hs index 83be62bce1..0ca2998ee9 100644 --- a/marlowe-runtime/test/Language/Marlowe/Runtime/Transaction/ApiSpec.hs +++ b/marlowe-runtime/test/Language/Marlowe/Runtime/Transaction/ApiSpec.hs @@ -4,7 +4,6 @@ module Language.Marlowe.Runtime.Transaction.ApiSpec ( spec, ) where -import Control.Applicative (liftA2) import Control.Arrow ((&&&), (***)) import qualified Data.Aeson as Aeson import qualified Data.Aeson.KeyMap as Aeson.KeyMap diff --git a/marlowe-runtime/tx/Language/Marlowe/Runtime/Transaction.hs b/marlowe-runtime/tx/Language/Marlowe/Runtime/Transaction.hs index fbbc630691..23683b4fde 100644 --- a/marlowe-runtime/tx/Language/Marlowe/Runtime/Transaction.hs +++ b/marlowe-runtime/tx/Language/Marlowe/Runtime/Transaction.hs @@ -14,6 +14,7 @@ import Control.Concurrent.Component.Probes import Control.Concurrent.STM (STM, atomically) import Control.Monad.Event.Class (MonadInjectEvent) import Data.Aeson (KeyValue (..), encode, object) +import Data.Base16.Types (extractBase16) import qualified Data.ByteString as BS import Data.ByteString.Base16 (encodeBase16) import qualified Data.ByteString.Char8 as BS8 @@ -308,7 +309,7 @@ mkCommandLineRoleTokenMintingPolicy cmd TxOutRef{..} roleTokens = bracket object [ "seedInputId" .= txId , "seedInputIx" .= txIx - , "roleTokens" .= Map.mapKeys (encodeBase16 . unTokenName) roleTokens + , "roleTokens" .= Map.mapKeys (extractBase16 . encodeBase16 . unTokenName) roleTokens ] hFlush stdIn exitCode <- waitForProcess handle diff --git a/marlowe-test/marlowe-test.cabal b/marlowe-test/marlowe-test.cabal index 672deb92b0..75bf5b18cb 100644 --- a/marlowe-test/marlowe-test.cabal +++ b/marlowe-test/marlowe-test.cabal @@ -152,6 +152,7 @@ library , plutus-tx ^>=1.15 , QuickCheck >=2.14 && <3 , tasty-quickcheck ^>=0.10 + , transformers if flag(trace-plutus) cpp-options: -DTRACE_PLUTUS @@ -215,7 +216,7 @@ test-suite marlowe-test , plutus-tx ^>=1.15 , QuickCheck >=2.14 && <3 , quickcheck-instances ^>=0.3.29 - , sbv >=8.4 + , sbv >=10.3 , tasty ^>=1.4.2 , tasty-hunit ^>=0.10 , tasty-quickcheck ^>=0.10 diff --git a/marlowe-test/src/Spec/Marlowe/Reference.hs b/marlowe-test/src/Spec/Marlowe/Reference.hs index d98ece1cf9..c39b2e1e52 100644 --- a/marlowe-test/src/Spec/Marlowe/Reference.hs +++ b/marlowe-test/src/Spec/Marlowe/Reference.hs @@ -31,7 +31,8 @@ module Spec.Marlowe.Reference ( ) where import Control.Monad (forM) -import Control.Monad.Except (ExceptT (..), lift, throwError) +import Control.Monad.Except (ExceptT (..), throwError) +import Control.Monad.Trans.Class (lift) import Data.Aeson (FromJSON, ToJSON, eitherDecodeFileStrict, encodeFile) import Data.Bifunctor (first) import Data.List (isSuffixOf) diff --git a/marlowe-test/test/Spec/Marlowe/Semantics/Compute.hs b/marlowe-test/test/Spec/Marlowe/Semantics/Compute.hs index 257f363cfb..b55e8511c9 100644 --- a/marlowe-test/test/Spec/Marlowe/Semantics/Compute.hs +++ b/marlowe-test/test/Spec/Marlowe/Semantics/Compute.hs @@ -23,9 +23,9 @@ module Spec.Marlowe.Semantics.Compute ( tests, ) where -import Control.Applicative (liftA2) import Control.Lens.Getter (Getter, to, view) -import Control.Monad.Except (MonadError (throwError), unless, when) +import Control.Monad (unless, when) +import Control.Monad.Except (MonadError (throwError)) import Control.Monad.Reader (ReaderT (runReaderT)) import Data.Bifunctor (Bifunctor (..), second) import Data.Default (Default (..)) diff --git a/marlowe/marlowe-cardano.cabal b/marlowe/marlowe-cardano.cabal index a2e974c340..87eb2c3056 100644 --- a/marlowe/marlowe-cardano.cabal +++ b/marlowe/marlowe-cardano.cabal @@ -76,12 +76,12 @@ library , plutus-ledger-api ^>=1.15 , plutus-tx ^>=1.15 , range ==0.3.0.2 - , sbv ^>=9.2 + , sbv ^>=10.3 , scientific ^>=0.3.7 , template-haskell , text ^>=2.0 , time >=1.9.3 && <2 - , transformers ^>=0.5.6 + , transformers ^>=0.6.1 , wl-pprint >=1.2 && <2 exposed-modules: diff --git a/marlowe/src/Language/Marlowe/Analysis/Safety/Transaction.hs b/marlowe/src/Language/Marlowe/Analysis/Safety/Transaction.hs index ef2fec1fa3..c39f088a19 100644 --- a/marlowe/src/Language/Marlowe/Analysis/Safety/Transaction.hs +++ b/marlowe/src/Language/Marlowe/Analysis/Safety/Transaction.hs @@ -40,7 +40,9 @@ module Language.Marlowe.Analysis.Safety.Transaction ( firstRoleAuthorizationAnnotator, ) where -import Control.Monad.Except (MonadError (throwError), MonadIO (..), foldM, liftEither, liftIO) +import Control.Monad (foldM) +import Control.Monad.Except (MonadError, liftEither, throwError) +import Control.Monad.IO.Class (MonadIO (..), liftIO) import Data.Bifunctor (first) import Data.List (nub, nubBy) import Data.String (IsString (..))