diff --git a/flake.lock b/flake.lock index 11212421..8967042d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1760533899, - "narHash": "sha256-wEBOgeHURiBQQnzdCKl30IDnSBqbEXw0Sfnm+an0JmE=", + "lastModified": 1761112158, + "narHash": "sha256-RIXu/7eyKpQHjsPuAUODO81I4ni8f+WYSb7K4mTG6+0=", "owner": "rustsec", "repo": "advisory-db", - "rev": "218a772dc1f031aa64e0c575a92c8e04439674d5", + "rev": "58f3aaec0e1776f4a900737be8cd7cb00972210d", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "crane": { "locked": { - "lastModified": 1758686891, - "narHash": "sha256-Lq8JkwjSzv80T1i8KCvqAch75zwD98UKA+4atZjvfZ0=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "02063302383f43237602f5aea5a67766b08e4787", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1760510549, - "narHash": "sha256-NP+kmLMm7zSyv4Fufv+eSJXyqjLMUhUfPT6lXRlg/bU=", + "lastModified": 1761115517, + "narHash": "sha256-Fev/ag/c3Fp3JBwHfup3lpA5FlNXfkoshnQ7dssBgJ0=", "owner": "nix-community", "repo": "fenix", - "rev": "ef7178cf086f267113b5c48fdeb6e510729c8214", + "rev": "320433651636186ea32b387cff05d6bbfa30cea7", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1760504863, - "narHash": "sha256-h13YFQMi91nXkkRoJMIfezorz5SbD6849jw5L0fjK4I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1760457219, - "narHash": "sha256-WJOUGx42hrhmvvYcGkwea+BcJuQJLcns849OnewQqX4=", + "lastModified": 1761077270, + "narHash": "sha256-O1uTuvI/rUlubJ8AXKyzh1WSWV3qCZX0huTFUvWLN4E=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8747cf81540bd1bbbab9ee2702f12c33aa887b46", + "rev": "39990a923c8bca38f5bd29dc4c96e20ee7808d5d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1760945191, + "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", "type": "github" }, "original": { diff --git a/nix/checks/default.nix b/nix/checks/default.nix index b851daee..bb3064e0 100644 --- a/nix/checks/default.nix +++ b/nix/checks/default.nix @@ -18,7 +18,7 @@ commonAttrs = (uwulib.build.commonAttrs { }) // { buildInputs = [ pkgs.liburing - self'.packages.rust-jemalloc-sys-unprefixed' + pkgs.rust-jemalloc-sys-unprefixed rocksdbAllFeatures ]; nativeBuildInputs = [ @@ -32,7 +32,7 @@ LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.liburing - self'.packages.rust-jemalloc-sys-unprefixed' + pkgs.rust-jemalloc-sys-unprefixed rocksdbAllFeatures ]; } diff --git a/nix/packages/default.nix b/nix/packages/default.nix index ae66866e..cb220d88 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -1,7 +1,6 @@ { imports = [ ./continuwuity - ./jemalloc.nix ./rocksdb ./rust.nix ./uwulib diff --git a/nix/packages/jemalloc.nix b/nix/packages/jemalloc.nix deleted file mode 100644 index 958ef5e8..00000000 --- a/nix/packages/jemalloc.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - perSystem = - { - pkgs, - ... - }: - { - # we disable some unused features here. The code won't compile without these - # - # > : 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" ]; - }); - }; -} diff --git a/nix/packages/rocksdb/default.nix b/nix/packages/rocksdb/default.nix index a5f241a9..6358940a 100644 --- a/nix/packages/rocksdb/default.nix +++ b/nix/packages/rocksdb/default.nix @@ -1,15 +1,12 @@ { perSystem = { - self', pkgs, ... }: { packages = { - rocksdb = pkgs.callPackage ./package.nix { - rust-jemalloc-sys-unprefixed = self'.packages.rust-jemalloc-sys-unprefixed'; - }; + rocksdb = pkgs.callPackage ./package.nix { }; }; }; } diff --git a/nix/shells/default.nix b/nix/shells/default.nix index bf5b5da8..738ed177 100644 --- a/nix/shells/default.nix +++ b/nix/shells/default.nix @@ -20,7 +20,7 @@ packages = [ pkgs.pkg-config pkgs.liburing - self'.packages.rust-jemalloc-sys-unprefixed' + pkgs.rust-jemalloc-sys-unprefixed rocksdbAllFeatures ]; env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];