Fix server

3 files changed, 16 insertions, 8 deletions

diff --git a/flake.lock b/flake.lock

index d7dbde4..52c0742 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1305,7 +1305,7 @@
       },
       "locked": {
         "lastModified": 1737779835,
-        "narHash": "sha256-TY7cnYqhgxIXZCltcFxYuKQ6Hpt3gouuYn0rj9URsp4=",
+        "narHash": "sha256-iZ/kQ/XFqIx053AuSHhCwu3HA8627ognYiJl/LRNpD0=",
         "ref": "refs/heads/master",
         "rev": "11cc65efa2909bdc7e3e978bf1f56f6d141bf82a",
         "revCount": 11,
diff --git a/flake.nix b/flake.nix

index 5635d10..ef9b5e9 100755
--- a/flake.nix
+++ b/flake.nix
@@ -138,7 +138,7 @@
             ooye.modules.default
 
             (
-              { pkgs, lib, ... }:
+              { pkgs, lib,  ... }:
               {
                 disabledModules = [ "services/matrix/synapse.nix" ];
                 imports = [
@@ -147,12 +147,19 @@
                 ];
                 nixpkgs.overlays = [
                   (final: prev: {
-                    matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped.overrideAttrs (oldAttrs: {
+                    matrix-synapse-unwrapped = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped.overrideAttrs (oldAttrs: rec {
                       patches = oldAttrs.patches ++ lib.map (
                         path: ./packages/overlays/matrix-synapse/patches/${path}
                       ) (builtins.attrNames (builtins.readDir ./packages/overlays/matrix-synapse/patches));
-                      
-                      cargoDeps = prev.cargoDeps.override { hash = ""; }; 
+
+                      cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+                        inherit (oldAttrs) src;
+                        inherit patches;
+                        name = "${oldAttrs.pname}-${oldAttrs.version}";
+                        #hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM=";
+                        hash = "sha256-leYnFxIlNnpjaIbfVRphFVpqWmueTkvHeNU8sFFxUeI=";
+                        #hash = "";
+                      };
                     });
                     #draupnir = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
                     draupnir = inputs.nixpkgs-DraupnirPkg.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
diff --git a/host/Rory-ovh/services/cgit.nix b/host/Rory-ovh/services/cgit.nix

index dad6f3f..cbdc350 100644
--- a/host/Rory-ovh/services/cgit.nix
+++ b/host/Rory-ovh/services/cgit.nix
@@ -1,19 +1,20 @@
 { pkgs, lib, cgit-magenta, ... }:
 
 let
+  pkg = cgit-magenta.packages.${pkgs.stdenv.hostPlatform.system}.default;
   base_cgit_config = {
     enable = true;
     nginx.virtualHost = "cgit.rory.gay";
     #package = pkgs.cgit-pink;
-    package = cgit-magenta.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    package = pkg;
     scanPath = "/data/git";
     settings = {
       css = "/cgit.css";
       logo = "/cgit.png";
       favicon = "/favicon.ico";
       readme = ":README.MD";
-      about-filter = "${pkgs.cgit-pink}/lib/cgit/filters/about-formatting.sh";
-      source-filter = "${pkgs.cgit-pink}/lib/cgit/filters/syntax-highlighting.py";
+      about-filter = "${pkg}/lib/cgit/filters/about-formatting.sh";
+      source-filter = "${pkg}/lib/cgit/filters/syntax-highlighting.py";
       clone-url = (
         lib.concatStringsSep " " [
           "https://cgit.rory.gay/$CGIT_REPO_URL"