settle for garage 1 for now over breaking changes

Reviewed-on: Fediversity/Fediversity#475
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>

.forgejo/workflows/cd.yaml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch: # allows manual triggering
   push:
     branches:
-      # - main
+      - main
 
 jobs:
   deploy:

.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:

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" ];

npins/sources.json

@@ -9,9 +9,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+      "revision": "531beac616433bac6f9e2a19feb8e99a22a66baf",
-      "url": "https://github.com/ryantm/agenix/archive/e600439ec4c273cf11e06fe4d9d906fb98fa097c.tar.gz",
+      "url": "https://github.com/ryantm/agenix/archive/531beac616433bac6f9e2a19feb8e99a22a66baf.tar.gz",
-      "hash": "006ngydiykjgqs85cl19h9klq8kaqm5zs0ng51dnwy7nzgqxzsdr"
+      "hash": "103slb8xy5sb68zxjjbb9d0svq8xz751a7yrg6vrz5rh4374bzgl"
     },
     "clan-core": {
       "type": "Git",
@@ -147,9 +147,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "f33a4d26226c05d501b9d4d3e5e60a3a59991921",
+      "revision": "fa64ec5c1ca6f17746f3defedb988b9248e97616",
-      "url": "https://github.com/nixos/nixpkgs/archive/f33a4d26226c05d501b9d4d3e5e60a3a59991921.tar.gz",
+      "url": "https://github.com/nixos/nixpkgs/archive/fa64ec5c1ca6f17746f3defedb988b9248e97616.tar.gz",
-      "hash": "1b6dm1sn0bdpcsmxna0zzspjaixa2dald08005fry5jrbjvwafdj"
+      "hash": "0mvbhxikfjxasgbz9gbq4bnck9sa6kfrmy06w6j14qk1kdpbhl09"
     }
   },
   "version": 5

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;
-  };
-}

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;
-  };
-}

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