Henry-Hiles/nixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump sable

Browse source
This commit is contained in:
Henry Hiles 2026-05-13 10:29:52 -04:00
commit 1d87dce992
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 162 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

19
clients/quadraticserver/matrix/cinny.nix
View file

@ -2,11 +2,7 @@
{ {
services.caddy.virtualHosts = services.caddy.virtualHosts =
let let
mkCinny = package: { commonConf = {
extraConfig = ''
root ${
pkgs.cinny.override {
conf = {
defaultHomeserver = 0; defaultHomeserver = 0;
homeserverList = [ "federated.nexus" ]; homeserverList = [ "federated.nexus" ];
allowCustomHomeservers = false; allowCustomHomeservers = false;
@ -18,6 +14,11 @@
rooms = { }; rooms = { };
}; };
}; };
mkCinny = package: extraConf: {
extraConfig = ''
root ${
pkgs.cinny.override {
conf = commonConf // extraConf;
cinny-unwrapped = package; cinny-unwrapped = package;
} }
} }
@ -28,11 +29,11 @@
in in
{ {
"app.federated.nexus" = "app.federated.nexus" =
mkCinny mkCinny inputs.sable.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.nixpkgs-sable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.sable-unwrapped; { };
"staging.app.federated.nexus" = "staging.app.federated.nexus" =
mkCinny mkCinny inputs.sable.packages.${pkgs.stdenv.hostPlatform.system}.default
inputs.nixpkgs-sable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.sable-unwrapped; { };
}; };
} }

178
flake.lock generated
View file

@ -772,6 +772,22 @@
} }
}, },
"flake-compat_4": { "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1747046372,
@ -805,6 +821,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_10": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
@ -915,17 +952,14 @@
}, },
"flake-parts_8": { "flake-parts_8": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib_8"
"sdm845",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1777988971,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -937,16 +971,16 @@
"flake-parts_9": { "flake-parts_9": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"stylix", "sdm845",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1751413152,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1109,6 +1143,29 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"gitignore": "gitignore",
"nixpkgs": [
"sable",
"nixpkgs"
]
},
"locked": {
"lastModified": 1776796298,
"narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-hooks-nix": { "git-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -1138,6 +1195,28 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"sable",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore-nix": { "gitignore-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -2359,6 +2438,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_8": {
"locked": {
"lastModified": 1777168982,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1778426307, "lastModified": 1778426307,
@ -2390,22 +2484,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-sable": {
"locked": {
"lastModified": 1778181521,
"narHash": "sha256-TT3Co88Pg+nCZiQb8JAnENCSZOFupmCn/puJOlqsgt0=",
"owner": "fugidev",
"repo": "nixpkgs",
"rev": "b2b8da2110777ba61e6803457020b74dfcc38f9d",
"type": "github"
},
"original": {
"owner": "fugidev",
"ref": "sable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1752162966, "lastModified": 1752162966,
@ -2709,7 +2787,6 @@
"nix-matrix-appservices": "nix-matrix-appservices", "nix-matrix-appservices": "nix-matrix-appservices",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-sable": "nixpkgs-sable",
"redlib": "redlib", "redlib": "redlib",
"run0-sudo-shim": "run0-sudo-shim", "run0-sudo-shim": "run0-sudo-shim",
"sable": "sable", "sable": "sable",
@ -2796,18 +2873,26 @@
} }
}, },
"sable": { "sable": {
"flake": false, "inputs": {
"flake-parts": "flake-parts_8",
"git-hooks": "git-hooks",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_3"
},
"locked": { "locked": {
"lastModified": 1778272146, "lastModified": 1778652556,
"narHash": "sha256-wz1BZZQ66fgsdFCpB/SRaCYb9abxiCZjbDA7XZgxwI0=", "narHash": "sha256-IinpTWoUH/S3Hb9Sw667rNlyReNa60Tokj12e64GRbo=",
"owner": "sableclient", "owner": "sableclient",
"repo": "sable", "repo": "sable",
"rev": "c223f354a90a243ef4f24fcdc535d59d90447af4", "rev": "c2bb68345a3feebd62ebff09993c10cbcd1dd941",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "sableclient", "owner": "sableclient",
"repo": "sable", "repo": "sable",
"rev": "c2bb68345a3feebd62ebff09993c10cbcd1dd941",
"type": "github" "type": "github"
} }
}, },
@ -2826,8 +2911,8 @@
"disko": "disko_2", "disko": "disko_2",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"fenix": "fenix_2", "fenix": "fenix_2",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_5",
"flake-parts": "flake-parts_8", "flake-parts": "flake-parts_9",
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
@ -2877,7 +2962,7 @@
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_4", "systems": "systems_4",
"treefmt-nix": "treefmt-nix_3", "treefmt-nix": "treefmt-nix_4",
"weird-deployer": "weird-deployer" "weird-deployer": "weird-deployer"
}, },
"locked": { "locked": {
@ -2922,7 +3007,7 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme_2", "firefox-gnome-theme": "firefox-gnome-theme_2",
"flake-parts": "flake-parts_9", "flake-parts": "flake-parts_10",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -3130,6 +3215,27 @@
} }
}, },
"treefmt-nix_3": { "treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"sable",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_4": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"sdm845", "sdm845",

5
flake.nix
View file

@ -2,7 +2,6 @@
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-sable.url = "github:fugidev/nixpkgs/sable";
nixpkgs-master.url = "github:nixos/nixpkgs"; nixpkgs-master.url = "github:nixos/nixpkgs";
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";
@ -20,8 +19,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sable = { sable = {
url = "github:sableclient/sable"; url = "github:sableclient/sable?rev=c2bb68345a3feebd62ebff09993c10cbcd1dd941";
flake = false; inputs.nixpkgs.follows = "nixpkgs";
}; };
redlib = { redlib = {
url = "github:Silvenga/redlib"; url = "github:Silvenga/redlib";