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-07-20 23:51:04 +02:00 · 2025-07-20 23:51:04 +02:00 · 2025-07-20 23:51:04 +02:00 · 2025-07-20 23:51:04 +02:00 · 2025-07-17 19:02:14 +02:00 · 2025-07-17 18:59:31 +02:00
7 changed files with 14 additions and 92 deletions
--- a/.forgejo/workflows/cd.yaml
+++ b/.forgejo/workflows/cd.yaml
@ -4,7 +4,7 @@ on:
  workflow_dispatch: # allows manual triggering
  push:
    branches:
-      # - main
+      - main

 jobs:
  deploy:
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@ -27,12 +27,6 @@ jobs:
      - uses: actions/checkout@v4
      - run: nix build .#checks.x86_64-linux.test-mastodon-service -L

-  check-pixelfed:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.test-pixelfed-garage-service -L
-
  check-peertube:
    runs-on: native
    steps:
--- a/infra/common/nixos/users.nix
+++ b/infra/common/nixos/users.nix
@ -1,7 +1,13 @@
+{
+  config,
+  ...
+}:
 {
  _class = "nixos";

  users.users = {
+    root.openssh.authorizedKeys.keys = config.users.users.procolix.openssh.authorizedKeys.keys;
+
    procolix = {
      isNormalUser = true;
      extraGroups = [ "wheel" ];
--- 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	d60089b2b3	settle for garage 1 for now over breaking changes	2025-07-20 23:51:04 +02:00
Kiara Grouwstra	f7d23a2414	try garage 2, given 0.9's EOL	2025-07-20 23:51:04 +02:00
Kiara Grouwstra	523c46c28e	update agenix, see https://github.com/ryantm/agenix/issues/331	2025-07-20 23:51:04 +02:00
Kiara Grouwstra	e17de777cc	use upstream versions of python packages	2025-07-20 23:51:04 +02:00
Kiara Grouwstra	765183cd0d	fix typo in users (#475 ) Reviewed-on: Fediversity/Fediversity#475 Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-17 19:02:14 +02:00
Kiara Grouwstra	6cf1d87f0b	get parity in authorized keys between procolix and root for nixops4 ssh to non-VMs (#474 ) Reviewed-on: Fediversity/Fediversity#474 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-17 18:59:31 +02:00
Kiara Grouwstra	8253288f8a	remove pixelfed from CI until fixed (#472 ) this test is still borked as per #33. the intent would be to get this test on a feature branch pertaining to that issue - the point being we should be able to rely on CI's boolean result for detecting (newly induced) regressions. Reviewed-on: Fediversity/Fediversity#472 Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-17 15:25:17 +02:00
Kiara Grouwstra	67f50f08de	enable continuous deployment (#471 ) closes #177 Reviewed-on: Fediversity/Fediversity#471 Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-17 10:01:51 +02:00