clean-up tasks

default.nix

@@ -38,8 +38,6 @@ let
     inherit (iohkLib.nix-tools) iohk-extras iohk-module;
   };
 
-  daedalusBridge = pkgs.callPackage ./nix/daedalus-bridge.nix { };
-
 in {
   inherit pkgs iohkLib src haskellPackages;
   inherit cardano-http-bridge cardano-sl-node jormungandr jormungandr-cli;
@@ -53,7 +51,7 @@ in {
   tests = collectComponents "tests" isCardanoWallet haskellPackages;
   benchmarks = collectComponents "benchmarks" isCardanoWallet haskellPackages;
 
-  daedalus-bridge = import ./daedalus-bridge.nix { inherit target pkgs haskellPackages system crossSystem jormungandr; };
+  daedalus-bridge = import ./nix/daedalus-bridge.nix { inherit target pkgs haskellPackages system crossSystem jormungandr; };
 
   shell = haskellPackages.shellFor {
     name = "cardano-wallet-shell";

daedalus-bridge.nix → nix/daedalus-bridge.nix

@@ -1,18 +1,13 @@
 { target, pkgs, haskellPackages, system, crossSystem, jormungandr }:
 
 let
-  commonLib = import ./nix/iohk-common.nix {};
+  commonLib = import ../lib.nix {};
   pkgsCross = commonLib.getPkgs { crossSystem = pkgs.lib.systems.examples.mingwW64; };
-  cardano-shell-src = pkgs.fetchFromGitHub {
-    owner = "input-output-hk";
-    repo = "cardano-shell";
-    rev = "efba204c14a83b9e1af9bb138c2d551fe3d7a43e";
-    sha256 = "0cr260b1drj4yal91fxcai9007jgbi2i2mh3mjnkq2rzjz6rvh8s";
-  };
-  cardano-shell = import cardano-shell-src { inherit system crossSystem; }; # todo, shell should accept target
+  cardano-shell = import commonLib.sources.cardano-shell { inherit system crossSystem; }; # todo, shell should accept target
+  jormungandrConfig = builtins.toFile "config.yaml" (builtins.toJSON commonLib.jormungandrLib.defaultJormungandrConfig);
 in pkgs.runCommandCC "daedalus-bridge" {} ''
   mkdir -pv $out/bin $out/config
-  touch $out/config/todo
+  cp ${jormungandrConfig} $out/config/jormungandr-config.yaml
   cd $out/bin
   cp ${haskellPackages.cardano-wallet-jormungandr.components.exes.cardano-wallet-jormungandr}/bin/cardano-wallet-jormungandr* .
   cp ${cardano-shell.nix-tools.cexes.cardano-launcher.cardano-launcher}/bin/cardano-launcher* .

nix/sources.json

@@ -1,4 +1,16 @@
 {
+    "cardano-shell": {
+        "branch": "master",
+        "description": "Node shell, a thin layer for running the node and it's modules.",
+        "homepage": null,
+        "owner": "input-output-hk",
+        "repo": "cardano-shell",
+        "rev": "a06b256c3cd836f823f85c729d1aae0c8c13011c",
+        "sha256": "0gh1mqq5gkqaf81nmp96n9rnw9x6jnqpr4hxa99m4pnbcyc03f93",
+        "type": "tarball",
+        "url": "https://github.com/input-output-hk/cardano-shell/archive/a06b256c3cd836f823f85c729d1aae0c8c13011c.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "gitignore": {
         "branch": "master",
         "description": "Nix function for filtering local git sources",