.forgejo/workflows/update.yaml

@@ -7,16 +7,15 @@ on:
 
 jobs:
   lockfile:
-    runs-on: native
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
       - name: Install npins
-        run: nix-shell --run "npins update"
+        run: nix profile install 'nixpkgs#npins'
-      - name: Create PR
+      - name: Update npins sources
-        uses: peter-evans/create-pull-request@v7
+        uses: getchoo/update-npins@v0
         with:
           token: "${{ secrets.DEPLOY_KEY }}"
-          branch: npins-update
-          commit-message: "npins: update sources"
-          title: "npins: update sources"

default.nix

@@ -55,7 +55,6 @@ in
         };
       in
       [
-        pkgs.npins
         pkgs.nix-unit
         test-loop
       ];

infra/common/resource.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   lib,
   config,
   ...
@@ -10,7 +9,7 @@ let
   inherit (lib.attrsets) concatMapAttrs optionalAttrs;
   inherit (lib.strings) removeSuffix;
   sources = import ../../npins;
-  inherit (sources) agenix disko;
+  inherit (sources) nixpkgs agenix disko;
 
   secretsPrefix = ../../secrets;
   secrets = import (secretsPrefix + "/secrets.nix");
@@ -27,7 +26,7 @@ in
     hostPublicKey = config.fediversityVm.hostPublicKey;
   };
 
-  inherit (inputs) nixpkgs;
+  inherit 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,9 +21,6 @@ let
   makeResourceModule =
     { vmName, isTestVm }:
     {
-      # TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally
-      _module.args = { inherit inputs; };
-
       imports =
         [
           ./common/resource.nix

npins/sources.json

@@ -25,22 +25,6 @@
       "url": null,
       "hash": "1w2gsy6qwxa5abkv8clb435237iifndcxq0s79wihqw11a5yb938"
     },
-    "disko": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "nix-community",
-        "repo": "disko"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "submodules": false,
-      "version": "v1.12.0",
-      "revision": "7121f74b976481bc36877abaf52adab2a178fcbe",
-      "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.12.0",
-      "hash": "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq"
-    },
     "flake-inputs": {
       "type": "GitRelease",
       "repository": {

panel/default.nix

@@ -27,7 +27,7 @@ in
       pkgs.openssh
     ];
     env = {
-      DEPLOYMENT_FLAKE = toString ../.;
+      DEPLOYMENT_FLAKE = ../.;
       DEPLOYMENT_NAME = "test";
       NPINS_DIRECTORY = toString ../npins;
       CREDENTIALS_DIRECTORY = toString ./.credentials;

services/default.nix

@@ -6,8 +6,8 @@
 }:
 {
   tests = {
-    mastodon = pkgs.nixosTest ./tests/mastodon.nix;
+    mastodon = import ./tests/mastodon.nix { inherit pkgs; };
-    pixelfed-garage = pkgs.nixosTest ./tests/pixelfed-garage.nix;
+    pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs; };
-    peertube = pkgs.nixosTest ./tests/peertube.nix;
+    peertube = import ./tests/peertube.nix { inherit pkgs; };
   };
 }

services/tests/mastodon.nix

@@ -42,7 +42,7 @@ let
       '';
 in
 
-{
+pkgs.nixosTest {
   name = "mastodon";
 
   nodes = {

services/tests/peertube.nix

@@ -161,7 +161,7 @@ let
   '';
 in
 
-{
+pkgs.nixosTest {
   name = "peertube";
 
   nodes = {

services/tests/pixelfed-garage.nix

@@ -114,7 +114,7 @@ let
         ${seleniumQuit}'';
 
 in
-{
+pkgs.nixosTest {
   name = "test-pixelfed-garage";
 
   nodes = {