Merge pull request #230560 from legendofmiracles/upddate-nodjs-asf (d1991373) · Commits · nix / nixpkgs

nixos/modules/services/games/asf.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ in

		rm -f www
		${optionalString cfg.web-ui.enable ''
		ln -s ${cfg.web-ui.package}/lib/dist www
		ln -s ${cfg.web-ui.package}/ www
		''}
		'';
		};

+10 −17

Original line number	Diff line number	Diff line
		{ lib, pkgs, fetchFromGitHub, nodejs, nodePackages, stdenv, ArchiSteamFarm }:
		{ lib, fetchFromGitHub, buildNpmPackage, nodePackages, ArchiSteamFarm }:

		let
		nodePackages = import ./node-composition.nix {
		inherit pkgs nodejs;
		inherit (stdenv.hostPlatform) system;
		};
		buildNpmPackage {
		pname = "asf-ui";
		inherit (ArchiSteamFarm) version;

		src = fetchFromGitHub {
		owner = "JustArchiNET";
		@@ -15,20 +13,15 @@ let
		sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
		};

		in
		nodePackages.package.override {
		inherit src;
		npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU=";

		# upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time)
		version = ArchiSteamFarm.version;
		installPhase = ''
		runHook preInstall

		nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ];
		mkdir $out
		cp -rv dist/* $out/

		postInstall = ''
		patchShebangs node_modules/
		npm run build
		cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist
		rm -rf $out/lib/node_modules/
		runHook postInstall
		'';

		meta = with lib; {

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		# This file has been generated by node2nix 1.11.1. Do not edit!

		{pkgs ? import <nixpkgs> {
		inherit system;
		}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:

		let
		nodeEnv = import ../../../../development/node-packages/node-env.nix {
		inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
		inherit pkgs nodejs;
		libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
		};
		in
		import ./node-packages.nix {
		inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
		inherit nodeEnv;
		}

deleted100644 → 0

+0 −7428

File deleted.

Preview size limit exceeded, changes collapsed.