diff --git a/infra/common/resource.nix b/infra/common/resource.nix index 7e86467c..dcd34a0f 100644 --- a/infra/common/resource.nix +++ b/infra/common/resource.nix @@ -1,4 +1,5 @@ { + inputs, lib, config, ... @@ -9,7 +10,7 @@ let inherit (lib.attrsets) concatMapAttrs optionalAttrs; inherit (lib.strings) removeSuffix; sources = import ../../npins; - inherit (sources) nixpkgs agenix disko; + inherit (sources) agenix disko; secretsPrefix = ../../secrets; secrets = import (secretsPrefix + "/secrets.nix"); @@ -26,7 +27,7 @@ in hostPublicKey = config.fediversityVm.hostPublicKey; }; - inherit nixpkgs; + nixpkgs = inputs.nixpkgs; ## The configuration of the machine. We strive to keep in this file only the ## options that really need to be injected from the resource. Everything else diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 09f9718e..2a059a29 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -21,6 +21,7 @@ let makeResourceModule = { vmName, isTestVm }: { + _module.args = { inherit inputs; }; imports = [ ./common/resource.nix diff --git a/npins/sources.json b/npins/sources.json index 4971590b..e6a5843b 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -25,6 +25,19 @@ "url": null, "hash": "1w2gsy6qwxa5abkv8clb435237iifndcxq0s79wihqw11a5yb938" }, + "disko": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nix-community", + "repo": "disko" + }, + "branch": "master", + "submodules": false, + "revision": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", + "url": "https://github.com/nix-community/disko/archive/b5d1320ebc2f34dbea4655f95167f55e2130cdb3.tar.gz", + "hash": "1dcakwcvbqapvd6c321kdrhki30dn1pbnffvzhdb0ab4gman9fcq" + }, "flake-parts": { "type": "Git", "repository": { diff --git a/panel/src/panel/templates/partials/deployment_result.html b/panel/src/panel/templates/partials/deployment_result.html index d342ad18..a7837e0d 100644 --- a/panel/src/panel/templates/partials/deployment_result.html +++ b/panel/src/panel/templates/partials/deployment_result.html @@ -5,7 +5,7 @@ {% for service_name, service_meta in services.items %} {% if service_meta.enable %}