chia: update to 1.8.1 pull request
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing

This commit is contained in:
Jake Hillion 2023-06-10 09:32:27 +01:00
parent 435de4e361
commit b1a0071c40
3 changed files with 13 additions and 8 deletions

View File

@ -126,17 +126,17 @@
}, },
"nixpkgs-chia": { "nixpkgs-chia": {
"locked": { "locked": {
"lastModified": 1661317206, "lastModified": 1685960109,
"narHash": "sha256-AlIqr/oyha8JnmVYmeDIb2ENR9wq0aZwI0XYVoshU0Q=", "narHash": "sha256-uTuKV5ua048dIGdaC+lexSUK/9A/X4la4BEJXODZm9U=",
"owner": "nixos", "owner": "lourkeur",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0305391fb65b5bdaa8af3c48275ec0df1cdcc34e", "rev": "e2b683787475d344892bddea9ab413dc611b894e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "lourkeur",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0305391fb65b5bdaa8af3c48275ec0df1cdcc34e", "rev": "e2b683787475d344892bddea9ab413dc611b894e",
"type": "github" "type": "github"
} }
}, },

View File

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-chia.url = "github:nixos/nixpkgs?rev=0305391fb65b5bdaa8af3c48275ec0df1cdcc34e"; nixpkgs-chia.url = "github:lourkeur/nixpkgs?rev=e2b683787475d344892bddea9ab413dc611b894e";
darwin.url = "github:lnl7/nix-darwin/master"; darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";

View File

@ -16,6 +16,10 @@ in
type = with lib.types; nullOr str; type = with lib.types; nullOr str;
default = null; default = null;
}; };
keyLabel = lib.mkOption {
type = lib.types.str;
default = "default";
};
targetAddress = lib.mkOption { targetAddress = lib.mkOption {
type = with lib.types; nullOr str; type = with lib.types; nullOr str;
default = null; default = null;
@ -46,7 +50,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = lib.strings.concatStringsSep "\n" ([ "${chia}/bin/chia init" ] preStart = lib.strings.concatStringsSep "\n" ([ "${chia}/bin/chia init" ]
++ (if cfg.keyFile == null then [ ] else [ "${chia}/bin/chia keys add -f ${cfg.keyFile}" ]) ++ (if cfg.keyFile == null then [ ] else [ "${chia}/bin/chia keys add -f ${cfg.keyFile} -l '${cfg.keyLabel}'" ])
++ (if cfg.targetAddress == null then [ ] else [ ++ (if cfg.targetAddress == null then [ ] else [
'' ''
${pkgs.yq-go}/bin/yq e \ ${pkgs.yq-go}/bin/yq e \
@ -88,3 +92,4 @@ in
}; };
} }