From cc8ade27ab28da5c23c1ce5ea25f4b200b9f37cf Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 23 Sep 2025 10:30:34 +0800 Subject: [PATCH] spicetify-cli: 2.41.0 -> 2.42.0 Diff: https://github.com/spicetify/cli/compare/v2.41.0...v2.42.0 --- pkgs/by-name/sp/spicetify-cli/package.nix | 19 ++++++++----------- pkgs/by-name/sp/spicetify-cli/version.patch | 14 -------------- 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 pkgs/by-name/sp/spicetify-cli/version.patch diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 5c570d231d9c..74247a932a35 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -3,34 +3,31 @@ buildGoModule, fetchFromGitHub, testers, - replaceVars, spicetify-cli, }: buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-07++H76LBlfCcdm5uEpQrS5UMCZadLp1I6J4ZMaIPUo="; + hash = "sha256-beMxE5ZpFqilgk4Xa0mvJyexDAFdwKUa1rJipFXBM7I="; }; - vendorHash = "sha256-W5i7R/maFvoouoSzPFEJMAp64H1Zsac24CiKuDt/cMY="; + vendorHash = "sha256-UwZ5wtZ5akmn3GF93XAqJqr9mUfbFQTD/LU8YUeoaGA="; + + postPatch = '' + substituteInPlace src/preprocess/preprocess.go \ + --replace-fail 'version != "Dev"' 'version != "${finalAttrs.version}"' + ''; ldflags = [ "-s -w" "-X 'main.version=${finalAttrs.version}'" ]; - patches = [ - # Stops spicetify from attempting to fetch a newer css-map.json - (replaceVars ./version.patch { - inherit (finalAttrs) version; - }) - ]; - postInstall = /* jsHelper and css-map.json are required at runtime diff --git a/pkgs/by-name/sp/spicetify-cli/version.patch b/pkgs/by-name/sp/spicetify-cli/version.patch deleted file mode 100644 index a6e1fede5a2d..000000000000 --- a/pkgs/by-name/sp/spicetify-cli/version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/preprocess/preprocess.go b/src/preprocess/preprocess.go -index ac0f084..f38ece2 100644 ---- a/src/preprocess/preprocess.go -+++ b/src/preprocess/preprocess.go -@@ -66,7 +66,7 @@ func Start(version string, extractedAppsPath string, flags Flag) { - var cssTranslationMap = make(map[string]string) - // readSourceMapAndGenerateCSSMap(appPath) - -- if version != "Dev" { -+ if version != "@version@" { - tag, err := FetchLatestTagMatchingOrMain(version) - if err != nil { - utils.PrintWarning("Cannot fetch version tag for CSS mappings") -