From f1588f3f1f2345ae6320e01683e63225d19d632d Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 19 Feb 2026 12:04:47 -0500 Subject: [PATCH] invoiceplane: 1.7.0 -> 1.7.1 Resolves #492036, #492037, #492038, #492039, #492040, #492041, #492042, #492043, #492044, #492045, #492046 Upstream security advisory: https://github.com/InvoicePlane/InvoicePlane/security/advisories/GHSA-88gq-mv54-v3fc Upstream release notes: https://github.com/InvoicePlane/InvoicePlane/releases/tag/v1.7.1 --- .../in/invoiceplane/fix-yarn-lockfile.patch | 19 ------------------- pkgs/by-name/in/invoiceplane/package.nix | 19 +++++++------------ 2 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch diff --git a/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch b/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch deleted file mode 100644 index dc25725398f5..000000000000 --- a/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock -index 227d51e2..11c80f04 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -1397,10 +1397,10 @@ safe-json-parse@~1.0.1: - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - --sass@^1.89.2: -- version "1.97.2" -- resolved "https://registry.yarnpkg.com/sass/-/sass-1.97.2.tgz#e515a319092fd2c3b015228e3094b40198bff0da" -- integrity sha512-y5LWb0IlbO4e97Zr7c3mlpabcbBtS+ieiZ9iwDooShpFKWXf62zz5pEPdwrLYm+Bxn1fnbwFGzHuCLSA9tBmrw== -+sass@^1.97: -+ version "1.97.3" -+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.97.3.tgz#9cb59339514fa7e2aec592b9700953ac6e331ab2" -+ integrity sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg== - dependencies: - chokidar "^4.0.0" - immutable "^5.0.2" diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix index a0b8b6faf144..43573cbe8312 100644 --- a/pkgs/by-name/in/invoiceplane/package.nix +++ b/pkgs/by-name/in/invoiceplane/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, nixosTests, fetchYarnDeps, - applyPatches, php, yarnConfigHook, yarnBuildHook, @@ -12,13 +11,12 @@ fetchzip, }: let - version = "1.7.0"; + version = "1.7.1"; # Fetch release tarball which contains language files # https://github.com/InvoicePlane/InvoicePlane/issues/1170 languages = fetchzip { - #url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; - url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v1.7.0/v1.7.0.zip"; - hash = "sha256-D5wZg745xjbBsEPUbvle8ynErFB4xn9zdxOGh0xKCCU="; + url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; + hash = "sha256-DpQazuLOJnNGrrQo7l6uQReoKZEd5es2DT0a50NuQB0="; }; in php.buildComposerProject2 (finalAttrs: { @@ -29,16 +27,13 @@ php.buildComposerProject2 (finalAttrs: { owner = "InvoicePlane"; repo = "InvoicePlane"; tag = "v${version}"; - hash = "sha256-6fuUmXe8mFSnLYwQCwBzxmSQxM06rQXe00IKUZvWnpM="; + hash = "sha256-Nci5GaCMYIjewq0W5emE6TDgc6JPz4bVVF3okNtHUag="; }; - # Fixes error: Couldn't find any versions for "sass" that matches "^1.97" in our cache - patches = [ ./fix-yarn-lockfile.patch ]; - # Composer.lock validation currently fails for unknown reason - composerStrictValidation = false; + composerStrictValidation = true; - vendorHash = "sha256-/fNVq3WJCr9f/NE0s1x8N48W3ZMRUxdh1Qf3pLl0Lpg="; + vendorHash = "sha256-adKvKWo55SSbEKpgMJzR9vJQA8DnNXOTfSzp7t8s2Nk="; nativeBuildInputs = [ yarnConfigHook @@ -50,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: { offlineCache = fetchYarnDeps { inherit (finalAttrs) src patches; - hash = "sha256-YDknkQzdRKRRMXS6/cPRSrfhhIyTIDRnFPNGQueu74A="; + hash = "sha256-rJlOYMnzFKui+caIFD4d82Q/RcDYnadeJ1G56fcNNQY="; }; postBuild = ''