Skip to content

Commit

Permalink
Pass network name to default.nix as param
Browse files Browse the repository at this point in the history
  • Loading branch information
jhbertra committed Aug 8, 2022
1 parent cee74c5 commit c614303
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions default.nix
Expand Up @@ -24,6 +24,7 @@
# Whether to build our Haskell packages (and their dependencies) with profiling enabled.
, enableHaskellProfiling ? false
, source-repo-override ? { }
, networkNixName ? "testnet"
}:
let
inherit (packages) pkgs marlowe sources;
Expand All @@ -36,10 +37,10 @@ rec {

inherit (haskell.packages.marlowe-cli.components.exes) marlowe-cli;

network = pkgs.networks.${networkNixName};

dev-scripts = import ./nix/dev/scripts.nix {
inherit pkgs;
inherit cardano-cli cardano-node;
network = pkgs.networks.testnet-dev;
inherit pkgs network cardano-cli cardano-node;
};

tests = import ./nix/tests/default.nix {
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Expand Up @@ -4,7 +4,7 @@
}:
let
# inherit (packages) pkgs marlowe docs webCommon bitte-packages marlowe-cli dev-scripts;
inherit (packages) pkgs marlowe docs marlowe-cli dev-scripts;
inherit (packages) pkgs marlowe docs marlowe-cli dev-scripts network;
inherit (dev-scripts) start-cardano-node run-chainseekd;
inherit (pkgs) stdenv lib utillinux python3 nixpkgs-fmt writeShellScriptBin networks;
inherit (marlowe) haskell stylish-haskell sphinxcontrib-haddock sphinx-markdown-tables sphinxemoji nix-pre-commit-hooks cardano-cli cardano-node;
Expand Down

0 comments on commit c614303

Please sign in to comment.