thek0tyara/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

chore: use upstream rust-jemalloc-sys-unprefixed after flake.lock update

Browse source
This commit is contained in:
aviac 2025-10-22 11:08:01 +02:00 • committed by Jade Ellis
parent 9a887ac04b
commit ec3564e8aa
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
6 changed files with 30 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

52
flake.lock generated
View file

@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1760533899, "lastModified": 1761112158,
"narHash": "sha256-wEBOgeHURiBQQnzdCKl30IDnSBqbEXw0Sfnm+an0JmE=", "narHash": "sha256-RIXu/7eyKpQHjsPuAUODO81I4ni8f+WYSb7K4mTG6+0=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "218a772dc1f031aa64e0c575a92c8e04439674d5", "rev": "58f3aaec0e1776f4a900737be8cd7cb00972210d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1758686891, "lastModified": 1760924934,
"narHash": "sha256-Lq8JkwjSzv80T1i8KCvqAch75zwD98UKA+4atZjvfZ0=", "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "02063302383f43237602f5aea5a67766b08e4787", "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1760510549, "lastModified": 1761115517,
"narHash": "sha256-NP+kmLMm7zSyv4Fufv+eSJXyqjLMUhUfPT6lXRlg/bU=", "narHash": "sha256-Fev/ag/c3Fp3JBwHfup3lpA5FlNXfkoshnQ7dssBgJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "ef7178cf086f267113b5c48fdeb6e510729c8214", "rev": "320433651636186ea32b387cff05d6bbfa30cea7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1760948891,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1758427187, "lastModified": 1760878510,
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1760504863, "lastModified": 1754788789,
"narHash": "sha256-h13YFQMi91nXkkRoJMIfezorz5SbD6849jw5L0fjK4I=", "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
"owner": "NixOS", "owner": "nix-community",
"repo": "nixpkgs", "repo": "nixpkgs.lib",
"rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1760457219, "lastModified": 1761077270,
"narHash": "sha256-WJOUGx42hrhmvvYcGkwea+BcJuQJLcns849OnewQqX4=", "narHash": "sha256-O1uTuvI/rUlubJ8AXKyzh1WSWV3qCZX0huTFUvWLN4E=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "8747cf81540bd1bbbab9ee2702f12c33aa887b46", "rev": "39990a923c8bca38f5bd29dc4c96e20ee7808d5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760120816, "lastModified": 1760945191,
"narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "761ae7aff00907b607125b2f57338b74177697ed", "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nix/checks/default.nix
View file

@ -18,7 +18,7 @@
commonAttrs = (uwulib.build.commonAttrs { }) // { commonAttrs = (uwulib.build.commonAttrs { }) // {
buildInputs = [ buildInputs = [
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures rocksdbAllFeatures
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,7 +32,7 @@
LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
LD_LIBRARY_PATH = lib.makeLibraryPath [ LD_LIBRARY_PATH = lib.makeLibraryPath [
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures rocksdbAllFeatures
]; ];
} }

1
nix/packages/default.nix
View file

@ -1,7 +1,6 @@
{ {
imports = [ imports = [
./continuwuity ./continuwuity
./jemalloc.nix
./rocksdb ./rocksdb
./rust.nix ./rust.nix
./uwulib ./uwulib

26
nix/packages/jemalloc.nix
View file

@ -1,26 +0,0 @@
{
perSystem =
{
pkgs,
...
}:
{
# we disable some unused features here. The code won't compile without these
#
# > <jemalloc>: Invalid conf pair: prof_active:false
# > error: test failed, to rerun pass `-p conduwuit --lib`
# >
# > Caused by:
# > process didn't exit successfully: `/build/source/target/release/deps/conduwuit-67fbd204f38e8c35` (signal: 11, SIGSEGV: invalid memory reference)
packages.rust-jemalloc-sys-unprefixed' = pkgs.rust-jemalloc-sys-unprefixed.overrideAttrs (old: {
configureFlags =
old.configureFlags
++
# we dont need docs
[ "--disable-doc" ]
++
# we dont need cxx/C++ integration
[ "--disable-cxx" ];
});
};
}

5
nix/packages/rocksdb/default.nix
View file

@ -1,15 +1,12 @@
{ {
perSystem = perSystem =
{ {
self',
pkgs, pkgs,
... ...
}: }:
{ {
packages = { packages = {
rocksdb = pkgs.callPackage ./package.nix { rocksdb = pkgs.callPackage ./package.nix { };
rust-jemalloc-sys-unprefixed = self'.packages.rust-jemalloc-sys-unprefixed';
};
}; };
}; };
} }

2
nix/shells/default.nix
View file

@ -20,7 +20,7 @@
packages = [ packages = [
pkgs.pkg-config pkgs.pkg-config
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures rocksdbAllFeatures
]; ];
env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];