add oci image build and nix fmt

This commit is contained in:
AwesomeQubic 2024-01-18 11:01:09 +01:00
parent 6ffc54e241
commit 4c76ac7224

View file

@ -14,14 +14,10 @@
}; };
}; };
outputs = outputs = { self, nixpkgs, flake-utils
{ self
, nixpkgs
, flake-utils
, fenix , fenix, crane }:
, crane flake-utils.lib.eachDefaultSystem (system:
}: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -29,16 +25,15 @@
overlays = [ overlays = [
(final: prev: { (final: prev: {
rocksdb = prev.rocksdb.overrideAttrs (old: rocksdb = prev.rocksdb.overrideAttrs (old:
let let version = "8.10.0";
version = "8.10.0"; in {
in
{
inherit version; inherit version;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "rocksdb"; repo = "rocksdb";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ="; hash =
"sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
}; };
}); });
}) })
@ -64,10 +59,7 @@
mkToolchain = fenix.packages.${system}.combine; mkToolchain = fenix.packages.${system}.combine;
buildToolchain = mkToolchain (with toolchain; [ buildToolchain = mkToolchain (with toolchain; [ cargo rustc ]);
cargo
rustc
]);
devToolchain = mkToolchain (with toolchain; [ devToolchain = mkToolchain (with toolchain; [
cargo cargo
@ -82,23 +74,37 @@
builder = builder =
((crane.mkLib pkgs).overrideToolchain buildToolchain).buildPackage; ((crane.mkLib pkgs).overrideToolchain buildToolchain).buildPackage;
nativeBuildInputs = (with pkgs.rustPlatform; [ nativeBuildInputs = (with pkgs.rustPlatform; [ bindgenHook ]);
bindgenHook
]);
env = { env = {
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include"; ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib"; ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
}; };
in in {
{ packages = {
packages.default = builder { default = builder {
src = ./.; src = ./.;
inherit meta.mainProgram = "conduit";
env
nativeBuildInputs inherit env nativeBuildInputs stdenv;
stdenv; };
oci-image = pkgs.dockerTools.buildLayeredImage {
name = cargoToml.package.name;
tag = "latest";
config = {
Cmd = [ "${pkgs.lib.getExe self.packages."${system}".default}" ];
Env = [
"CONDUIT_PORT=6167"
''CONDUIT_ADDRESS="0.0.0.0"''
"CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit"
"CONDUIT_CONFIG=''"
"RUST_BACKTRACE=1"
];
ExposedPorts = { "6167/tcp" = { }; };
};
};
}; };
devShells.default = (pkgs.mkShell.override { inherit stdenv; }) { devShells.default = (pkgs.mkShell.override { inherit stdenv; }) {
@ -110,11 +116,11 @@
}; };
# Development tools # Development tools
nativeBuildInputs = nativeBuildInputs ++ [ nativeBuildInputs = nativeBuildInputs ++ [ devToolchain ]
devToolchain ++ (with pkgs; [ engage ]);
] ++ (with pkgs; [
engage
]);
}; };
formatter = pkgs.nixfmt;
}); });
} }