eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: fix bot build, add generate commands binding app

Browse source
This commit is contained in:
dusk 2025-01-04 00:18:10 +09:00
parent a6482d929c
commit 59bba77ae9
No known key found for this signature in database
3 changed files with 184 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PluralKit.Bot/CommandSystem/Context/Context.cs
View file

@ -48,7 +48,6 @@ public class Context
_commandMessageService = provider.Resolve<CommandMessageService>();
CommandPrefix = message.Content?.Substring(0, commandParseOffset);
DefaultPrefix = prefixes[0];
Parameters = new Parameters(message.Content?.Substring(commandParseOffset));
Rest = provider.Resolve<DiscordApiClient>();
Cluster = provider.Resolve<Cluster>();
@ -87,7 +86,7 @@ public class Context
public readonly string CommandPrefix;
public readonly string DefaultPrefix;
public readonly Parameters Parameters;
public readonly ParametersFFI Parameters;
internal readonly IDatabase Database;
internal readonly ModelRepository Repository;

33
flake.lock generated
View file

@ -104,11 +104,11 @@
]
},
"locked": {
"lastModified": 1734953472,
"narHash": "sha256-zWPAJFo7NNhSXbOc6YRAXbrWzcJGxNPtutKTTZz46Bs=",
"lastModified": 1735917398,
"narHash": "sha256-RkwVkqozmbYvwX63Q4GNkNCsPuHR8sUIax40J5A4l3A=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "e71c873cf3b0dfa52e9550d580531e41eb4b4c6a",
"rev": "aff54b572b75af13a6b31108ff7732d17674ad43",
"type": "github"
},
"original": {
@ -227,7 +227,8 @@
"process-compose": "process-compose",
"services": "services",
"systems": "systems",
"treefmt": "treefmt"
"treefmt": "treefmt",
"uniffi-bindgen-cs": "uniffi-bindgen-cs"
}
},
"rust-overlay": {
@ -238,11 +239,11 @@
]
},
"locked": {
"lastModified": 1734834660,
"narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=",
"lastModified": 1735871325,
"narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b070e6030118680977bc2388868c4b3963872134",
"rev": "a599f011db521766cbaf7c2f5874182485554f00",
"type": "github"
},
"original": {
@ -322,6 +323,24 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"uniffi-bindgen-cs": {
"flake": false,
"locked": {
"lastModified": 1732196488,
"narHash": "sha256-zqNUUFd3OSAwmMh+hnN6AVpGnwu+ZJ1jjivbzN1k5Io=",
"ref": "refs/heads/main",
"rev": "fe5cd23943fd3aec335e2bb8f709ec1956992ae9",
"revCount": 115,
"submodules": true,
"type": "git",
"url": "https://github.com/NordSecurity/uniffi-bindgen-cs?tag=v0.8.3%2Bv0.25.0"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/NordSecurity/uniffi-bindgen-cs?tag=v0.8.3%2Bv0.25.0"
}
}
},
"root": "root",

62
flake.nix
View file

@ -16,6 +16,8 @@
nci.inputs.nixpkgs.follows = "nixpkgs";
nci.inputs.dream2nix.follows = "d2n";
nci.inputs.treefmt.follows = "treefmt";
uniffi-bindgen-cs.url = "git+https://github.com/NordSecurity/uniffi-bindgen-cs?tag=v0.8.3+v0.25.0&submodules=1";
uniffi-bindgen-cs.flake = false;
# misc
treefmt.url = "github:numtide/treefmt-nix";
treefmt.inputs.nixpkgs.follows = "nixpkgs";
@ -57,39 +59,58 @@
];
runScript = cmd;
};
uniffi-bindgen-cs = config.nci.lib.buildCrate {
src = inp.uniffi-bindgen-cs;
cratePath = "bindgen";
# TODO: uniffi fails to build with our toolchain because the ahash dep that uniffi-bindgen-cs uses is too old and uses removed stdsimd feature
mkRustToolchain = pkgs: pkgs.cargo;
};
rustOutputs = config.nci.outputs;
composeCfg = config.process-compose."dev";
in
{
# _module.args.pkgs = import inp.nixpkgs {
# inherit system;
# config.permittedInsecurePackages = [ "dotnet-sdk-6.0.428" ];
# };
treefmt = {
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
};
nci.toolchainConfig = {
channel = "nightly";
};
nci.projects."pluralkit-services" = {
path = ./.;
export = false;
};
# nci.crates."gateway" = {
# depsDrvConfig.mkDerivation = {
# nativeBuildInputs = [ pkgs.protobuf ];
# };
# drvConfig.mkDerivation = {
# nativeBuildInputs = [ pkgs.protobuf ];
# };
# };
nci.crates."commands" = rec {
depsDrvConfig.env = {
# we don't really need this since the lib is just used to generate the bindings
doNotRemoveReferencesToVendorDir = true;
};
depsDrvConfig.mkDerivation = {
# also not really needed
dontPatchShebangs = true;
};
drvConfig = depsDrvConfig;
};
apps = {
generate-command-parser-bindings.program = pkgs.writeShellApplication {
name = "generate-command-parser-bindings";
runtimeInputs = [
(config.nci.toolchains.mkBuild pkgs)
self'.devShells.services.stdenv.cc
pkgs.csharpier
pkgs.coreutils
uniffi-bindgen-cs
];
text = ''
set -x
[ "''${1:-}" == "" ] && cargo build --package commands --release
uniffi-bindgen-cs "''${1:-target/debug/libcommands.so}" --library --out-dir="''${2:-./PluralKit.Bot}"
'';
};
};
# TODO: expose other rust packages after it's verified they build and work properly
packages = lib.genAttrs ["gateway"] (name: rustOutputs.${name}.packages.release);
packages = lib.genAttrs [ "gateway" "commands" ] (name: rustOutputs.${name}.packages.release);
# TODO: package the bot itself (dotnet)
devShells = {
@ -97,7 +118,8 @@
bot = (mkBotEnv "bash").env;
};
process-compose."dev" = let
process-compose."dev" =
let
dataDir = ".nix-process-compose";
pluralkitConfCheck = ''
[[ -f "pluralkit.conf" ]] || (echo "pluralkit config not found, please copy pluralkit.conf.example to pluralkit.conf and edit it" && exit 1)
@ -105,7 +127,8 @@
sourceDotenv = ''
[[ -f ".env" ]] && echo "sourcing .env file..." && export "$(xargs < .env)"
'';
in {
in
{
imports = [ inp.services.processComposeModules.default ];
settings.log_location = "${dataDir}/log";
@ -174,6 +197,7 @@
${sourceDotenv}
set -x
${pluralkitConfCheck}
${self'.apps.generate-command-parser-bindings.program}
exec ${mkBotEnv "dotnet build -c Release -o obj/"}/bin/env
'';
};