Unverified Commit 195e5ce7 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #233355 from rembo10/sickgear-update

parents fdf2f158 c00e06a3
Loading
Loading
Loading
Loading
+5 −17
Original line number Diff line number Diff line
From e97f418803c1db9a753fa755a9ee0cf04eabaed3 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Sun, 11 Sep 2022 13:00:29 +0530
Subject: [PATCH] Allow running on unsupported Python versions

---
 sickgear.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sickgear.py b/sickgear.py
index 9d0440bb..6d65e65d 100755
index c37e2b01..d69704a3 100755
--- a/sickgear.py
+++ b/sickgear.py
@@ -43,10 +43,7 @@ versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 14)),
             ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 14)),
             ((3, 10, 0), (3, 10, 7))]  # inclusive version ranges
@@ -41,10 +41,7 @@ versions = [((3, 8, 0), (3, 8, 16)),
             ((3, 10, 0), (3, 11, 3))]  # inclusive version ranges
 if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)):
-    print('Python %s.%s.%s detected.' % sys.version_info[:3])
     major, minor, micro = sys.version_info[:3]
-    print('Python %s.%s.%s detected.' % (major, minor, micro))
-    print('Sorry, SickGear requires a Python version %s' % ', '.join(map(
-        lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions)))
-    sys.exit(1)
@@ -23,6 +14,3 @@ index 9d0440bb..6d65e65d 100755
 
 sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
 is_win = 'win' == sys.platform[0:3]
-- 
2.37.2
+5 −8
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ let
  pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
in stdenv.mkDerivation rec {
  pname = "sickgear";
  version = "0.25.60";
  version = "3.29.3";

  src = fetchFromGitHub {
    owner = "SickGear";
    repo = "SickGear";
    rev = "release_${version}";
    sha256 = "sha256-5I6hJgUN2BdHc80RrcmWWxdq0iz6rcO4aX16CDtwu/g=";
    hash = "sha256-aPpzWGVQS7waPJXHSdL/6cBhARgpE7/uIdvSadvsB0A=";
  };

  patches = [
@@ -23,15 +23,12 @@ in stdenv.mkDerivation rec {
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ pythonEnv libarchive ];

  postPatch = ''
    substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python"
  '';

  installPhase = ''
    mkdir -p $out/bin $out/opt/sickgear
    cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py} $out/opt/sickgear/
    cp -R {autoProcessTV,gui,lib,sickgear,sickgear.py} $out/opt/sickgear/

    makeWrapper $out/opt/sickgear/sickgear.py $out/bin/sickgear
    makeWrapper $out/opt/sickgear/sickgear.py $out/bin/sickgear \
      --suffix PATH : ${lib.makeBinPath [ libarchive ]}
  '';

  meta = with lib; {