sunshine: use upstream package-lock.json

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>

pkgs/by-name/su/sunshine/package.nix

@@ -114,11 +114,6 @@ stdenv'.mkDerivation (finalAttrs: {
     pname = "sunshine-ui";
     npmDepsHash = "sha256-YnNnuAdj/S5LGNytqIsmCApIec8DTWKF6VIJ7AXUctU=";
 
-    # use generated package-lock.json as upstream does not provide one
-    postPatch = ''
-      cp ${./package-lock.json} ./package-lock.json
-    '';
-
     installPhase = ''
       runHook preInstall
 
@@ -276,9 +271,9 @@ stdenv'.mkDerivation (finalAttrs: {
 
   env = {
     # needed to trigger CMake version configuration
-    BUILD_VERSION = "${finalAttrs.version}";
+    BUILD_VERSION = finalAttrs.version;
     BRANCH = "master";
-    COMMIT = "";
+    COMMIT = finalAttrs.src.rev;
   };
 
   # copy webui where it can be picked up by build
@@ -310,9 +305,7 @@ stdenv'.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = lib.optionals isLinux [ udevCheckHook ];
 
   passthru = {
-    tests = lib.optionalAttrs isLinux {
-      sunshine = nixosTests.sunshine;
-    };
+    tests = { inherit (nixosTests) sunshine; };
     updateScript = ./updater.sh;
   };
 

pkgs/by-name/su/sunshine/updater.sh

@@ -57,12 +57,6 @@ if ! grep -q "$src_hash" "$package_nix"; then
     exit 1
 fi
 
-log "Regenerating sunshine.ui package-lock.json"
-# `--generate-lockfile` only regenerates package-lock.json; it skips the npmDepsHash
-# refresh (see nix-update's dependency_hashes.py). Run a second pass to update the hash.
-# `--no-src` avoids re-fetching the (already-pinned) sunshine src on each pass.
-nix-update sunshine --version=skip --no-src --generate-lockfile --subpackage ui
-
 log "Refreshing sunshine.ui npmDepsHash"
 nix-update sunshine --version=skip --no-src --subpackage ui