diff --git a/flake.lock b/flake.lock index f0b4d7b..6a72030 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,21 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1699384378, + "narHash": "sha256-jI0nYllONVrNnyOYrvQMIEJQJuNeKnfJo5keRxWMcWs=", + "owner": "kadena-io", + "repo": "flake-compat", + "rev": "6ef9397736efb0f6075188aa3488022d1b85c11d", + "type": "github" + }, + "original": { + "owner": "kadena-io", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1672831974, @@ -51,43 +66,6 @@ "type": "github" } }, - "ghc980": { - "flake": false, - "locked": { - "lastModified": 1692910316, - "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", - "ref": "ghc-9.8", - "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", - "revCount": 61566, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.8", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, - "ghc99": { - "flake": false, - "locked": { - "lastModified": 1695427505, - "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", - "ref": "refs/heads/master", - "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", - "revCount": 61951, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "hackage": { "flake": false, "locked": { @@ -126,13 +104,19 @@ "hs-nix-infra", "empty" ], - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": [ "hs-nix-infra", "empty" ], - "ghc980": "ghc980", - "ghc99": "ghc99", + "ghc980": [ + "hs-nix-infra", + "empty" + ], + "ghc99": [ + "hs-nix-infra", + "empty" + ], "hackage": [ "hs-nix-infra", "hackage" @@ -235,20 +219,23 @@ "hs-nix-infra": { "inputs": { "empty": "empty", + "flake-compat": "flake-compat", "hackage": "hackage", "haskellNix": "haskellNix", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-rec": "nixpkgs-rec" }, "locked": { - "lastModified": 1699020807, - "narHash": "sha256-T/vXF8PXGGnZXNAspFx3yhGFWh4n3a8f1UHlfuHWH1A=", + "lastModified": 1699956738, + "narHash": "sha256-OurMcrf07sCDHBumWm8lorsA9hhiKX5KnVogsxx7bJs=", "owner": "kadena-io", "repo": "hs-nix-infra", - "rev": "4e2cc022e56412eef42527f3876bae8c0ad0fe5d", + "rev": "8c1053765b265a8f13885687f00e094a7a5b76e5", "type": "github" }, "original": { "owner": "kadena-io", + "ref": "enis/metadata-experiments", "repo": "hs-nix-infra", "type": "github" } @@ -269,6 +256,22 @@ "type": "github" } }, + "nixpkgs-rec": { + "locked": { + "lastModified": 1669833724, + "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1695318763, diff --git a/flake.nix b/flake.nix index 7f5aa32..d769aef 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Chainweb Mining Client"; inputs = { - hs-nix-infra.url = "github:kadena-io/hs-nix-infra"; + hs-nix-infra.url = "github:kadena-io/hs-nix-infra/enis/metadata-experiments"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, hs-nix-infra, flake-utils, }: @@ -32,9 +32,18 @@ }) ]; pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; }; - flake = pkgs.chainweb-mining-client.flake {}; - in flake // { + project = pkgs.chainweb-mining-client; + flake = project.flake {}; + in { # Built by `nix build .` packages.default = flake.packages."chainweb-mining-client:exe:chainweb-mining-client"; + packages.recursive = with hs-nix-infra.lib.recursive system; + wrapRecursiveWithMeta "chainweb-mining-client" "${wrapFlake self}.default"; + + devShell = flake.devShell; + + # Other flake outputs provided by haskellNix can be accessed through + # this project output + inherit project; }); }