diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index d04261df013a7..a64a821b5883e 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -60,7 +60,7 @@ in description = "Whether to start the web-ui. This is the preferred way of configuring things such as the steam guard token."; }; - package = lib.mkPackageOption pkgs [ "ArchiSteamFarm" "ui" ] { + package = lib.mkPackageOption pkgs [ "archisteamfarm" "ui" ] { extraDescription = '' ::: {.note} Contents must be in lib/dist @@ -78,7 +78,7 @@ in description = "The Web-UI hosted on 127.0.0.1:1242."; }; - package = lib.mkPackageOption pkgs "ArchiSteamFarm" { + package = lib.mkPackageOption pkgs "archisteamfarm" { extraDescription = '' ::: {.warning} Should always be the latest version, for security reasons, diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/by-name/ar/archisteamfarm/deps.json similarity index 100% rename from pkgs/applications/misc/ArchiSteamFarm/deps.json rename to pkgs/by-name/ar/archisteamfarm/deps.json diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/by-name/ar/archisteamfarm/package.nix similarity index 96% rename from pkgs/applications/misc/ArchiSteamFarm/default.nix rename to pkgs/by-name/ar/archisteamfarm/package.nix index 97de6046e2706..1d18d7cd471bd 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/by-name/ar/archisteamfarm/package.nix @@ -19,7 +19,7 @@ let ]; in buildDotnetModule rec { - pname = "ArchiSteamFarm"; + pname = "archisteamfarm"; # nixpkgs-update: no auto update version = "6.3.1.6"; @@ -42,6 +42,7 @@ buildDotnetModule rec { testProjectFile = "ArchiSteamFarm.Tests"; executable = "ArchiSteamFarm"; + installPath = "${placeholder "out"}/lib/ArchiSteamFarm"; enableParallelBuilding = false; @@ -95,7 +96,7 @@ buildDotnetModule rec { ''; passthru = { - # nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm + # nix-shell maintainers/scripts/update.nix --argstr package archisteamfarm updateScript = ./update.sh; ui = callPackage ./web-ui { }; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/by-name/ar/archisteamfarm/update.sh similarity index 77% rename from pkgs/applications/misc/ArchiSteamFarm/update.sh rename to pkgs/by-name/ar/archisteamfarm/update.sh index 53d3ee6641912..f8df57756a6f7 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/by-name/ar/archisteamfarm/update.sh @@ -4,7 +4,7 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Already up to date!" @@ -17,10 +17,10 @@ asf_path=$PWD cd ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then - update-source-version ArchiSteamFarm "$new_version" + update-source-version archisteamfarm "$new_version" fi -$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) +$(nix-build -A archisteamfarm.fetch-deps --no-out-link) cd "$asf_path/web-ui" ./update.sh diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore b/pkgs/by-name/ar/archisteamfarm/web-ui/.gitignore similarity index 100% rename from pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore rename to pkgs/by-name/ar/archisteamfarm/web-ui/.gitignore diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/by-name/ar/archisteamfarm/web-ui/default.nix similarity index 91% rename from pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix rename to pkgs/by-name/ar/archisteamfarm/web-ui/default.nix index 0d074397b63c2..bc6a61c0107f5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/by-name/ar/archisteamfarm/web-ui/default.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - ArchiSteamFarm, + archisteamfarm, }: buildNpmPackage rec { @@ -33,6 +33,6 @@ buildNpmPackage rec { description = "Official web interface for ASF"; license = lib.licenses.asl20; homepage = "https://github.com/JustArchiNET/ASF-ui"; - inherit (ArchiSteamFarm.meta) maintainers platforms; + inherit (archisteamfarm.meta) maintainers platforms; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/by-name/ar/archisteamfarm/web-ui/update.sh similarity index 85% rename from pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh rename to pkgs/by-name/ar/archisteamfarm/web-ui/update.sh index 6fa8e67a1217a..eb7e67f5346de 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/by-name/ar/archisteamfarm/web-ui/update.sh @@ -3,14 +3,14 @@ set -eou pipefail cd "$(dirname "$0")"/../../../../.. -version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r) +version=$(nix-instantiate --strict --eval -A archisteamfarm.version | jq -r) cd - ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json cd - -update-source-version ArchiSteamFarm.ui "$ui" +update-source-version archisteamfarm.ui "$ui" cd - npmDepsHash=$(prefetch-npm-deps ./package-lock.json) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9357622e21cf8..600a09c847460 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -311,6 +311,7 @@ mapAliases { arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03 archi = throw "'archi' has been removed, since its upstream maintainers do not want it packaged"; # Added 2025-11-18 archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15 + ArchiSteamFarm = warnAlias "ArchiSteamFarm has been renamed to/replaced by 'archisteamfarm'" archisteamfarm; # Added 2026-01-31 archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01 archiver = throw "archiver has been removed, as it has been unmaintained upstream since November 2024"; # Added 2026-01-15 ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Added 2025-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66b9024e7295d..2535ab6bd5849 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1368,8 +1368,6 @@ with pkgs; }; }; - ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; - arduino = arduino-core.override { withGui = true; }; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };