Compare commits

...
3 Commits
Author SHA1 Message Date
timedout 7003e4a883 chore: Bump version again 2026-06-20 19:51:52 +01:00
Henry-Hiles ba9837331e fix: add rocksdb as a flake package
This fixes the flake-hashes workflow.
2026-06-20 19:42:35 +01:00
Henry-Hiles 33983466f8 fix: dynamically link rocksdb on dynamic nix builds
Fixes liburing error.
2026-06-20 19:42:34 +01:00
6 changed files with 50 additions and 20 deletions

No files matched your search

+4
View File
@@ -1,3 +1,7 @@
# Continuwuity 0.5.11 (2026-06-20 take 2)
This release purely contains some fix for the Nix package. There are no changes to the server itself.
# Continuwuity 0.5.10 (2026-06-20)
## Security
Generated
+11 -11
View File
@@ -960,7 +960,7 @@ dependencies = [
[[package]]
name = "conduwuit"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"aws-lc-rs",
"clap",
@@ -997,7 +997,7 @@ dependencies = [
[[package]]
name = "conduwuit_admin"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"clap",
"conduwuit_api",
@@ -1020,7 +1020,7 @@ dependencies = [
[[package]]
name = "conduwuit_api"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"async-trait",
"axum",
@@ -1055,7 +1055,7 @@ dependencies = [
[[package]]
name = "conduwuit_build_metadata"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"built",
"cargo_metadata",
@@ -1063,7 +1063,7 @@ dependencies = [
[[package]]
name = "conduwuit_core"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"argon2",
"arrayvec",
@@ -1127,7 +1127,7 @@ dependencies = [
[[package]]
name = "conduwuit_database"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"async-channel",
"conduwuit_core",
@@ -1147,7 +1147,7 @@ dependencies = [
[[package]]
name = "conduwuit_macros"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"cargo_toml",
"itertools 0.14.0",
@@ -1158,7 +1158,7 @@ dependencies = [
[[package]]
name = "conduwuit_router"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"axum",
"axum-client-ip",
@@ -1194,7 +1194,7 @@ dependencies = [
[[package]]
name = "conduwuit_service"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"askama",
"async-trait",
@@ -1242,7 +1242,7 @@ dependencies = [
[[package]]
name = "conduwuit_web"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"askama",
"async-trait",
@@ -7017,7 +7017,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.5.10"
version = "0.5.11"
dependencies = [
"askama",
"cargo_metadata",
+1 -1
View File
@@ -12,7 +12,7 @@ license = "Apache-2.0"
# See also `rust-toolchain.toml`
readme = "README.md"
repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
version = "0.5.10"
version = "0.5.11"
[workspace.metadata.crane]
name = "conduwuit"
+20 -2
View File
@@ -2,9 +2,10 @@
lib,
self,
stdenv,
liburing,
rocksdb,
craneLib,
pkg-config,
liburing,
rustPlatform,
cargoExtraArgs ? "",
rustflags ? "",
@@ -36,12 +37,17 @@ let
pkg-config
rustPlatform.bindgenHook
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ liburing ];
doCheck = false;
env = {
CARGO_PROFILE = profile;
RUSTFLAGS = rustflags;
}
// (lib.optionalAttrs (rocksdb != null) {
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
})
// (lib.optionalAttrs (target_cpu != null) {
TARGET_CPU = target_cpu;
});
@@ -52,6 +58,18 @@ craneLib.buildPackage (
inherit cargoExtraArgs;
cargoArtifacts = craneLib.buildDepsOnly attrs;
# Needed to make continuwuity link to rocksdb
postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && rocksdb != null) ''
old_rpath="$(patchelf --print-rpath $out/bin/conduwuit)"
extra_rpath="${
lib.makeLibraryPath [
rocksdb
]
}"
patchelf --set-rpath "$old_rpath:$extra_rpath" $out/bin/conduwuit
'';
meta = {
description = "A community-driven Matrix homeserver in Rust";
mainProgram = "conduwuit";
+7 -1
View File
@@ -36,7 +36,10 @@
default = pkgs.callPackage ./continuwuity.nix {
inherit self craneLib;
liburing = (if isStatic then pkgs.pkgsStatic else pkgs).liburing;
rocksdb = if isStatic then null else self'.packages.rocksdb;
# extra features via `cargoExtraArgs`
cargoExtraArgs = "-F http3";
# extra RUSTFLAGS via `rustflags`
@@ -62,7 +65,10 @@
};
in
(mkPackages pkgs)
{
rocksdb = pkgs.callPackage ./rocksdb.nix { };
}
// (mkPackages pkgs)
// (lib.mapAttrs' (name: value: lib.nameValuePair "${name}-static-x86_64" value) (
mkPackages (
import inputs.nixpkgs {
+7 -5
View File
@@ -1,5 +1,7 @@
{
stdenv,
# stdenv,
# enableJemalloc ? stdenv.hostPlatform.isLinux,
enableJemalloc ? false,
rocksdb,
fetchFromGitea,
rust-jemalloc-sys-unprefixed,
@@ -13,16 +15,16 @@
#
# [1]: https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs#L17
jemalloc = rust-jemalloc-sys-unprefixed;
enableJemalloc = stdenv.hostPlatform.isLinux;
inherit enableJemalloc;
}).overrideAttrs
({
version = "continuwuity-v0.5.0-unstable-2026-03-27";
version = "continuwuity-v0.5.0-unstable-2026-05-19";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "rocksdb";
rev = "463f47afceebfe088f6922420265546bd237f249";
hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk=";
rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
};
# We have this already at https://forgejo.ellis.link/continuwuation/rocksdb/commit/a935c0273e1ba44eacf88ce3685a9b9831486155