partial fixes to regressions 326, 328

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

infra/flake-part.nix

@@ -21,6 +21,7 @@ let
   makeResourceModule =
     { vmName, isTestVm }:
     {
+      _module.args = { inherit inputs; };
       imports =
         [
           ./common/resource.nix

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": {

panel/src/panel/templates/partials/deployment_result.html

@@ -5,7 +5,7 @@
   {% for service_name, service_meta in services.items %}
     {% if service_meta.enable %}
     <li>
-        ✓ <a target="_blank" href={{ service_meta.url }}>{{ service_name }}</a>
+        ✓ <a target="_blank" href="https://{{ service_name }}.{{ services.domain }}">{{ service_name }}</a>
     </li>
     {% endif %}
   {% endfor %}