chore: use older hashes

Needed for backport.

.forgejo/workflows/update-flake-hashes.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Get new toolchain hash
         run: |
           # Set the current sha256 to an empty hash to make `nix build` calculate a new one
-          awk '/fromToolchainFile *\{/{found=1; print; next} found && /sha256 =/{sub(/sha256 = .*/, "sha256 = lib.fakeSha256;"); found=0} 1' nix/rust.nix > temp.nix
+          awk '/fromToolchainName *\{/{found=1; print; next} found && /sha256 =/{sub(/sha256 = .*/, "sha256 = lib.fakeSha256;"); found=0} 1' nix/rust.nix > temp.nix
           mv temp.nix nix/rust.nix
 
           # Build continuwuity and filter for the new hash
@@ -39,7 +39,7 @@ jobs:
           sed -i "s|lib.fakeSha256|\"$new_hash\"|" nix/rust.nix
 
           echo "New hash:"
-          awk -F'"' '/fromToolchainFile/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
+          awk -F'"' '/fromToolchainName/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
           echo "Expected new hash:"
           cat new_toolchain_hash.txt
 

nix/packages/continuwuity.nix

@@ -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";

nix/packages/default.nix

@@ -9,8 +9,10 @@
       self',
       lib,
       pkgs,
+      inputs',
       system,
       craneLib,
+      mkToolchain,
       ...
     }:
     {
@@ -19,7 +21,7 @@
           mkPackages =
             pkgs:
             let
-              fnx = inputs.fenix.packages.${system};
+              fnx = inputs'.fenix.packages;
 
               isStatic = pkgs.stdenv.hostPlatform.isMusl;
 
@@ -28,7 +30,7 @@
                 if isStatic then
                   fnx.combine [
                     self'.packages.stable-toolchain
-                    (fnx.targets.${pkgs.stdenv.hostPlatform.config}.stable).rust-std
+                    (mkToolchain fnx.targets.${pkgs.stdenv.hostPlatform.config}).rust-std
                   ]
                 else
                   self'.packages.stable-toolchain
@@ -36,7 +38,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`
@@ -59,10 +64,12 @@
             in
             {
               inherit default max-perf max-perf-haswell;
-
             };
         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 {

nix/packages/rocksdb.nix

@@ -1,5 +1,7 @@
 {
-  stdenv,
+  # stdenv,
+  # enableJemalloc ? stdenv.hostPlatform.isLinux,
+  enableJemalloc ? false,
   rocksdb,
   fetchFromGitea,
   rust-jemalloc-sys-unprefixed,
@@ -13,10 +15,10 @@
   #
   # [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";

nix/rust.nix

@@ -2,22 +2,26 @@
 {
   perSystem =
     {
-      system,
       lib,
+      inputs',
       pkgs,
       ...
     }:
+    let
+      mkToolchain =
+        target:
+        target.fromToolchainName {
+          name = (lib.importTOML "${inputs.self}/rust-toolchain.toml").toolchain.channel;
+          sha256 = "sha256-sqSWJDUxc+zaz1nBWMAJKTAGBuGWP25GCftIOlCEAtA=";
+        };
+    in
     {
+      _module.args = { inherit mkToolchain; };
+
       packages =
         let
-          fnx = inputs.fenix.packages.${system};
-
-          stable-toolchain = fnx.fromToolchainFile {
-            file = inputs.self + "/rust-toolchain.toml";
-
-            # See also `rust-toolchain.toml`
-            sha256 = "sha256-sqSWJDUxc+zaz1nBWMAJKTAGBuGWP25GCftIOlCEAtA=";
-          };
+          fnx = inputs'.fenix.packages;
+          stable-toolchain = (mkToolchain fnx).toolchain;
         in
         {
           inherit stable-toolchain;