mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-07-09 13:26:41 +02:00
add oci image build and nix fmt
This commit is contained in:
parent
6ffc54e241
commit
4c76ac7224
1 changed files with 104 additions and 98 deletions
68
flake.nix
68
flake.nix
|
@ -14,14 +14,10 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs
|
||||
, flake-utils
|
||||
outputs = { self, nixpkgs, flake-utils
|
||||
|
||||
, fenix
|
||||
, crane
|
||||
}: flake-utils.lib.eachDefaultSystem (system:
|
||||
, fenix, crane }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
|
@ -29,16 +25,15 @@
|
|||
overlays = [
|
||||
(final: prev: {
|
||||
rocksdb = prev.rocksdb.overrideAttrs (old:
|
||||
let
|
||||
version = "8.10.0";
|
||||
in
|
||||
{
|
||||
let version = "8.10.0";
|
||||
in {
|
||||
inherit version;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "rocksdb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
|
||||
hash =
|
||||
"sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
@ -64,10 +59,7 @@
|
|||
|
||||
mkToolchain = fenix.packages.${system}.combine;
|
||||
|
||||
buildToolchain = mkToolchain (with toolchain; [
|
||||
cargo
|
||||
rustc
|
||||
]);
|
||||
buildToolchain = mkToolchain (with toolchain; [ cargo rustc ]);
|
||||
|
||||
devToolchain = mkToolchain (with toolchain; [
|
||||
cargo
|
||||
|
@ -82,23 +74,37 @@
|
|||
builder =
|
||||
((crane.mkLib pkgs).overrideToolchain buildToolchain).buildPackage;
|
||||
|
||||
nativeBuildInputs = (with pkgs.rustPlatform; [
|
||||
bindgenHook
|
||||
]);
|
||||
nativeBuildInputs = (with pkgs.rustPlatform; [ bindgenHook ]);
|
||||
|
||||
env = {
|
||||
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
|
||||
ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
|
||||
};
|
||||
in
|
||||
{
|
||||
packages.default = builder {
|
||||
in {
|
||||
packages = {
|
||||
default = builder {
|
||||
src = ./.;
|
||||
|
||||
inherit
|
||||
env
|
||||
nativeBuildInputs
|
||||
stdenv;
|
||||
meta.mainProgram = "conduit";
|
||||
|
||||
inherit env nativeBuildInputs 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; }) {
|
||||
|
@ -110,11 +116,11 @@
|
|||
};
|
||||
|
||||
# Development tools
|
||||
nativeBuildInputs = nativeBuildInputs ++ [
|
||||
devToolchain
|
||||
] ++ (with pkgs; [
|
||||
engage
|
||||
]);
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ devToolchain ]
|
||||
++ (with pkgs; [ engage ]);
|
||||
};
|
||||
|
||||
formatter = pkgs.nixfmt;
|
||||
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue