From 5819054b67906123fbf2dfceb1d2b8c7c2189da8 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sun, 9 Oct 2022 11:40:53 +0200
Subject: guake: 3.6.3 -> 3.9.0

Fixes CVE-2021-23556
---
 pkgs/applications/terminal-emulators/guake/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/terminal-emulators')

diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index cc2dc5c55d617..84674881a73ab 100644
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@@ -15,15 +15,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "guake";
-  version = "3.6.3";
+  version = "3.9.0";
 
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Guake";
     repo = "guake";
-    rev = version;
-    sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
   };
 
   # Strict deps breaks guake
@@ -55,12 +55,15 @@ python3.pkgs.buildPythonApplication rec {
     pycairo
     pygobject3
     setuptools
+    setuptools-scm
+    pyyaml
   ];
 
   PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   makeFlags = [
-    "prefix=${placeholder "out"}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   preFixup = ''
-- 
cgit 1.4.1


From 1441c7930e6bda56bb6e3337010551a3437332a6 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 11 Oct 2022 12:39:17 +0200
Subject: guake: remove gbr, setuptools deps

---
 pkgs/applications/terminal-emulators/guake/default.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'pkgs/applications/terminal-emulators')

diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index 84674881a73ab..ee28a25047815 100644
--- a/pkgs/applications/terminal-emulators/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
@@ -51,15 +51,12 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     dbus-python
-    pbr
     pycairo
     pygobject3
-    setuptools
     setuptools-scm
     pyyaml
   ];
 
-  PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   makeFlags = [
-- 
cgit 1.4.1