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
7 changed files with 32 additions and 33 deletions

No files matched your search

+2 -2
View File
@@ -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 '/fromToolchainName *\{/{found=1; print; next} found && /sha256 =/{sub(/sha256 = .*/, "sha256 = lib.fakeSha256;"); found=0} 1' nix/rust.nix > temp.nix
awk '/fromToolchainFile *\{/{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'"' '/fromToolchainName/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
awk -F'"' '/fromToolchainFile/{found=1; next} found && /sha256 =/{print $2; found=0}' nix/rust.nix
echo "Expected new hash:"
cat new_toolchain_hash.txt
+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"
+3 -4
View File
@@ -9,10 +9,8 @@
self',
lib,
pkgs,
inputs',
system,
craneLib,
mkToolchain,
...
}:
{
@@ -21,7 +19,7 @@
mkPackages =
pkgs:
let
fnx = inputs'.fenix.packages;
fnx = inputs.fenix.packages.${system};
isStatic = pkgs.stdenv.hostPlatform.isMusl;
@@ -30,7 +28,7 @@
if isStatic then
fnx.combine [
self'.packages.stable-toolchain
(mkToolchain fnx.targets.${pkgs.stdenv.hostPlatform.config}).rust-std
(fnx.targets.${pkgs.stdenv.hostPlatform.config}.stable).rust-std
]
else
self'.packages.stable-toolchain
@@ -64,6 +62,7 @@
in
{
inherit default max-perf max-perf-haswell;
};
in
{
+2 -2
View File
@@ -23,8 +23,8 @@
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
+9 -13
View File
@@ -2,26 +2,22 @@
{
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;
stable-toolchain = (mkToolchain fnx).toolchain;
fnx = inputs.fenix.packages.${system};
stable-toolchain = fnx.fromToolchainFile {
file = inputs.self + "/rust-toolchain.toml";
# See also `rust-toolchain.toml`
sha256 = "sha256-sqSWJDUxc+zaz1nBWMAJKTAGBuGWP25GCftIOlCEAtA=";
};
in
{
inherit stable-toolchain;