greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'network-dir'

Browse Source
This commit is contained in:
Jonas Nick 2019-04-12 10:03:39 +00:00
commit 532aa0ed49
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
6 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -44,7 +44,7 @@ The data directories of the services can be found in `/var/lib` on the deployed
Installation 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. Fix the FIXMEs in configuration.nix and deploy with nixops in nix-shell.
See [install.md](docs/install.md) for a detailed tutorial. See [install.md](docs/install.md) for a detailed tutorial.

6
docs/install.md
View File

@ -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. 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`. 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 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. 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`. 10. Adjust configuration by opening `configuration.nix` and removing FIXMEs. Enable/disable the modules you want in `configuration.nix`.

0
network-libvirtd.nix → network/network-libvirtd.nix
View File

0
network-vbox.nix → network/network-vbox.nix
View File

0
network.nix → network/network.nix
View File

27
non-broken.nix
View File

@ -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; })