settle for garage 1 for now over breaking changes

try garage 2, given 0.9's EOL
update agenix, see https://github.com/ryantm/agenix/issues/331
2025-08-03 15:49:31 +02:00 · 2025-08-03 15:49:31 +02:00 · 2025-08-03 15:49:31 +02:00 · 2025-08-03 15:49:31 +02:00 · 2025-08-01 13:09:26 +02:00 · 2025-07-31 15:41:02 +02:00
29 changed files with 194 additions and 256 deletions
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@ -56,3 +56,29 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - run: nix build .#checks.x86_64-linux.deployment-panel -L
+
+  ## NOTE: NixOps4 does not provide a good “dry run” mode, so we instead check
+  ## proxies for resources, namely whether their `.#vmOptions.<machine>` and
+  ## `.#nixosConfigurations.<machine>` outputs evaluate and build correctly, and
+  ## whether we can dry run `infra/proxmox-*.sh` on them. This will not catch
+  ## everything, and in particular not issues in how NixOps4 wires up the
+  ## resources, but that is still something.
+  check-resources:
+    runs-on: native
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          set -euC
+          echo ==================== [ VM Options ] ====================
+          machines=$(nix eval --impure --raw --expr 'with builtins; toString (attrNames (getFlake (toString ./.)).vmOptions)')
+          for machine in $machines; do
+            echo ~~~~~~~~~~~~~~~~~~~~~: $machine :~~~~~~~~~~~~~~~~~~~~~
+            nix build .#checks.x86_64-linux.vmOptions-$machine
+          done
+          echo
+          echo ==================== [ NixOS Configurations ] ====================
+          machines=$(nix eval --impure --raw --expr 'with builtins; toString (attrNames (getFlake (toString ./.)).nixosConfigurations)')
+          for machine in $machines; do
+            echo ~~~~~~~~~~~~~~~~~~~~~: $machine :~~~~~~~~~~~~~~~~~~~~~
+            nix build .#checks.x86_64-linux.nixosConfigurations-$machine
+          done
--- a/.forgejo/workflows/update.yaml
+++ b/.forgejo/workflows/update.yaml
@ -13,7 +13,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
      - name: Update pins
-        run: nix-shell --run "npins update"
+        run: nix-shell --run "npins --verbose update"
      - name: Create PR
        uses: https://github.com/KiaraGrouwstra/gitea-create-pull-request@f9f80aa5134bc5c03c38f5aaa95053492885b397
        with:
--- a/deployment/check/common/nixosTest.nix
+++ b/deployment/check/common/nixosTest.nix
@ -48,7 +48,8 @@ in
    extraTestScript = mkOption { };

    sourceFileset = mkOption {
-      ## REVIEW: Upstream to nixpkgs?
+      ## FIXME: grab `lib.types.fileset` from NixOS, once upstreaming PR
+      ## https://github.com/NixOS/nixpkgs/pull/428293 lands.
      type = types.mkOptionType {
        name = "fileset";
        description = "fileset";
--- a/infra/common/options.nix
+++ b/infra/common/options.nix
@ -20,16 +20,13 @@ in
      '';
    };

-    proxmox = mkOption {
-      type = types.nullOr (
-        types.enum [
-          "procolix"
-          "fediversity"
-        ]
-      );
+    isFediversityVm = mkOption {
+      type = types.bool;
      description = ''
-        The Proxmox instance. This is used for provisioning only and should be
-        set to `null` if the machine is not a VM.
+        Whether the machine is a Fediversity VM or not. This is used to
+        determine whether the machine should be provisioned via Proxmox or not.
+        Machines that are _not_ Fediversity VM could be physical machines, or
+        VMs that live outside Fediversity, eg. on Procolix's Proxmox.
      '';
    };

--- a/infra/common/proxmox-qemu-vm.nix
+++ b/infra/common/proxmox-qemu-vm.nix
@ -1,10 +1,14 @@
-{ sources, ... }:
+{ ... }:
+
 {
  _class = "nixos";

-  imports = [
-    "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
-  ];
+  ## FIXME: It would be nice, but the following leads to infinite recursion
+  ## in the way we currently plug `sources` in.
+  ##
+  # imports = [
+  #   "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
+  # ];

  boot = {
    initrd = {
--- a/infra/common/resource.nix
+++ b/infra/common/resource.nix
@ -2,7 +2,6 @@
  inputs,
  lib,
  config,
-  sources,
  keys,
  secrets,
  ...
@ -33,10 +32,9 @@ in
  ## should go into the `./nixos` subdirectory.
  nixos.module = {
    imports = [
-      "${sources.agenix}/modules/age.nix"
-      "${sources.disko}/module.nix"
      ./options.nix
      ./nixos
+      ./proxmox-qemu-vm.nix
    ];

    ## Inject the shared options from the resource's `config` into the NixOS
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@ -14,53 +14,38 @@ let
    mkOption
    evalModules
    filterAttrs
+    mapAttrs'
+    deepSeq
    ;
  inherit (lib.attrsets) genAttrs;

-  ## Given a machine's name and whether it is a test VM, make a resource module,
-  ## except for its missing provider. (Depending on the use of that resource, we
-  ## will provide a different one.)
-  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
+  commonResourceModule = {
+    # 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
        keys
        secrets
+        sources
        ;
    };

+    ## FIXME: It would be preferrable to have those `sources`-related imports in
+    ## the modules that use them. However, doing so triggers infinite recursions
+    ## because of the way we propagate `sources`. `sources` must be propagated by
+    ## means of `specialArgs`, but this requires a bigger change.
    nixos.module.imports = [
-        ./common/proxmox-qemu-vm.nix
+      "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
+      "${sources.agenix}/modules/age.nix"
+      "${sources.disko}/module.nix"
+      "${sources.home-manager}/nixos"
    ];

-      nixos.specialArgs = {
-        inherit sources;
-      };
-
-      imports =
-        [
+    imports = [
      ./common/resource.nix
-        ]
-        ++ (
-          if isTestVm then
-            [
-              ../machines/operator/${vmName}
-              {
-                nixos.module.users.users.root.openssh.authorizedKeys.keys = [
-                  # allow our panel vm access to the test machines
-                  keys.panel
    ];
-              }
-            ]
-          else
-            [
-              ../machines/dev/${vmName}
-            ]
-        );
-      fediversityVm.name = vmName;
  };

  ## Given a list of machine names, make a deployment with those machines'
@ -69,34 +54,16 @@ let
    vmNames:
    { providers, ... }:
    {
-      # XXX: this type merge is for adding `specialArgs` to resource modules
-      options.resources = mkOption {
-        type =
-          with lib.types;
-          lazyAttrsOf (submoduleWith {
-            class = "nixops4Resource";
-            modules = [ ];
-            # TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
-            # once we're sure it's sane. leaving it here for better control during refactoring.
-            specialArgs = {
-              inherit sources;
-            };
-          });
-      };
-      config = {
      providers.local = inputs.nixops4.modules.nixops4Provider.local;
      resources = genAttrs vmNames (vmName: {
        type = providers.local.exec;
        imports = [
          inputs.nixops4-nixos.modules.nixops4Resource.nixos
-            (makeResourceModule {
-              inherit vmName;
-              isTestVm = false;
-            })
+          commonResourceModule
+          ../machines/dev/${vmName}
        ];
      });
    };
-    };
  makeDeployment' = vmName: makeDeployment [ vmName ];

  ## Given an attrset of test configurations (key = test machine name, value =
@ -110,21 +77,29 @@ let
        fediversity = import ../services/fediversity;
      }
      {
-        garageConfigurationResource = makeResourceModule {
-          vmName = "test01";
-          isTestVm = true;
+        garageConfigurationResource = {
+          imports = [
+            commonResourceModule
+            ../machines/operator/test01
+          ];
        };
-        mastodonConfigurationResource = makeResourceModule {
-          vmName = "test06"; # somehow `test02` has a problem - use test06 instead
-          isTestVm = true;
+        mastodonConfigurationResource = {
+          imports = [
+            commonResourceModule
+            ../machines/operator/test06 # somehow `test02` has a problem - use test06 instead
+          ];
        };
-        peertubeConfigurationResource = makeResourceModule {
-          vmName = "test05";
-          isTestVm = true;
+        peertubeConfigurationResource = {
+          imports = [
+            commonResourceModule
+            ../machines/operator/test05
+          ];
        };
-        pixelfedConfigurationResource = makeResourceModule {
-          vmName = "test04";
-          isTestVm = true;
+        pixelfedConfigurationResource = {
+          imports = [
+            commonResourceModule
+            ../machines/operator/test04
+          ];
        };
      };

@ -137,54 +112,63 @@ let
    ## this is only needed to expose NixOS configurations for provisioning
    ## purposes, and eventually all of this should be handled by NixOps4.
    options = {
-      nixos.module = mkOption { }; # NOTE: not just `nixos` otherwise merging will go wrong
+      nixos.module = mkOption { type = lib.types.deferredModule; }; # NOTE: not just `nixos` otherwise merging will go wrong
      nixpkgs = mkOption { };
      ssh = mkOption { };
    };
  };

  makeResourceConfig =
-    vm:
+    { vmName, isTestVm }:
    (evalModules {
      modules = [
        nixops4ResourceNixosMockOptions
-        (makeResourceModule vm)
+        commonResourceModule
+        (if isTestVm then ../machines/operator/${vmName} else ../machines/dev/${vmName})
      ];
    }).config;

  ## Given a VM name, make a NixOS configuration for this machine.
  makeConfiguration =
    isTestVm: vmName:
-    let
-      inherit (sources) nixpkgs;
-    in
-    import "${nixpkgs}/nixos" {
-      modules = [
-        (makeResourceConfig { inherit vmName isTestVm; }).nixos.module
-      ];
+    import "${sources.nixpkgs}/nixos" {
+      configuration = (makeResourceConfig { inherit vmName isTestVm; }).nixos.module;
+      system = "x86_64-linux";
    };

-  makeVmOptions = isTestVm: vmName: {
-    inherit ((makeResourceConfig { inherit vmName isTestVm; }).fediversityVm)
-      proxmox
+  makeVmOptions =
+    isTestVm: vmName:
+    let
+      config = (makeResourceConfig { inherit vmName isTestVm; }).fediversityVm;
+    in
+    if config.isFediversityVm then
+      {
+        inherit (config)
          vmId
          description
-
          sockets
          cores
          memory
          diskSize
-
          hostPublicKey
          unsafeHostPrivateKey
          ;
-  };
+      }
+    else
+      null;

  listSubdirectories = path: attrNames (filterAttrs (_: type: type == "directory") (readDir path));

  machines = listSubdirectories ../machines/dev;
  testMachines = listSubdirectories ../machines/operator;

+  nixosConfigurations =
+    genAttrs machines (makeConfiguration false)
+    // genAttrs testMachines (makeConfiguration true);
+  vmOptions =
+    filterAttrs (_: value: value != null) # Filter out non-Fediversity VMs
+      (genAttrs machines (makeVmOptions false) // genAttrs testMachines (makeVmOptions true));
+
 in
 {
  _class = "flake";
@ -208,10 +192,23 @@ in
      )
    );
  };
-  flake.nixosConfigurations =
-    genAttrs machines (makeConfiguration false)
-    // genAttrs testMachines (makeConfiguration true);
-  flake.vmOptions =
-    genAttrs machines (makeVmOptions false)
-    // genAttrs testMachines (makeVmOptions true);
+  flake = { inherit nixosConfigurations vmOptions; };
+
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks =
+        mapAttrs' (name: nixosConfiguration: {
+          name = "nixosConfigurations-${name}";
+          value = nixosConfiguration.config.system.build.toplevel;
+        }) nixosConfigurations
+        // mapAttrs' (name: vmOptions: {
+          name = "vmOptions-${name}";
+          ## Check that VM options builds/evaluates correctly. `deepSeq e1
+          ## e2` evaluates `e1` strictly in depth before returning `e2`. We
+          ## use this trick because checks need to be derivations, which VM
+          ## options are not.
+          value = deepSeq vmOptions pkgs.hello;
+        }) vmOptions;
+    };
 }
--- a/infra/proxmox-provision.sh
+++ b/infra/proxmox-provision.sh
@ -179,15 +179,9 @@ grab_vm_options () {
    --log-format raw --quiet
  )

-  proxmox=$(echo "$options" | jq -r .proxmox)
  vm_id=$(echo "$options" | jq -r .vmId)
  description=$(echo "$options" | jq -r .description)

-  if [ "$proxmox" != fediversity ]; then
-    die "I do not know how to provision things that are not Fediversity VMs,
-but I got proxmox = '%s' for VM %s." "$proxmox" "$vm_name"
-  fi
-
  sockets=$(echo "$options" | jq -r .sockets)
  cores=$(echo "$options" | jq -r .cores)
  memory=$(echo "$options" | jq -r .memory)
--- a/infra/proxmox-remove.sh
+++ b/infra/proxmox-remove.sh
@ -167,16 +167,10 @@ grab_vm_options () {
      --log-format raw --quiet
    )

-    proxmox=$(echo "$options" | jq -r .proxmox)
    vm_id=$(echo "$options" | jq -r .vmId)

-    if [ "$proxmox" != fediversity ]; then
-      die "I do not know how to remove things that are not Fediversity VMs,
-  but I got proxmox = '%s' for VM %s." "$proxmox" "$vm_name"
-    fi
-
-    printf 'done grabing VM options for VM %s. Found VM %d on %s Proxmox.\n' \
-      "$vm_name" "$vm_id" "$proxmox"
+    printf 'done grabing VM options for VM %s. Got id: %d.\n' \
+      "$vm_name" "$vm_id"
  fi
 }

--- a/machines/dev/fedi200/default.nix
+++ b/machines/dev/fedi200/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "fedi200";
+    isFediversityVm = true;
    vmId = 200;
-    proxmox = "fediversity";
    description = "Testing machine for Hans";

    domain = "abundos.eu";
@ -16,10 +17,4 @@
      gateway = "2a00:51c0:13:1305::1";
    };
  };
-
-  nixos.module = {
-    imports = [
-      ../../../infra/common/proxmox-qemu-vm.nix
-    ];
-  };
 }
--- a/machines/dev/fedi201/default.nix
+++ b/machines/dev/fedi201/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "fedi201";
+    isFediversityVm = true;
    vmId = 201;
-    proxmox = "fediversity";
    description = "FediPanel";

    domain = "abundos.eu";
@ -19,7 +20,6 @@

  nixos.module = {
    imports = [
-      ../../../infra/common/proxmox-qemu-vm.nix
      ./fedipanel.nix
    ];
  };
--- a/machines/dev/fedi201/fedipanel.nix
+++ b/machines/dev/fedi201/fedipanel.nix
@ -1,6 +1,5 @@
 {
  config,
-  sources,
  ...
 }:
 let
@ -11,7 +10,6 @@ in

  imports = [
    (import ../../../panel { }).module
-    "${sources.home-manager}/nixos"
  ];

  security.acme = {
--- a/machines/dev/forgejo-ci/default.nix
+++ b/machines/dev/forgejo-ci/default.nix
@ -20,7 +20,9 @@ in
  ssh.host = mkForce "forgejo-ci";

  fediversityVm = {
+    name = "forgejo-ci";
    domain = "procolix.com";
+    isFediversityVm = false;

    ipv4 = {
      interface = "enp1s0f0";
--- a/machines/dev/vm02116/default.nix
+++ b/machines/dev/vm02116/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "vm02116";
+    isFediversityVm = false;
    vmId = 2116;
-    proxmox = "procolix";
    description = "Forgejo";

    ipv4.address = "185.206.232.34";
@ -14,7 +15,6 @@
    { lib, ... }:
    {
      imports = [
-        ../../../infra/common/proxmox-qemu-vm.nix
        ./forgejo.nix
      ];

--- a/machines/dev/vm02187/default.nix
+++ b/machines/dev/vm02187/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "vm02187";
+    isFediversityVm = false;
    vmId = 2187;
-    proxmox = "procolix";
    description = "Wiki";

    ipv4.address = "185.206.232.187";
@ -14,7 +15,6 @@
    { lib, ... }:
    {
      imports = [
-        ../../../infra/common/proxmox-qemu-vm.nix
        ./wiki.nix
      ];

--- a/machines/operator/test01/default.nix
+++ b/machines/operator/test01/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test01";
+    isFediversityVm = true;
    vmId = 7001;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test02/default.nix
+++ b/machines/operator/test02/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test02";
+    isFediversityVm = true;
    vmId = 7002;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test03/default.nix
+++ b/machines/operator/test03/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test03";
+    isFediversityVm = true;
    vmId = 7003;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test04/default.nix
+++ b/machines/operator/test04/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test04";
+    isFediversityVm = true;
    vmId = 7004;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test05/default.nix
+++ b/machines/operator/test05/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test05";
+    isFediversityVm = true;
    vmId = 7005;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test06/default.nix
+++ b/machines/operator/test06/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test06";
+    isFediversityVm = true;
    vmId = 7006;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test11/default.nix
+++ b/machines/operator/test11/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test11";
+    isFediversityVm = true;
    vmId = 7011;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test12/default.nix
+++ b/machines/operator/test12/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test12";
+    isFediversityVm = true;
    vmId = 7012;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test13/default.nix
+++ b/machines/operator/test13/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test13";
+    isFediversityVm = true;
    vmId = 7013;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/machines/operator/test14/default.nix
+++ b/machines/operator/test14/default.nix
@ -2,8 +2,9 @@
  _class = "nixops4Resource";

  fediversityVm = {
+    name = "test14";
+    isFediversityVm = true;
    vmId = 7014;
-    proxmox = "fediversity";

    hostPublicKey = builtins.readFile ./ssh_host_ed25519_key.pub;
    unsafeHostPrivateKey = builtins.readFile ./ssh_host_ed25519_key;
--- a/npins/sources.json
+++ b/npins/sources.json
@ -9,9 +9,9 @@
      },
      "branch": "main",
      "submodules": false,
-      "revision": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
-      "url": "https://github.com/ryantm/agenix/archive/e600439ec4c273cf11e06fe4d9d906fb98fa097c.tar.gz",
-      "hash": "006ngydiykjgqs85cl19h9klq8kaqm5zs0ng51dnwy7nzgqxzsdr"
+      "revision": "531beac616433bac6f9e2a19feb8e99a22a66baf",
+      "url": "https://github.com/ryantm/agenix/archive/531beac616433bac6f9e2a19feb8e99a22a66baf.tar.gz",
+      "hash": "103slb8xy5sb68zxjjbb9d0svq8xz751a7yrg6vrz5rh4374bzgl"
    },
    "clan-core": {
      "type": "Git",
@ -147,9 +147,9 @@
      },
      "branch": "nixpkgs-unstable",
      "submodules": false,
-      "revision": "f33a4d26226c05d501b9d4d3e5e60a3a59991921",
-      "url": "https://github.com/nixos/nixpkgs/archive/f33a4d26226c05d501b9d4d3e5e60a3a59991921.tar.gz",
-      "hash": "1b6dm1sn0bdpcsmxna0zzspjaixa2dald08005fry5jrbjvwafdj"
+      "revision": "fa64ec5c1ca6f17746f3defedb988b9248e97616",
+      "url": "https://github.com/nixos/nixpkgs/archive/fa64ec5c1ca6f17746f3defedb988b9248e97616.tar.gz",
+      "hash": "0mvbhxikfjxasgbz9gbq4bnck9sa6kfrmy06w6j14qk1kdpbhl09"
    }
  },
  "version": 5
--- a/panel/nix/python-packages/django-pydantic-field/default.nix
+++ b/panel/nix/python-packages/django-pydantic-field/default.nix
@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  django,
-  pydantic,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  _class = "package";
-
-  pname = "django-pydantic-field";
-  version = "v0.3.12";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "surenkov";
-    repo = pname;
-    rev = version;
-    hash = "sha256-rlnS67OGljWD8Sbyutb43txAH0jA2+8ju1ntSEP3whM=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    django
-    pydantic
-  ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://github.com/${src.owner}/${pname}";
-    license = licenses.mit;
-  };
-}
--- a/panel/nix/python-packages/drf-pydantic/default.nix
+++ b/panel/nix/python-packages/drf-pydantic/default.nix
@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  django,
-  pydantic,
-  hatchling,
-  djangorestframework,
-}:
-
-buildPythonPackage rec {
-  _class = "package";
-
-  pname = "drf-pydantic";
-  version = "v2.7.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "georgebv";
-    repo = pname;
-    rev = version;
-    hash = "sha256-ABtSoxj/+HHq4hj4Yb6bEiyOl00TCO/9tvBzhv6afxM=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    hatchling
-  ];
-
-  propagatedBuildInputs = [
-    django
-    pydantic
-    djangorestframework
-  ];
-
-  meta = with lib; {
-    description = "";
-    homepage = "https://github.com/${src.owner}/${pname}";
-    license = licenses.mit;
-  };
-}
--- a/services/fediversity/garage/default.nix
+++ b/services/fediversity/garage/default.nix
@ -118,7 +118,7 @@ in

    services.garage = {
      enable = true;
-      package = pkgs.garage_0_9;
+      package = pkgs.garage_1;
      settings = {
        replication_mode = "none";
        # TODO: use a secret file
Author	SHA1	Message	Date
kiara	14b613264c	settle for garage 1 for now over breaking changes	2025-08-03 15:49:31 +02:00
Kiara Grouwstra	ec5e4277f9	try garage 2, given 0.9's EOL	2025-08-03 15:49:31 +02:00
Kiara Grouwstra	cc108eb5d5	update agenix, see https://github.com/ryantm/agenix/issues/331	2025-08-03 15:49:31 +02:00
Kiara Grouwstra	9cc92f58ff	use upstream versions of python packages	2025-08-03 15:49:31 +02:00
Nicolas “Niols” Jeannerod	1f99a4c6c3	`listToAttrs` o `map` o `attrsToList` → `mapAttrs'` (#489 ) Reviewed-on: Fediversity/Fediversity#489 Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>	2025-08-01 13:09:26 +02:00
Nicolas “Niols” Jeannerod	588bb77a94	Infra: expose and use checks for vmOptions and nixosConfigurations (#488 ) Following Fediversity/Fediversity#478 (comment), here is a PR that plugs the infra's `vmOptions` and `nixosConfigurations` outputs into flake checks, instead of calling random Nix commands from the CI. There is still a bit of magic in the CI, but that's because we don't have yet a Nix-aware CI that exposes one job per flake check. Reviewed-on: Fediversity/Fediversity#488 Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>	2025-07-31 15:41:02 +02:00
Nicolas “Niols” Jeannerod	df3a070fa4	Infra: get rid of `makeResourceModule` (#485 ) Reviewed-on: Fediversity/Fediversity#485 Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io> Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>	2025-07-31 00:49:00 +02:00
Nicolas “Niols” Jeannerod	be72b82875	Link to upstreaming PR for `lib.types.fileset` (#487 ) Reviewed-on: Fediversity/Fediversity#487 Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>	2025-07-30 13:25:22 +02:00
Nicolas “Niols” Jeannerod	1b66028f32	Fix infra and add more tests (#478 ) This PR contains a bunch of small fixes having to do with infra code. The goal is not to fix everything as that would require a full rewrite. Instead, we fix just what is necessary to get some testing going on. Once that is available, we will be able to work on a full refactor with more guarantees. Something of note is that most of the difficulty was to find code that would make both `nixops4 apply` _and_ `nix build .#nixosConfigurations.<machine>` happy. The takeaway is that the tests that we are adding now will not catch a whole class of tests having to do with how NixOps4 wires up the resources. Still, this is probably less significant as we are supposed to use NixOps4 every now and then. The commits should be read separately. Reviewed-on: Fediversity/Fediversity#478 Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>	2025-07-30 12:31:03 +02:00
Kiara Grouwstra	4509d277d3	move arguments from `_module.args` to `specialArgs` (#469 ) Reviewed-on: Fediversity/Fediversity#469 Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io> Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-23 18:12:55 +02:00
Kiara Grouwstra	e488230d7b	updater: make npins command verbose (#477 ) Reviewed-on: Fediversity/Fediversity#477 Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-19 13:00:33 +02:00