From b254f0716b5d90c63f47990ec56555205e62bde8 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 16 Sep 2023 09:21:57 +0000 Subject: [PATCH] engrampa: add a warning to make sure i tend this once upstream updates --- pkgs/patched/cozy/default.nix | 1 + pkgs/patched/engrampa/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/patched/cozy/default.nix b/pkgs/patched/cozy/default.nix index a7e352a5..71a73631 100644 --- a/pkgs/patched/cozy/default.nix +++ b/pkgs/patched/cozy/default.nix @@ -2,6 +2,7 @@ patches = upstream.patches or [] ++ [ (fetchpatch { # 2023/03/29: Fix "invalid version" crash on startup + # - 2023/09/15: still not merged upstream url = "https://github.com/geigi/cozy/pull/762.diff"; hash = "sha256-Wk03NGVU7OsQu3AGILtRsQX2r+wPOt5U85cOWu4q6Uo="; }) diff --git a/pkgs/patched/engrampa/default.nix b/pkgs/patched/engrampa/default.nix index 5f501b7c..2606bdb8 100644 --- a/pkgs/patched/engrampa/default.nix +++ b/pkgs/patched/engrampa/default.nix @@ -1,9 +1,10 @@ { mate , fetchFromGitHub +, lib }: mate.engrampa.overrideAttrs (super: { pname = "engrampa-sane"; - src = fetchFromGitHub { + src = lib.warnIf (super.version != "1.26.1") fetchFromGitHub { owner = "mate-desktop"; repo = "engrampa"; # point to a version > 1.27.0, for working cross compilation.