diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 6cfd44a79041..15449b7f7e73 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -10,20 +10,15 @@ nix-update-script, testers, matrix-continuwuity, - enableBlurhashing ? true, - # upstream continuwuity enables jemalloc by default, so we follow suit - enableJemalloc ? true, rust-jemalloc-sys-unprefixed, - enableLiburing ? stdenv.hostPlatform.isLinux, liburing, nixosTests, }: let rocksdb' = (rocksdb.override { - inherit enableLiburing; # rocksdb does not support prefixed jemalloc, which is required on darwin - enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin; + enableJemalloc = !stdenv.hostPlatform.isDarwin; jemalloc = rust-jemalloc-sys-unprefixed; }).overrideAttrs ( @@ -77,17 +72,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-g2KidOlYvJgGsiX2qq9pmJjLmzVgbJHv8VaulYIiKKo="; + hash = "sha256-9gDVhBuWBiXkzOxx0DyJFRV32QFwkKKpORb4I4xtdKw="; }; - cargoHash = "sha256-nOawYriRWw6O890J6V/InKlijCO6CqwvIuOOTjorJns="; + cargoHash = "sha256-seJ9zaFMfSm/77n33SJ60/Ux1ovWUbkyi5M8x3kuBhU="; nativeBuildInputs = [ pkg-config @@ -97,11 +92,9 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ bzip2 zstd - ] - ++ lib.optional enableJemalloc [ rust-jemalloc-sys-unprefixed - ] - ++ lib.optional enableLiburing liburing; + liburing + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -109,31 +102,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; }; - buildNoDefaultFeatures = true; - # See https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/Cargo.toml - # for available features. - # We enable all default features except jemalloc, blurhashing, and io_uring, which - # we guard behind our own (default-enabled) flags. - buildFeatures = [ - "brotli_compression" - "direct_tls" - "element_hacks" - "gzip_compression" - "media_thumbnail" - "release_max_log_level" - "systemd" - "url_preview" - "zstd_compression" - "bindgen-runtime" - "ldap" - ] - ++ lib.optional enableBlurhashing "blurhashing" - ++ lib.optional enableJemalloc [ - "jemalloc" - "jemalloc_conf" - ] - ++ lib.optional enableLiburing "io_uring"; - passthru = { rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts) updateScript = nix-update-script { };