From 09b90433e6d448b84540d8a1341dc2b089bbcd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net> Date: Sat, 17 May 2025 15:46:26 +0800 Subject: [PATCH] feat(conduit): Switch from conduwuit to continuwuity --- configuration/services/conduit/default.nix | 2 +- flake.lock | 59 +++++++++++----------- flake.nix | 4 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/configuration/services/conduit/default.nix b/configuration/services/conduit/default.nix index 5a2b8ac..94d401a 100644 --- a/configuration/services/conduit/default.nix +++ b/configuration/services/conduit/default.nix @@ -20,7 +20,7 @@ in services.matrix-conduit = { enable = true; - package = flake-inputs.conduwuit.packages.${pkgs.system}.default; + package = flake-inputs.continuwuity.packages.${pkgs.system}.default; settings.global = { address = "127.0.0.1"; server_name = domain; diff --git a/flake.lock b/flake.lock index 80f2bc5..c17c613 100644 --- a/flake.lock +++ b/flake.lock @@ -49,17 +49,17 @@ "cachix_2": { "inputs": { "devenv": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], "flake-compat": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], "git-hooks": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], @@ -199,7 +199,7 @@ "type": "github" } }, - "conduwuit": { + "continuwuity": { "inputs": { "attic": "attic", "cachix": "cachix", @@ -216,23 +216,24 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1744169934, - "narHash": "sha256-5YyHmPUUrXXrczWayji9327knihVTKnmjX+vX6+p6d0=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "d8311a5ff672fdc4729d956af5e3af8646b0670d", - "type": "github" + "lastModified": 1745186840, + "narHash": "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o=", + "ref": "refs/tags/v0.5.0-rc.5", + "rev": "0a0f327ae034f5c44b12a3154cc1143aff10291c", + "revCount": 5147, + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/continuwuity.git" }, "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" + "ref": "refs/tags/v0.5.0-rc.5", + "type": "git", + "url": "https://forgejo.ellis.link/continuwuation/continuwuity.git" } }, "crane": { "inputs": { "nixpkgs": [ - "conduwuit", + "continuwuity", "attic", "nixpkgs" ] @@ -390,18 +391,18 @@ "inputs": { "cachix": "cachix_2", "flake-compat": [ - "conduwuit", + "continuwuity", "cachix", "flake-compat" ], "git-hooks": [ - "conduwuit", + "continuwuity", "cachix", "git-hooks" ], "nix": "nix", "nixpkgs": [ - "conduwuit", + "continuwuity", "cachix", "nixpkgs" ] @@ -535,7 +536,7 @@ "fenix": { "inputs": { "nixpkgs": [ - "conduwuit", + "continuwuity", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" @@ -703,7 +704,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "conduwuit", + "continuwuity", "attic", "nixpkgs" ] @@ -725,7 +726,7 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "conduwuit", + "continuwuity", "cachix", "devenv", "nix", @@ -947,13 +948,13 @@ "git-hooks": { "inputs": { "flake-compat": [ - "conduwuit", + "continuwuity", "cachix", "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ - "conduwuit", + "continuwuity", "cachix", "nixpkgs" ], @@ -976,7 +977,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "conduwuit", + "continuwuity", "cachix", "git-hooks", "nixpkgs" @@ -1104,7 +1105,7 @@ "nix": { "inputs": { "flake-compat": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], @@ -1112,17 +1113,17 @@ "libgit2": "libgit2", "nixpkgs": "nixpkgs_3", "nixpkgs-23-11": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], "nixpkgs-regression": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ], "pre-commit-hooks": [ - "conduwuit", + "continuwuity", "cachix", "devenv" ] @@ -1161,7 +1162,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "conduwuit", + "continuwuity", "attic", "nixpkgs" ] @@ -1631,7 +1632,7 @@ }, "root": { "inputs": { - "conduwuit": "conduwuit", + "continuwuity": "continuwuity", "deploy-rs": "deploy-rs", "disko": "disko", "foundryvtt": "foundryvtt", diff --git a/flake.nix b/flake.nix index 4f17def..bdb60ed 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; - conduwuit = { - url = "github:girlbossceo/conduwuit"; + continuwuity = { + url = "git+https://forgejo.ellis.link/continuwuation/continuwuity.git?ref=refs/tags/v0.5.0-rc.5"; inputs.nixpkgs.follows = "nixpkgs"; }; disko = {