From 417de14e904f12ed6d95fd4a951427c18ae5c8e5 Mon Sep 17 00:00:00 2001
From: SuperSamus <40663462+SuperSamus@users.noreply.github.com>
Date: Wed, 28 Jun 2023 14:03:50 +0200
Subject: [PATCH] rare: 1.9.4 -> 1.10.3 (#240310)

* rare: 1.9.4 -> 1.10.3

Diff: https://github.com/Dummerle/Rare/compare/refs/tags/1.9.4...1.10.3

* Update pkgs/games/rare/default.nix

---------

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 pkgs/games/rare/default.nix                |  5 ++---
 pkgs/games/rare/fix-instance.patch         | 10 ----------
 pkgs/games/rare/legendary-gl-version.patch |  4 ++--
 3 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/games/rare/fix-instance.patch

diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix
index 68ad3c87260..5253d78be57 100644
--- a/pkgs/games/rare/default.nix
+++ b/pkgs/games/rare/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonApplication rec {
   pname = "rare";
-  version = "1.9.4";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "Dummerle";
     repo = "Rare";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-+STwVsDdvjP7HaqmaQVug+6h0n0rw/j4LGQQSNdLVQQ=";
+    hash = "sha256-7KER9gCpqjEKikQTVHsvwX6efCb9L0ut6OBjjLBW2tI=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,6 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    ./fix-instance.patch
     # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342
     ./legendary-gl-version.patch
   ];
diff --git a/pkgs/games/rare/fix-instance.patch b/pkgs/games/rare/fix-instance.patch
deleted file mode 100644
index 9f0ed0600d6..00000000000
--- a/pkgs/games/rare/fix-instance.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/rare/utils/misc.py b/rare/utils/misc.py
-index 4492074..5352dac 100644
---- a/rare/utils/misc.py
-+++ b/rare/utils/misc.py
-@@ -190,6 +190,7 @@ def get_rare_executable() -> List[str]:
-         executable = [sys.executable]
- 
-     executable[0] = os.path.abspath(executable[0])
-+    executable.pop(0)
-     return executable
diff --git a/pkgs/games/rare/legendary-gl-version.patch b/pkgs/games/rare/legendary-gl-version.patch
index bd7fa1af74f..1ed9659d2b2 100644
--- a/pkgs/games/rare/legendary-gl-version.patch
+++ b/pkgs/games/rare/legendary-gl-version.patch
@@ -6,8 +6,8 @@ index 2416360..08de818 100644
  
  requirements = [
      "requests<3.0",
--    "legendary-gl==0.20.31",
-+    "legendary-gl~=0.20.31",
+-    "legendary-gl==0.20.32",
++    "legendary-gl~=0.20.32",
      "setuptools",
      "wheel",
      "PyQt5",