From 298616d3927a5cb92412a62c8ef13ea50ef95ffd Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 21 Nov 2024 23:17:54 +0100 Subject: [PATCH] vikunja: add patches for 0.24.5 security fixes https://vikunja.io/changelog/vikunja-v0.24.5-was-released --- pkgs/by-name/vi/vikunja/package.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index cc9891f3ccd15..95fe5b2dc2439 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, stdenvNoCC, nodePackages, buildGoModule, jq, mage, writeShellScriptBin, nixosTests, buildNpmPackage, moreutils, cacert }: +{ lib, fetchFromGitHub, fetchpatch, stdenv, stdenvNoCC, nodePackages, buildGoModule, jq, mage, writeShellScriptBin, nixosTests, buildNpmPackage, moreutils, cacert }: let version = "0.23.0"; @@ -9,9 +9,23 @@ let hash = "sha256-DGdJ/qO86o4LDB2Soio6/zd5S0su6ffrtT+iOn1eQnA="; }; + patches = [ + # security patches from 0.24.5 + (fetchpatch { + name = "security-check-saved-filters-permissions.patch"; + url = "https://github.com/go-vikunja/vikunja/commit/bbbd936868f73a73e37d0f40313274e9e0ba30ac.patch"; + hash = "sha256-xEsecgmfxx3M92Bpe/cDYNghP5gvEDN5D0xDZEeETuU="; + }) + (fetchpatch { + name = "security-check-saved-filters-permissions.patch"; + url = "https://github.com/go-vikunja/vikunja/commit/3659b7b58d4405452f3e806e12b0e3dfb4577503.patch"; + hash = "sha256-1TQFe1N3/gwbamN5ZzKgP04oRbx5x+Tlmrt8H7V/Q2A="; + }) + ]; + frontend = stdenv.mkDerivation (finalAttrs: { pname = "vikunja-frontend"; - inherit version src; + inherit version src patches; postPatch = '' cd frontend @@ -103,7 +117,7 @@ let ''; in buildGoModule { - inherit src version; + inherit src version patches; pname = "vikunja"; nativeBuildInputs =