diff --git a/pkgs/by-name/st/stump/package.nix b/pkgs/by-name/st/stump/package.nix index 7045bcb575d4..e926c610f82e 100644 --- a/pkgs/by-name/st/stump/package.nix +++ b/pkgs/by-name/st/stump/package.nix @@ -16,20 +16,22 @@ cacert, pkg-config, makeWrapper, + nix-update-script, }: -let +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stump"; version = "0.1.5"; src = fetchFromGitHub { owner = "stumpapp"; repo = "stump"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kstMk4HJopLHW22ynVZF0itWUixwiDkbsMUpYMvw1Ag="; }; - frontend = stdenv.mkDerivation (finalAttrs: { + frontend = stdenv.mkDerivation (_: { pname = "stump-frontend"; - inherit src version; + inherit (finalAttrs) src version; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; @@ -55,10 +57,6 @@ let mv ./apps/web/dist $out ''; }); -in -rustPlatform.buildRustPackage (finalAttrs: { - pname = "stump"; - inherit src version; __structuredAttrs = true; @@ -71,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "stump_server" ]; - env.GIT_REV = "v${version}"; + env.GIT_REV = "v${finalAttrs.version}"; nativeBuildInputs = [ pkg-config @@ -97,14 +95,22 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/stump_server \ --set-default STUMP_CONFIG_DIR /var/lib/stump/config \ - --set-default STUMP_CLIENT_DIR ${frontend} \ + --set-default STUMP_CLIENT_DIR ${finalAttrs.frontend} \ --set-default STUMP_PORT 10001 \ --set-default STUMP_PROFILE release \ --set-default PDFIUM_PATH ${pdfium-binaries}/lib/libpdfium.so \ --set-default API_VERSION v1 ''; - passthru.tests = nixosTests.stump; + passthru = { + tests = nixosTests.stump; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + ]; + }; + }; meta = { homepage = "https://stumpapp.dev/";