chore: reorganize nix files

This commit is contained in:
Henry-Hiles
2026-04-07 20:41:19 +00:00
committed by Henry Hiles
parent d8f67e3b46
commit db1b08532e
10 changed files with 14 additions and 37 deletions
-1
View File
@@ -29,7 +29,6 @@
url = "github:edolstra/flake-compat?ref=master"; url = "github:edolstra/flake-compat?ref=master";
flake = false; flake = false;
}; };
}; };
outputs = outputs =
+5 -7
View File
@@ -10,15 +10,13 @@
let let
uwulib = inputs.self.uwulib.init pkgs; uwulib = inputs.self.uwulib.init pkgs;
rocksdbAllFeatures = self'.packages.rocksdb.override { rocksdb = self'.packages.rocksdb;
enableJemalloc = true;
};
commonAttrs = (uwulib.build.commonAttrs { }) // { commonAttrs = (uwulib.build.commonAttrs { }) // {
buildInputs = [ buildInputs = [
pkgs.liburing pkgs.liburing
pkgs.rust-jemalloc-sys-unprefixed pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures rocksdb
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.pkg-config pkgs.pkg-config
@@ -32,13 +30,13 @@
LD_LIBRARY_PATH = lib.makeLibraryPath [ LD_LIBRARY_PATH = lib.makeLibraryPath [
pkgs.liburing pkgs.liburing
pkgs.rust-jemalloc-sys-unprefixed pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures rocksdb
]; ];
} }
// uwulib.environment.buildPackageEnv // uwulib.environment.buildPackageEnv
// { // {
ROCKSDB_INCLUDE_DIR = "${rocksdbAllFeatures}/include"; ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdbAllFeatures}/lib"; ROCKSDB_LIB_DIR = "${rocksdb}/lib";
}; };
}; };
cargoArtifacts = self'.packages.continuwuity-all-features-deps; cargoArtifacts = self'.packages.continuwuity-all-features-deps;
+4 -5
View File
@@ -1,11 +1,10 @@
{ {
imports = [ imports = [
./checks
./packages ./packages
./shells ./checks.nix
./tests ./devshell.nix
./tests.nix
./hydra.nix
./fmt.nix ./fmt.nix
./rust.nix
]; ];
} }
-9
View File
@@ -1,9 +0,0 @@
{ inputs, ... }:
let
lib = inputs.nixpkgs.lib;
in
{
flake.hydraJobs.packages = builtins.mapAttrs (
_name: lib.hydraJob
) inputs.self.packages.x86_64-linux;
}
+5 -3
View File
@@ -1,14 +1,16 @@
{ {
imports = [ imports = [
./continuwuity ./continuwuity
./rocksdb
./rust.nix ./rust.nix
./uwulib ./uwulib
]; ];
perSystem = perSystem =
{ self', ... }: { self', pkgs, ... }:
{ {
packages.default = self'.packages.continuwuity-default-bin; packages = {
default = self'.packages.continuwuity-default-bin;
rocksdb = pkgs.callPackage ./rocksdb.nix { };
};
}; };
} }
-12
View File
@@ -1,12 +0,0 @@
{
perSystem =
{
pkgs,
...
}:
{
packages = {
rocksdb = pkgs.callPackage ./package.nix { };
};
};
}