Unverified Commit acb6c96b authored by legendofmiracles's avatar legendofmiracles Committed by GitHub
Browse files

Merge pull request #208402 from SuperSandro2000/asf-plugins 

ArchiSteamFarm: 5.3.2.4 -> 5.4.0.3, fix plugins
parents 7a8a0cc9 f8f42c1f

pkgs/applications/misc/ArchiSteamFarm/default.nix

+24 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildDotnetModule

, fetchFromGitHub

, dotnetCorePackages
@@ -12,26 +13,36 @@ 
buildDotnetModule rec {

  pname = "archisteamfarm";

  # nixpkgs-update: no auto update

  version = "5.3.2.4";

  version = "5.4.0.3";



  src = fetchFromGitHub {

    owner = "justarchinet";

    repo = pname;

    rev = version;

    sha256 = "sha256-qjU5TcYkAFJVYTOCwePGOVR9hYKNtinzLt5P4aTs578=";

    sha256 = "sha256-+S0nvgiMxSUQI/TzAMES6bAix1iudj1+EkOcXO+6igE=";

  };



  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

  dotnet-sdk = dotnetCorePackages.sdk_7_0;



  nugetDeps = ./deps.nix;



  projectFile = "ArchiSteamFarm.sln";

  executables = [ "ArchiSteamFarm" ];

  dotnetFlags = [

    "-p:PublishSingleFile=true"

    "-p:PublishTrimmed=true"

  ];

  selfContainedBuild = true;



  runtimeDeps = [ libkrb5 zlib openssl ];



  doCheck = true;



  preBuild = ''

    export projectFile=(ArchiSteamFarm)

  '';



  preInstall = ''

    # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.

    makeWrapperArgs+=(
@@ -40,7 +51,17 @@ buildDotnetModule rec { 
    )

  '';



  postInstall = ''

    buildPlugin() {

      dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \

        --output $out/lib/${pname}/plugins/$1 --configuration Release \

        -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore

     }

     buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper

  '';



  passthru = {

    # nix-shell maintainers/scripts/update.nix --argstr package ArchiSteamFarm

    updateScript = ./update.sh;

    ui = callPackage ./web-ui { };

  };

pkgs/applications/misc/ArchiSteamFarm/deps.nix

+16 −51

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/ArchiSteamFarm/update.sh

+4 −4
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts

#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts

set -euo pipefail

cd "$(dirname "${BASH_SOURCE[0]}")"
@@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then 
fi



asf_path=$PWD

cd ../../../..

push ../../../..



if [[ "${1:-}" != "--deps-only" ]]; then

    update-source-version ArchiSteamFarm "$new_version"
@@ -24,5 +24,5 @@ fi 


$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file"



cd "$asf_path"

exec "$asf_path/web-ui/update.sh"
 
popd

"$asf_path/web-ui/update.sh"

pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, pkgs, fetchFromGitHub, nodejs, stdenv, ArchiSteamFarm, ... }:

{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }:



let

  nodePackages = import ./node-composition.nix {
@@ -11,8 +11,8 @@ let 
    repo = "ASF-ui";

    # updated by the update script

    # this is always the commit that should be used with asf-ui from the latest asf version

    rev = "5f9969bf17e4c6915418655b35fc6b790cd2da0b";

    sha256 = "03y4ahq958rxjnddwnc6h95drdpnvpy16adk434aak4l8hqr24sg";

    rev = "c348d6897324aac1d899a977f9c7d467ea934796";

    sha256 = "1nvglb1wahz20my29jhi3j7824d12pdqf0xfpymnganzfkpj9zjk";

  };



in

pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix

+220 −230

File changed.

Preview size limit exceeded, changes collapsed.