Merge branch 'network-dir'

README.md

@@ -44,7 +44,7 @@ The data directories of the services can be found in `/var/lib` on the deployed
 
 Installation
 ---
-The easiest way is to run `nix-shell` (on a Linux machine) in the nix-bitcoin directory and then create a [NixOps](https://nixos.org/nixops/manual/) deployment with the provided network.nix.
+The easiest way is to run `nix-shell` (on a Linux machine) in the nix-bitcoin directory and then create a [NixOps](https://nixos.org/nixops/manual/) deployment with the provided `network.nix` in the `network` directory.
 Fix the FIXMEs in configuration.nix and deploy with nixops in nix-shell.
 See [install.md](docs/install.md) for a detailed tutorial.
 

docs/install.md

@@ -92,7 +92,7 @@ The following steps are meant to be run on the machine you deploy from, not the
 3. Create nixops deployment in nix-shell.
 
 	```
-	nixops create network.nix network-vbox.nix -d bitcoin-node
+	nixops create network/network.nix network/network-vbox.nix -d bitcoin-node
 	```
 
 4. Adjust configuration by opening `configuration.nix` and removing FIXMEs. Enable/disable the modules you want in `configuration.nix`.
@@ -280,7 +280,7 @@ On the machine you are deploying from:
 4. Create network file
 
 	```
-	nano network-nixos.nix
+	nano network/network-nixos.nix
 	```
 
 	```
@@ -327,7 +327,7 @@ On the machine you are deploying from:
 
 9. Create nixops deployment in nix-shell.
 	```
-	nixops create network.nix network-nixos.nix -d bitcoin-node
+	nixops create network/network.nix network/network-nixos.nix -d bitcoin-node
 	```
 
 10. Adjust configuration by opening `configuration.nix` and removing FIXMEs. Enable/disable the modules you want in `configuration.nix`.

non-broken.nix

@@ -1,27 +0,0 @@
-# This file filters out all the broken packages from your package set.
-# It's what gets built by CI, so if you correctly mark broken packages as
-# broken your CI will not try to build them and the non-broken packages will
-# be added to the cache.
-{ pkgs ? import <nixpkgs> {} }:
-
-let filterSet =
-      (f: g: s: builtins.listToAttrs
-        (map
-          (n: { name = n; value = builtins.getAttr n s; })
-          (builtins.filter
-            (n: f n && g (builtins.getAttr n s))
-            (builtins.attrNames s)
-          )
-        )
-      );
-in filterSet
-     (n: !(n=="lib"||n=="overlays"||n=="modules")) # filter out non-packages
-     (p: (builtins.isAttrs p)
-       && !(
-             (builtins.hasAttr "meta" p)
-             && (builtins.hasAttr "broken" p.meta)
-             && (p.meta.broken)
-           )
-     )
-     (import ./default.nix { inherit pkgs; })
-