diff --git a/flake.lock b/flake.lock
index 6331382b030342ac07eb62e0d8e850db1f90c7a8..b3bf013b37370701ab8c274406a577affa9658f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
{
"nodes": {
+ "Cabal": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1663468572,
+ "narHash": "sha256-mhl5d/3DTGI+tHnIJ4AEBXSCtbP+PTlxMBa2SMOY+sY=",
+ "ref": "master",
+ "rev": "182e2c15191cd96a477a7fda41f9f89192b665ff",
+ "revCount": 13167,
+ "type": "git",
+ "url": "https://gitlab.haskell.org/ghc/packages/Cabal"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.haskell.org/ghc/packages/Cabal"
+ }
+ },
"HaskellR": {
"flake": false,
"locked": {
@@ -19,11 +35,11 @@
"all-cabal-hashes": {
"flake": false,
"locked": {
- "lastModified": 1662368445,
- "narHash": "sha256-nVDdIRNExuW6kP0DFdwabEQ3GyjtXIFHlJRL/IrUApA=",
+ "lastModified": 1663669089,
+ "narHash": "sha256-vlwG3n8Q+ROimoU60f6e0ehgHVhY6iNpYy8zxRj9usg=",
"owner": "commercialhaskell",
"repo": "all-cabal-hashes",
- "rev": "6c052bdfafe635c6ff6a3f4cbf0f00b34d015734",
+ "rev": "efe0ff8f8ced37a3d619e7849cf0217cfbbc3fad",
"type": "github"
},
"original": {
@@ -36,11 +52,11 @@
"all-cabal-hashes_2": {
"flake": false,
"locked": {
- "lastModified": 1662320435,
- "narHash": "sha256-LZgRGB9RrWMzpL7jEBJNlMQ6xm6wpab3BJFn+Min5tg=",
+ "lastModified": 1663590767,
+ "narHash": "sha256-1hDRgWXpj60PEeh5DH0km5CN/vXYmMZiNqLJnJbmfN0=",
"owner": "commercialhaskell",
"repo": "all-cabal-hashes",
- "rev": "3ec45303eb815900bad7a7d6c97c09f4e0c2cb48",
+ "rev": "e456824564bb5457549a70dc03c7ae00b3dfaec3",
"type": "github"
},
"original": {
@@ -50,6 +66,22 @@
"type": "github"
}
},
+ "cache-effectful": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1657749248,
+ "narHash": "sha256-Sa2A2KYPzoTJ57gFfjEJjBciuRkYO4y3HsUUTXdCrgU=",
+ "owner": "haskell-effectful",
+ "repo": "cache-effectful",
+ "rev": "0a5581da7c21a05a9ab1762a6da6997090fe311d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "haskell-effectful",
+ "repo": "cache-effectful",
+ "type": "github"
+ }
+ },
"cardano-base": {
"flake": false,
"locked": {
@@ -117,6 +149,39 @@
"type": "github"
}
},
+ "compactable": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1657645300,
+ "narHash": "sha256-WUICNDQYyzf3fnuRokltSbPBUjHP4gODtKt0JNVv2KY=",
+ "owner": "fresheyeball",
+ "repo": "Compactable",
+ "rev": "f63927b1e438c267f0d12f36e5b3735cfaebeeb4",
+ "type": "gitlab"
+ },
+ "original": {
+ "owner": "fresheyeball",
+ "ref": "master",
+ "repo": "Compactable",
+ "type": "gitlab"
+ }
+ },
+ "cryptohash-sha1": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1660587782,
+ "narHash": "sha256-7narJN/P+e3G7A9KtMe3uoMPi8DO9FPwQu7KG6NaixQ=",
+ "owner": "haskell-hvr",
+ "repo": "cryptohash-sha1",
+ "rev": "f82ceae0d2ad23cc5d4e7f69367b4b4796b852b8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "haskell-hvr",
+ "repo": "cryptohash-sha1",
+ "type": "github"
+ }
+ },
"doctest": {
"flake": false,
"locked": {
@@ -150,6 +215,38 @@
"type": "github"
}
},
+ "ed25519": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1662566127,
+ "narHash": "sha256-0e9yAWm2VLyFNtgaC1+WpneARrTfWUqeN2Hv0OW42+U=",
+ "ref": "master",
+ "rev": "faf8fe90aa1cd2492ea1e64c55f5c59fc0322210",
+ "revCount": 2,
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/adopted/ed25519"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://gitlab.homotopic.tech/horizon/adopted/ed25519"
+ }
+ },
+ "ema": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1661699475,
+ "narHash": "sha256-2324LDzNNZGItJ4hI8SGUyZ8PZK0xHtRWnAFXlCX8UQ=",
+ "owner": "EmaApps",
+ "repo": "ema",
+ "rev": "be89ffe306a15ab4a16494c8593d989fabcc4486",
+ "type": "github"
+ },
+ "original": {
+ "owner": "EmaApps",
+ "repo": "ema",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
"nixpkgs": [
@@ -178,11 +275,11 @@
]
},
"locked": {
- "lastModified": 1661009076,
- "narHash": "sha256-phAE40gctVygRq3G3B6LhvD7u2qdQT21xsz8DdRDYFo=",
+ "lastModified": 1663071030,
+ "narHash": "sha256-vqdGU5iR2nKiSH6Z0bhNAwg/6szAicXaopv7lpMRNRg=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "850d8a76026127ef02f040fb0dcfdb8b749dd9d9",
+ "rev": "89cce5852d100df3d815c3c4a3fd39e55b3e1bfc",
"type": "github"
},
"original": {
@@ -280,43 +377,107 @@
"type": "github"
}
},
- "haskell-flake_2": {
+ "haskell-src-meta": {
+ "flake": false,
"locked": {
- "lastModified": 1661726764,
- "narHash": "sha256-YzzOoff6m3W4g4B0E8xd3omvOhEVuRu/Rdvnmy2H6Jc=",
- "owner": "srid",
- "repo": "haskell-flake",
- "rev": "3c27b5ba2eafc52f4bed232a8ff74cf0a5a99375",
+ "lastModified": 1661274178,
+ "narHash": "sha256-6otO/j8wplg65J0ZOKZH/2VAGKsPhHZV94AJezuyI3w=",
+ "owner": "parsonsmatt",
+ "repo": "haskell-src-meta",
+ "rev": "ec8cc43b6084abe2d5d1b496dd1c0f42f5da0671",
"type": "github"
},
"original": {
- "owner": "srid",
- "repo": "haskell-flake",
+ "owner": "parsonsmatt",
+ "ref": "matt/support-new-th",
+ "repo": "haskell-src-meta",
+ "type": "github"
+ }
+ },
+ "hedgehog-golden": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1661504720,
+ "narHash": "sha256-bsQhvyY22Rgg8fEsVlQMAXN7Kps3QWntnAucuP8F16Y=",
+ "owner": "maybe-hedgehog-later",
+ "repo": "hedgehog-golden",
+ "rev": "4ab2906b3f0be5e31ee5a8585e45d43392694246",
+ "type": "github"
+ },
+ "original": {
+ "owner": "maybe-hedgehog-later",
+ "repo": "hedgehog-golden",
+ "type": "github"
+ }
+ },
+ "hlint": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1663597420,
+ "narHash": "sha256-CUNiq0bwTEz8YmcmDgaU/z299cYxT9mNvKBHx14jpaU=",
+ "owner": "ndmitchell",
+ "repo": "hlint",
+ "rev": "08a25c6b7915e5f22aad7ee68da95d576225d55d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ndmitchell",
+ "repo": "hlint",
+ "type": "github"
+ }
+ },
+ "hnix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1663319540,
+ "narHash": "sha256-dGedn32j4UHWq6Nv7XK23OC/9P1e2CTj5KwenP21rmw=",
+ "owner": "milloni",
+ "repo": "hnix",
+ "rev": "005568ee024eabee129d9cf4ca331c6da260610b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "milloni",
+ "ref": "milloni/horizon",
+ "repo": "hnix",
"type": "github"
}
},
"horizon-platform": {
"inputs": {
+ "Cabal": "Cabal",
"all-cabal-hashes": "all-cabal-hashes_2",
+ "cache-effectful": "cache-effectful",
"cborg": "cborg",
+ "compactable": "compactable",
+ "cryptohash-sha1": "cryptohash-sha1",
"doctest": "doctest",
"double-conversion": "double-conversion",
+ "ed25519": "ed25519",
+ "ema": "ema",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
- "haskell-flake": "haskell-flake_2",
+ "haskell-src-meta": "haskell-src-meta",
+ "hedgehog-golden": "hedgehog-golden",
+ "hlint": "hlint",
+ "hnix": "hnix",
"lint-utils": "lint-utils",
"memory": "memory",
"nixpkgs": "nixpkgs_2",
+ "polysemy": "polysemy",
+ "quickcheck-dynamic": "quickcheck-dynamic",
"servant": "servant",
+ "sydtest": "sydtest",
"tasty": "tasty",
- "tasty-hedgehog": "tasty-hedgehog"
+ "tasty-hedgehog": "tasty-hedgehog",
+ "unicode-data": "unicode-data"
},
"locked": {
- "lastModified": 1662332633,
- "narHash": "sha256-gkmsebvwPBe7kEeaGbpJIYM0ba2/niThjl5YxWrKxeI=",
+ "lastModified": 1663606203,
+ "narHash": "sha256-kpklnkrSiyJ8xPcCxieLU7U2q8WDjw1XpbhZpalLc5A=",
"ref": "refs/heads/master",
- "rev": "06f2d7426ffb789a57d760d06036a1feb7202bce",
- "revCount": 38,
+ "rev": "e1598f0fe47496101c82f32c5f3df8d9f0f0b730",
+ "revCount": 110,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
},
@@ -333,7 +494,7 @@
"locked": {
"lastModified": 1655192403,
"narHash": "sha256-XyKDvRGDh8VXA6zN8DUTnDaTMrk0MxMKg70MaAX1A2Y=",
- "ref": "refs/heads/master",
+ "ref": "master",
"rev": "a7ae54afdc4c05a5aabf202d5a76d02705eb6147",
"revCount": 28,
"type": "git",
@@ -414,11 +575,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1662096612,
- "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
+ "lastModified": 1663551060,
+ "narHash": "sha256-e2SR4cVx9p7aW/XnVsGsWZBplApA9ZJUjc0fejJhnYo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
+ "rev": "8a5b9ee7b7a2b38267c9481f5c629c015108ab0d",
"type": "github"
},
"original": {
@@ -493,6 +654,39 @@
"type": "github"
}
},
+ "polysemy": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1662391458,
+ "narHash": "sha256-ny1RDNdNbCehHEpBfEGBtsM+oWxmRJmNIlylx3iVwus=",
+ "owner": "locallycompact",
+ "repo": "polysemy",
+ "rev": "bd944ca000c1ca69602d4723e3859af431b9d0c4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "locallycompact",
+ "ref": "ghc-942",
+ "repo": "polysemy",
+ "type": "github"
+ }
+ },
+ "quickcheck-dynamic": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1662454862,
+ "narHash": "sha256-sMAO+Vkocf/ejwg2sx58rXlmoE6tTPQV/ECVVOnWPHo=",
+ "owner": "input-output-hk",
+ "repo": "quickcheck-dynamic",
+ "rev": "81310df2de73094d5daff1b675a4318cff5fc8b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "input-output-hk",
+ "repo": "quickcheck-dynamic",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"HaskellR": "HaskellR",
@@ -515,11 +709,11 @@
"servant": {
"flake": false,
"locked": {
- "lastModified": 1661296516,
- "narHash": "sha256-molPpcquyLIAK2FlPOLgsQhhAPuitGYCEYKY12ZcRBo=",
+ "lastModified": 1662636711,
+ "narHash": "sha256-y6fySO8NqtEad+W+F48QJgRR0JYfqXwo/+MCxcrpJpg=",
"owner": "TeofilC",
"repo": "servant",
- "rev": "e9a799ecb5cef047909b4c22071a8fa68ba30a8a",
+ "rev": "a53d69929cf6fe531bb25aec65e7ab6405278459",
"type": "github"
},
"original": {
@@ -529,6 +723,22 @@
"type": "github"
}
},
+ "sydtest": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1662748704,
+ "narHash": "sha256-SpSYPSdVHKAeW2h7P1GdMhxuE6htWNdUJNN3N8vE57I=",
+ "owner": "NorfairKing",
+ "repo": "sydtest",
+ "rev": "7e1686bc0ff98c56afb1bf20b3b29f7a634feedd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NorfairKing",
+ "repo": "sydtest",
+ "type": "github"
+ }
+ },
"tasty": {
"flake": false,
"locked": {
@@ -560,6 +770,22 @@
"repo": "tasty-hedgehog",
"type": "github"
}
+ },
+ "unicode-data": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1663575864,
+ "narHash": "sha256-HWxlqziq3j2ev9wpON6NDUcCn9cjH72S/ddxSkvGLDY=",
+ "owner": "composewell",
+ "repo": "unicode-data",
+ "rev": "e924329f0e5e853426ec7453da23b11dceb53136",
+ "type": "github"
+ },
+ "original": {
+ "owner": "composewell",
+ "repo": "unicode-data",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 81c51803ea310c49d5816c7302946d5836e65378..efee8cba1507237dd90096767b94f50fb3c233b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,8 +50,8 @@
pkgs = import nixpkgs { inherit system; overlays = [ overlay-ach (final: prev: { R = pkgs-libR.R; })];};
overrides-hp = final: prev:
- (horizon-platform.overrides.${system}.ghc942 final prev)
- // (import ./overlay.nix { inherit inputs pkgs; } final prev);
+ (horizon-platform.overrides.${system}.ghc942 final prev
+ // (import ./overlay.nix { inherit inputs pkgs; } final prev));
hp = pkgs.haskell.packages.ghc942.override {
overrides = overrides-hp;
};
diff --git a/overlay.nix b/overlay.nix
index 005406c51da841d1643d504a25f77031e27e53a2..20370ccf4ce34438b5c3578f04dae92b3954169e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -63,9 +63,7 @@ final: prev: with pkgs.haskell.lib;
ref-tf = prev.callHackage "ref-tf" "0.5.0.1" { };
- secp256k1-haskell = dontCheck (prev.secp256k1-haskell);
-
- secp256k1 = pkgs.secp256k1;
+ secp256k1-haskell = addPkgconfigDepend (dontCheck (prev.secp256k1-haskell)) pkgs.secp256k1;
singletons-th = prev.callHackage "singletons-th" "3.1.1" { };