mirror of
https://github.com/PluralKit/PluralKit.git
synced 2026-02-11 16:20:13 +00:00
build(nix): update flake dependencies and fixup the flake
This commit is contained in:
dusk
parent
915d8b449b
commit
5d57bd9320
2 changed files with 58 additions and 56 deletions
91
flake.lock
generated
91
flake.lock
generated
|
|
@ -26,11 +26,11 @@
|
||||||
"pyproject-nix": "pyproject-nix"
|
"pyproject-nix": "pyproject-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734729217,
|
"lastModified": 1753366881,
|
||||||
"narHash": "sha256-UaBik0h7veLw+VqsK5EP2ucC68BEkHLDJkcfmY+wEuY=",
|
"narHash": "sha256-jsoTEhkmn3weESMNRMLNk/ROW3fcHCr8Wgf5amzs5z8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "dream2nix",
|
"repo": "dream2nix",
|
||||||
"rev": "98c1c2e934995a2c6ce740d4ff43ce0daa19b79f",
|
"rev": "e6566e4ce924a8258499c379ee9552dba1883bce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -57,12 +57,12 @@
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1733328505,
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||||
"revCount": 57,
|
"revCount": 69,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -104,11 +104,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735917398,
|
"lastModified": 1754720322,
|
||||||
"narHash": "sha256-RkwVkqozmbYvwX63Q4GNkNCsPuHR8sUIax40J5A4l3A=",
|
"narHash": "sha256-86ic12SviaoGIIQORsbOBs01ZOtRi/fbPqKfQvJdWxY=",
|
||||||
"owner": "yusdacra",
|
"owner": "yusdacra",
|
||||||
"repo": "nix-cargo-integration",
|
"repo": "nix-cargo-integration",
|
||||||
"rev": "aff54b572b75af13a6b31108ff7732d17674ad43",
|
"rev": "dcf65e1bf185b81c2c5ddee50bf464f634f38453",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -119,11 +119,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734435836,
|
"lastModified": 1754651824,
|
||||||
"narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=",
|
"narHash": "sha256-aB7ft6njy9EJfuW+rdToNChfRrHNRw/yTg5cSEnG+HI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4989a246d7a390a859852baddb1013f825435cee",
|
"rev": "b069b7c1e2fe1a3a24221428558bf44128d3d5c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -134,14 +134,17 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733096140,
|
"lastModified": 1753579242,
|
||||||
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
|
"narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
|
||||||
"type": "tarball",
|
"owner": "nix-community",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
|
"repo": "nixpkgs.lib",
|
||||||
|
"rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
|
||||||
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"owner": "nix-community",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
|
"repo": "nixpkgs.lib",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parts": {
|
"parts": {
|
||||||
|
|
@ -149,11 +152,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733312601,
|
"lastModified": 1754487366,
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -164,11 +167,11 @@
|
||||||
},
|
},
|
||||||
"process-compose": {
|
"process-compose": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733325752,
|
"lastModified": 1749418557,
|
||||||
"narHash": "sha256-79tzPuXNRo1NUllafYW6SjeLtjqfnLGq7tHCM7cAXNg=",
|
"narHash": "sha256-wJHHckWz4Gvj8HXtM5WVJzSKXAEPvskQANVoRiu2w1w=",
|
||||||
"owner": "Platonic-Systems",
|
"owner": "Platonic-Systems",
|
||||||
"repo": "process-compose-flake",
|
"repo": "process-compose-flake",
|
||||||
"rev": "1012530b582f1bd3b102295c799358d95abf42d7",
|
"rev": "91dcc48a6298e47e2441ec76df711f4e38eab94e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -201,18 +204,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pyproject-nix": {
|
"pyproject-nix": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"d2n",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702448246,
|
"lastModified": 1752481895,
|
||||||
"narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=",
|
"narHash": "sha256-luVj97hIMpCbwhx3hWiRwjP2YvljWy8FM+4W9njDhLA=",
|
||||||
"owner": "davhau",
|
"owner": "pyproject-nix",
|
||||||
"repo": "pyproject.nix",
|
"repo": "pyproject.nix",
|
||||||
"rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb",
|
"rev": "16ee295c25107a94e59a7fc7f2e5322851781162",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "davhau",
|
"owner": "pyproject-nix",
|
||||||
"ref": "dream2nix",
|
|
||||||
"repo": "pyproject.nix",
|
"repo": "pyproject.nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -239,11 +246,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735871325,
|
"lastModified": 1754707163,
|
||||||
"narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
|
"narHash": "sha256-wgVgOsyJUDn2ZRpzu2gELKALoJXlBSoZJSln+Tlg5Pw=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "a599f011db521766cbaf7c2f5874182485554f00",
|
"rev": "ac39ab4c8ed7cefe48d5ae5750f864422df58f01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -254,11 +261,11 @@
|
||||||
},
|
},
|
||||||
"services": {
|
"services": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734242477,
|
"lastModified": 1754187875,
|
||||||
"narHash": "sha256-u+fkdD8+0/0J8k0/YKDc3ReUcYZZGiftGL+Sz2wdRqM=",
|
"narHash": "sha256-0JoDuijBaB5g7bZpUIJxgTz5yPi/C+iLnNWtKIz/qas=",
|
||||||
"owner": "juspay",
|
"owner": "juspay",
|
||||||
"repo": "services-flake",
|
"repo": "services-flake",
|
||||||
"rev": "acc7f3f9f30621b469ca3ee511592a68a4437312",
|
"rev": "f625a3ef44d579013bca08cf5ee86006a093230e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -311,11 +318,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734704479,
|
"lastModified": 1754492133,
|
||||||
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
|
"narHash": "sha256-B+3g9+76KlGe34Yk9za8AF3RL+lnbHXkLiVHLjYVOAc=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
|
"rev": "1298185c05a56bff66383a20be0b41a307f52228",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
23
flake.nix
23
flake.nix
|
|
@ -39,7 +39,6 @@
|
||||||
self',
|
self',
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
system,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
@ -51,7 +50,11 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
rustOutputs = config.nci.outputs;
|
rustOutputs = config.nci.outputs;
|
||||||
composeCfg = config.process-compose."dev";
|
|
||||||
|
sourceDotenv = ''
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
[[ -f ".env" ]] && echo "sourcing .env file..." && set -a && source .env && set +a
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
treefmt = {
|
treefmt = {
|
||||||
|
|
@ -117,11 +120,15 @@
|
||||||
gcc
|
gcc
|
||||||
omnisharp-roslyn
|
omnisharp-roslyn
|
||||||
bashInteractive
|
bashInteractive
|
||||||
|
postgresql
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
all = (pkgs.mkShell.override { stdenv = services.stdenv; }) {
|
all = (pkgs.mkShell.override { stdenv = services.stdenv; }) {
|
||||||
name = "pk-devshell";
|
name = "pk-devshell";
|
||||||
nativeBuildInputs = bot.nativeBuildInputs ++ services.nativeBuildInputs;
|
nativeBuildInputs = bot.nativeBuildInputs ++ services.nativeBuildInputs;
|
||||||
|
shellHook = ''
|
||||||
|
${sourceDotenv}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
docs = pkgs.mkShellNoCC {
|
docs = pkgs.mkShellNoCC {
|
||||||
buildInputs = with pkgs; [ nodejs yarn ];
|
buildInputs = with pkgs; [ nodejs yarn ];
|
||||||
|
|
@ -132,12 +139,6 @@
|
||||||
process-compose."dev" =
|
process-compose."dev" =
|
||||||
let
|
let
|
||||||
dataDir = ".nix-process-compose";
|
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)
|
|
||||||
'';
|
|
||||||
sourceDotenv = ''
|
|
||||||
[[ -f ".env" ]] && echo "sourcing .env file..." && export "$(xargs < .env)"
|
|
||||||
'';
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ inp.services.processComposeModules.default ];
|
imports = [ inp.services.processComposeModules.default ];
|
||||||
|
|
@ -166,12 +167,8 @@
|
||||||
|
|
||||||
settings.processes =
|
settings.processes =
|
||||||
let
|
let
|
||||||
procCfg = composeCfg.settings.processes;
|
|
||||||
mkServiceProcess =
|
mkServiceProcess =
|
||||||
name: attrs:
|
name: attrs:
|
||||||
let
|
|
||||||
shell = rustOutputs.${name}.devShell;
|
|
||||||
in
|
|
||||||
attrs
|
attrs
|
||||||
// {
|
// {
|
||||||
command = pkgs.writeShellApplication {
|
command = pkgs.writeShellApplication {
|
||||||
|
|
@ -180,7 +177,6 @@
|
||||||
text = ''
|
text = ''
|
||||||
${sourceDotenv}
|
${sourceDotenv}
|
||||||
set -x
|
set -x
|
||||||
${pluralkitConfCheck}
|
|
||||||
nix develop .#services -c cargo run --package ${name}
|
nix develop .#services -c cargo run --package ${name}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
@ -195,7 +191,6 @@
|
||||||
text = ''
|
text = ''
|
||||||
${sourceDotenv}
|
${sourceDotenv}
|
||||||
set -x
|
set -x
|
||||||
${pluralkitConfCheck}
|
|
||||||
${self'.apps.generate-command-parser-bindings.program}
|
${self'.apps.generate-command-parser-bindings.program}
|
||||||
nix develop .#bot -c bash -c "dotnet build ./PluralKit.Bot/PluralKit.Bot.csproj -c Release -o obj/ && dotnet obj/PluralKit.Bot.dll"
|
nix develop .#bot -c bash -c "dotnet build ./PluralKit.Bot/PluralKit.Bot.csproj -c Release -o obj/ && dotnet obj/PluralKit.Bot.dll"
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue