1 files changed, 21 insertions, 10 deletions

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

index 7c8dd12..675a614 100755
--- a/flake.nix
+++ b/flake.nix
@@ -18,9 +18,9 @@
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
 
-#    nixpkgs-stable = {
-#      url = "github:NixOS/nixpkgs/nixos-24.11";
-#    };
+    #    nixpkgs-stable = {
+    #      url = "github:NixOS/nixpkgs/nixos-24.11";
+    #    };
 
     nixpkgs-master = {
       url = "github:NixOS/nixpkgs/master";
@@ -34,7 +34,7 @@
     # Draupnir module/package
     #nixpkgs-DraupnirPkg.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
     #nixpkgs-DraupnirPkg.url = "github:NixOS/nixpkgs/master";
-#    nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
+    #    nixpkgs-keydb.url = "github:NixOS/nixpkgs?rev=e0464e47880a69896f0fb1810f00e0de469f770a";
     #MatrixContentFilter.url = "git+file:/home/Rory/git/matrix/MatrixContentFilter?submodules=1";
 
     # Base modules
@@ -51,9 +51,15 @@
     #      flake = false;
     #    };
 
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
+
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.lix.follows = "lix";
     };
 
     # Own projects/custom modules
@@ -140,7 +146,7 @@
             safeNSound.nixosModules.default
 
             (
-              { pkgs, lib,  ... }:
+              { pkgs, lib, ... }:
               {
                 disabledModules = [ "services/matrix/synapse.nix" ];
                 imports = [
@@ -171,6 +177,8 @@
             inherit cgit-magenta;
 
             inherit (inputs) draupnirSrc;
+            inherit (inputs) nixpkgs-master;
+            matrix-synapse-unwrapped-patched = self.packages.x86_64-linux.matrix-synapse-unwrapped-patched;
           };
         };
 
@@ -416,17 +424,20 @@
 
         packages.redpanda-connect = (pkgs.callPackage ./packages/redpanda-connect/default.nix { });
         packages.matrix-synapse-unwrapped-patched = pkgs-master.matrix-synapse-unwrapped.overrideAttrs (oldAttrs: rec {
-          patches = (if oldAttrs ? patches then oldAttrs.patches else []) ++ pkgs.lib.map (
-            path: ./packages/overlays/matrix-synapse/patches/${path}
-          ) (builtins.attrNames (builtins.readDir ./packages/overlays/matrix-synapse/patches));
+          patches =
+            (if oldAttrs ? patches then oldAttrs.patches else [ ])
+            ++ pkgs.lib.map (path: ./packages/overlays/matrix-synapse/patches/${path}) (builtins.attrNames (builtins.readDir ./packages/overlays/matrix-synapse/patches));
 
           cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
             inherit (oldAttrs) src;
             inherit patches;
             name = "${oldAttrs.pname}-${oldAttrs.version}";
-            hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
+            hash = "sha256-BfLj+cqS6zpX2qLb+Rur4cy7CyPH2KzdXaTXpNK20DM=";
           };
         });
+        packages.matrix-synapse-patched = pkgs-master.matrix-synapse.override {
+          matrix-synapse-unwrapped = self.packages.${pkgs.stdenv.hostPlatform.system}.matrix-synapse-unwrapped-patched;
+        };
       }
     );
 }