Add sable, bump c10y

This commit is contained in:
Henry Hiles 2026-04-24 16:34:17 -04:00
commit 403d4578eb
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 73 additions and 55 deletions

View file

@ -2,7 +2,7 @@
{ {
services.caddy.virtualHosts = services.caddy.virtualHosts =
let let
mkCinny = override: { mkCinny = package: {
extraConfig = '' extraConfig = ''
root ${ root ${
pkgs.cinny.override { pkgs.cinny.override {
@ -11,7 +11,7 @@
homeserverList = [ "federated.nexus" ]; homeserverList = [ "federated.nexus" ];
allowCustomHomeservers = false; allowCustomHomeservers = false;
}; };
cinny-unwrapped = pkgs.cinny-unwrapped.overrideAttrs override; cinny-unwrapped = package;
} }
} }
try_files {path} {path}/ /index.html try_files {path} {path}/ /index.html
@ -20,7 +20,8 @@
}; };
in in
{ {
"app.federated.nexus" = mkCinny (old: rec { "app.federated.nexus" = mkCinny (
pkgs.cinny-unwrapped.overrideAttrs (old: rec {
src = pkgs.fetchFromCodeberg { src = pkgs.fetchFromCodeberg {
owner = "lapingvino"; owner = "lapingvino";
repo = "cinny"; repo = "cinny";
@ -32,15 +33,11 @@
name = "${old.pname}-${old.version}-npm-deps"; name = "${old.pname}-${old.version}-npm-deps";
hash = "sha256-a4cnxo5smN+a6DWKPPkbGkd8gcQe/jazSEmrqKcN0fA="; 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=";
};
});
}; };
} }

76
flake.lock generated
View file

@ -355,16 +355,16 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1776446368, "lastModified": 1777058507,
"narHash": "sha256-DrW31VesYipZlFpCoCv4Sj4BtKeAF9/UpWhZjBIrXH4=", "narHash": "sha256-o7bZMSsdSt6VOrsuSMrS7fU9u/LrdD/579IMvsZH+ss=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c927bc7b303164fb2d134f50ab2d9231684c6088", "rev": "b9989f1713dc8042d7ef3ed66bb805e7cb531329",
"revCount": 6547, "revCount": 6603,
"type": "git", "type": "git",
"url": "https://forgejo.ellis.link/continuwuation/continuwuity" "url": "https://forgejo.ellis.link/continuwuation/continuwuity"
}, },
"original": { "original": {
"rev": "c927bc7b303164fb2d134f50ab2d9231684c6088", "rev": "b9989f1713dc8042d7ef3ed66bb805e7cb531329",
"type": "git", "type": "git",
"url": "https://forgejo.ellis.link/continuwuation/continuwuity" "url": "https://forgejo.ellis.link/continuwuation/continuwuity"
} }
@ -2241,14 +2241,17 @@
}, },
"nixpkgs-custom": { "nixpkgs-custom": {
"locked": { "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": { "original": {
"path": "/home/quadradical/Documents/Code/nixpkgs", "owner": "Henry-Hiles",
"type": "path" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-latest": { "nixpkgs-latest": {
@ -2388,6 +2391,22 @@
"type": "github" "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": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1752162966, "lastModified": 1752162966,
@ -2691,11 +2710,12 @@
"nix-matrix-appservices": "nix-matrix-appservices", "nix-matrix-appservices": "nix-matrix-appservices",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-custom": "nixpkgs-custom", "nixpkgs-custom": "nixpkgs-custom",
"nixpkgs-sable": "nixpkgs-sable",
"redlib": "redlib", "redlib": "redlib",
"run0-sudo-shim": "run0-sudo-shim", "run0-sudo-shim": "run0-sudo-shim",
"sable": "sable",
"sdm845": "sdm845", "sdm845": "sdm845",
"stylix": "stylix", "stylix": "stylix",
"wally": "wally",
"wrapper-manager": "wrapper-manager" "wrapper-manager": "wrapper-manager"
} }
}, },
@ -2776,6 +2796,22 @@
"type": "github" "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": { "sdm845": {
"inputs": { "inputs": {
"ace-bot": "ace-bot", "ace-bot": "ace-bot",
@ -3133,22 +3169,6 @@
"type": "github" "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": { "weird-deployer": {
"locked": { "locked": {
"lastModified": 1728549622, "lastModified": 1728549622,

View file

@ -2,12 +2,13 @@
inputs = { inputs = {
gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile"; gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 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"; wrapper-manager.url = "github:viperML/wrapper-manager";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
nix-maid.url = "github:viperML/nix-maid"; nix-maid.url = "github:viperML/nix-maid";
continuwuity = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
@ -18,8 +19,8 @@
url = "github:lordgrimmauld/run0-sudo-shim"; url = "github:lordgrimmauld/run0-sudo-shim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
wally = { sable = {
url = "git+https://codeberg.org/lapingvino/cinny"; url = "github:sableclient/sable";
flake = false; flake = false;
}; };
redlib = { redlib = {