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

flake: use new output format

Browse Source 
The previous format is deprecated.
This commit is contained in:
Erik Arvstedt 2022-06-01 19:59:32 +02:00
parent a99fad2235
commit 7233b054d9
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/flakes/flake.nix
View File

@ -8,7 +8,7 @@
nixosConfigurations.mynode = nix-bitcoin.inputs.nixpkgs.lib.nixosSystem { nixosConfigurations.mynode = nix-bitcoin.inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
nix-bitcoin.nixosModule nix-bitcoin.nixosModules.default
# Optional: # Optional:
# Import the secure-node preset, an opinionated config to enhance security # Import the secure-node preset, an opinionated config to enhance security

12
flake.nix
View File

@ -24,11 +24,11 @@
import ./pkgs { inherit pkgs pkgsUnstable; }; import ./pkgs { inherit pkgs pkgsUnstable; };
}; };
overlay = final: prev: let overlays.default = final: prev: let
nbPkgs = lib.mkNbPkgs { inherit (final) system; pkgs = final; }; nbPkgs = lib.mkNbPkgs { inherit (final) system; pkgs = final; };
in removeAttrs nbPkgs [ "pinned" "nixops19_09" "krops" ]; in removeAttrs nbPkgs [ "pinned" "nixops19_09" "krops" ];
nixosModule = { config, pkgs, lib, ... }: { nixosModules.default = { config, pkgs, lib, ... }: {
imports = [ ./modules/modules.nix ]; imports = [ ./modules/modules.nix ];
options = with lib; { options = with lib; {
@ -58,7 +58,7 @@
}; };
}; };
defaultTemplate = { templates.default = {
description = "Basic node template"; description = "Basic node template";
path = ./examples/flakes; path = ./examples/flakes;
}; };
@ -91,7 +91,7 @@
inherit system; inherit system;
configuration = { configuration = {
imports = [ imports = [
nix-bitcoin.nixosModule nix-bitcoin.nixosModules.default
"${nix-bitcoin}/modules/presets/secure-node.nix" "${nix-bitcoin}/modules/presets/secure-node.nix"
]; ];
@ -113,9 +113,9 @@
# `packages` is not allowed to contain nested pkgs attrsets. # `packages` is not allowed to contain nested pkgs attrsets.
legacyPackages = nbPkgs; legacyPackages = nbPkgs;
defaultApp = apps.vm; apps = rec {
default = vm;
apps = {
# Run a basic nix-bitcoin node in a VM # Run a basic nix-bitcoin node in a VM
vm = { vm = {
type = "app"; type = "app";