fix api-server build

This commit is contained in:
Robin Appelman 2025-04-15 00:40:03 +02:00
commit 65d58569b0
3 changed files with 3 additions and 8 deletions

2
api-server/Cargo.lock generated
View file

@ -1964,7 +1964,6 @@ dependencies = [
[[package]] [[package]]
name = "ugc-scraper" name = "ugc-scraper"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/icewind1991/ugc-scaper#73c7c0a86740ac39239fb307094d7c6561e412c8"
dependencies = [ dependencies = [
"regex", "regex",
"reqwest", "reqwest",
@ -1979,7 +1978,6 @@ dependencies = [
[[package]] [[package]]
name = "ugc-scraper-types" name = "ugc-scraper-types"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/icewind1991/ugc-scaper#73c7c0a86740ac39239fb307094d7c6561e412c8"
dependencies = [ dependencies = [
"serde", "serde",
"steamid-ng", "steamid-ng",

View file

@ -6,8 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread", "rt", "signal"] } tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread", "rt", "signal"] }
main_error = "0.1.2" main_error = "0.1.2"
#ugc-scraper = { version = "*", path = ".." } ugc-scraper = { version = "*", path = ".." }
ugc-scraper = { version = "0.5.0", git = "https://github.com/icewind1991/ugc-scaper" }
#ugc-scraper = "0.5.0" #ugc-scraper = "0.5.0"
axum = "0.8.3" axum = "0.8.3"
steamid-ng = "1.0.0" steamid-ng = "1.0.0"

View file

@ -7,11 +7,12 @@
let let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
inherit (builtins) fromTOML readFile; inherit (builtins) fromTOML readFile;
src = sourceByRegex ./api-server [ "Cargo.*" "(src)(/.*)?" "README.md" ]; src = sourceByRegex ./. [ "Cargo.*" "((types|api-server|)/?(src)?)(/.*)?" "README.md" ];
version = (fromTOML (readFile api-server/Cargo.toml)).package.version; version = (fromTOML (readFile api-server/Cargo.toml)).package.version;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ugc-api-server"; pname = "ugc-api-server";
sourceRoot = "${src.name}/api-server";
inherit src version; inherit src version;
@ -29,8 +30,5 @@ rustPlatform.buildRustPackage rec {
cargoLock = { cargoLock = {
lockFile = ./api-server/Cargo.lock; lockFile = ./api-server/Cargo.lock;
outputHashes = {
"ugc-scraper-0.5.0" = "sha256-G5QCu2BJxyxMH7AuRsr122qAxzABQ/5DY12vCQ9uTCM=";
};
}; };
} }