privatevoid.net/depot
1
1
Fork 0
Code Issues 25 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Merge branch 'fix-effect-run-nixos-config'

Browse source
This commit is contained in:
Max Headroom 2022-05-27 20:30:57 +02:00
commit f4a0dc3231
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -313,11 +313,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1653415319, "lastModified": 1653487348,
"narHash": "sha256-h+YUX7ZYujf73KL1R07LsEnhV7uV8oxSKEhH4bDj0Jc=", "narHash": "sha256-lWqxXMRqO8blpwhH2qvrFBVp6aZ7V+Z3xTqkNWKyLQw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "1f904af1824e7393702daaf40a8fed56ebead0d7", "rev": "0ab66b56d3f2b40ddfd981899d1757773632075f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -68,7 +68,7 @@
hostname = "${lib.toLower name}.${subdomain}.${meta.domain}"; hostname = "${lib.toLower name}.${subdomain}.${meta.domain}";
in effects.runIf (branch == "master" || branch == "staging") (effects.runNixOS { in effects.runIf (branch == "master" || branch == "staging") (effects.runNixOS {
requiredSystemFeatures = [ "hci-deploy-agent-nixos" ]; requiredSystemFeatures = [ "hci-deploy-agent-nixos" ];
config = self.nixosConfigurations.${name}.config // { outPath = "wtfwtfwtfwtfwtfwtf"; }; inherit (self.nixosConfigurations.${name}) config;
secretsMap.ssh = "deploy-ssh"; secretsMap.ssh = "deploy-ssh";
userSetupScript = '' userSetupScript = ''