Add sable, bump c10y

clients/quadraticserver/matrix/cinny.nix

@@ -2,7 +2,7 @@
 {
   services.caddy.virtualHosts =
     let
-      mkCinny = override: {
+      mkCinny = package: {
         extraConfig = ''
           root ${
             pkgs.cinny.override {
@@ -11,7 +11,7 @@
                 homeserverList = [ "federated.nexus" ];
                 allowCustomHomeservers = false;
               };
-              cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs override;
+              cinny-unwrapped = package;
             }
           }
           try_files {path} {path}/ /index.html
@@ -20,27 +20,24 @@
       };
     in
     {
-      "app.federated.nexus" = mkCinny (old: rec {
+      "app.federated.nexus" = mkCinny (
-        src = pkgs.fetchFromCodeberg {
+        pkgs.cinny-unwrapped.overrideAttrs (old: rec {
-          owner = "lapingvino";
+          src = pkgs.fetchFromCodeberg {
-          repo = "cinny";
+            owner = "lapingvino";
-          rev = "d5ba8537a418a0950adad6f7c4f488078dff6a13";
+            repo = "cinny";
-          hash = "sha256-+WOpBpSzXgBbG5RyMotvJWauPOKjbSI7X6XaRNssd/I=";
+            rev = "d5ba8537a418a0950adad6f7c4f488078dff6a13";
-        };
+            hash = "sha256-+WOpBpSzXgBbG5RyMotvJWauPOKjbSI7X6XaRNssd/I=";
-        npmDeps = pkgs.fetchNpmDeps {
+          };
-          inherit src;
+          npmDeps = pkgs.fetchNpmDeps {
-          name = "${old.pname}-${old.version}-npm-deps";
+            inherit src;
-          hash = "sha256-a4cnxo5smN+a6DWKPPkbGkd8gcQe/jazSEmrqKcN0fA=";
+            name = "${old.pname}-${old.version}-npm-deps";
-        };
+            hash = "sha256-a4cnxo5smN+a6DWKPPkbGkd8gcQe/jazSEmrqKcN0fA=";
-      });
+          };
+        })
+      );
 
-      "staging.app.federated.nexus" = mkCinny (old: rec {
+      "staging.app.federated.nexus" =
-        src = inputs.wally;
+        mkCinny
-        npmDeps = pkgs.fetchNpmDeps {
+          inputs.nixpkgs-sable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.sable-unwrapped;
-          inherit src;
-          name = "${old.pname}-${old.version}-npm-deps";
-          hash = "sha256-zlO2wTdzzZFB9j1GDIF9JDhLPNFov/tlRz4ICTfw0r0=";
-        };
-      });
     };
 }

flake.lock

@@ -355,16 +355,16 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1776446368,
+        "lastModified": 1777058507,
-        "narHash": "sha256-DrW31VesYipZlFpCoCv4Sj4BtKeAF9/UpWhZjBIrXH4=",
+        "narHash": "sha256-o7bZMSsdSt6VOrsuSMrS7fU9u/LrdD/579IMvsZH+ss=",
         "ref": "refs/heads/main",
-        "rev": "c927bc7b303164fb2d134f50ab2d9231684c6088",
+        "rev": "b9989f1713dc8042d7ef3ed66bb805e7cb531329",
-        "revCount": 6547,
+        "revCount": 6603,
         "type": "git",
         "url": "https://forgejo.ellis.link/continuwuation/continuwuity"
       },
       "original": {
-        "rev": "c927bc7b303164fb2d134f50ab2d9231684c6088",
+        "rev": "b9989f1713dc8042d7ef3ed66bb805e7cb531329",
         "type": "git",
         "url": "https://forgejo.ellis.link/continuwuation/continuwuity"
       }
@@ -2241,14 +2241,17 @@
     },
     "nixpkgs-custom": {
       "locked": {
-        "lastModified": 1776470189,
+        "lastModified": 1776470595,
-        "narHash": "sha256-kwzsHPt7X5w5dbS5Gi5EWlBpq8hJCi/7Zwlb17OXlG4=",
+        "narHash": "sha256-H3cJpjDVJ4n7Ja0trsVKh2GdoaGjK0N3mreJxzFawjQ=",
-        "path": "/home/quadradical/Documents/Code/nixpkgs",
+        "owner": "Henry-Hiles",
-        "type": "path"
+        "repo": "nixpkgs",
+        "rev": "3c881e4cb8220f4d49cb2a745a26f6a51b13c407",
+        "type": "github"
       },
       "original": {
-        "path": "/home/quadradical/Documents/Code/nixpkgs",
+        "owner": "Henry-Hiles",
-        "type": "path"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-latest": {
@@ -2388,6 +2391,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-sable": {
+      "locked": {
+        "lastModified": 1776434989,
+        "narHash": "sha256-Ea2VvvdK5RK5tuZ/BC5dWo6F0xr3fQl4giOemrXGbvs=",
+        "owner": "fugidev",
+        "repo": "nixpkgs",
+        "rev": "2fc2b588f26d93ca3e5637ea237f2f00fabd41de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fugidev",
+        "ref": "sable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1752162966,
@@ -2691,11 +2710,12 @@
         "nix-matrix-appservices": "nix-matrix-appservices",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-custom": "nixpkgs-custom",
+        "nixpkgs-sable": "nixpkgs-sable",
         "redlib": "redlib",
         "run0-sudo-shim": "run0-sudo-shim",
+        "sable": "sable",
         "sdm845": "sdm845",
         "stylix": "stylix",
-        "wally": "wally",
         "wrapper-manager": "wrapper-manager"
       }
     },
@@ -2776,6 +2796,22 @@
         "type": "github"
       }
     },
+    "sable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776983101,
+        "narHash": "sha256-W9YHv4EV4yfkHlJdoAKuI7LX2bMB89+LN+6960Eu3Ic=",
+        "owner": "sableclient",
+        "repo": "sable",
+        "rev": "cbb225168b6e262dcc2520ec5e4ca2edbff4ee59",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sableclient",
+        "repo": "sable",
+        "type": "github"
+      }
+    },
     "sdm845": {
       "inputs": {
         "ace-bot": "ace-bot",
@@ -3133,22 +3169,6 @@
         "type": "github"
       }
     },
-    "wally": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1774908360,
-        "narHash": "sha256-xvYZmpADqk+rfier0vp/qH74MSIvCJudSYKn1SlyUG4=",
-        "ref": "refs/heads/main",
-        "rev": "0ef1918ef8ad4ed3465519812c421fad542f5dfa",
-        "revCount": 1673,
-        "type": "git",
-        "url": "https://codeberg.org/lapingvino/cinny"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/lapingvino/cinny"
-      }
-    },
     "weird-deployer": {
       "locked": {
         "lastModified": 1728549622,

flake.nix

@@ -2,12 +2,13 @@
   inputs = {
     gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-custom.url = "/home/quadradical/Documents/Code/nixpkgs";
+    nixpkgs-custom.url = "github:Henry-Hiles/nixpkgs";
+    nixpkgs-sable.url = "github:fugidev/nixpkgs/sable";
     wrapper-manager.url = "github:viperML/wrapper-manager";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nix-maid.url = "github:viperML/nix-maid";
     continuwuity = {
-      url = "git+https://forgejo.ellis.link/continuwuation/continuwuity?rev=c927bc7b303164fb2d134f50ab2d9231684c6088";
+      url = "git+https://forgejo.ellis.link/continuwuation/continuwuity?rev=b9989f1713dc8042d7ef3ed66bb805e7cb531329";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
@@ -18,8 +19,8 @@
       url = "github:lordgrimmauld/run0-sudo-shim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    wally = {
+    sable = {
-      url = "git+https://codeberg.org/lapingvino/cinny";
+      url = "github:sableclient/sable";
       flake = false;
     };
     redlib = {