From 807f4a4d1cff8b0e2c6de3528c67947db131ca68 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 10:46:05 +0100 Subject: ma 2configs: cleanup --- makefu/2configs/sickbeard/sickgear.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'makefu/2configs/sickbeard/sickgear.nix') diff --git a/makefu/2configs/sickbeard/sickgear.nix b/makefu/2configs/sickbeard/sickgear.nix index 1b7a57e8b..281ec1845 100644 --- a/makefu/2configs/sickbeard/sickgear.nix +++ b/makefu/2configs/sickbeard/sickgear.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchFromGitHub, python2, makeWrapper }: +{ stdenv, fetchFromGitHub, python3, makeWrapper }: let - pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); + pythonEnv = python3.withPackages(ps: with ps; [ + (python3.pkgs.callPackage ./cheetah3.nix {}) + ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.20.0"; + #version = "0.21.6"; + version = "0.21.7"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; - rev = "release_${version}"; - sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k"; + rev = "hotfix/${version}"; + sha256 = "0kj8l6xq7vycr6d15lxybnk02b39z0zk4jzy0b2lbapgk0kx3ims"; }; dontBuild = true; @@ -18,12 +21,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; + patches = [ ./debug.patch ]; installPhase = '' mkdir -p $out/bin cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ - makeWrapper $out/SickBeard.py $out/bin/sickgear + makeWrapper $out/sickgear.py $out/bin/sickgear ''; meta = with stdenv.lib; { -- cgit v1.2.3 From a2e3c0488a6a7a63ffd34abc5fd8ba84e4e93155 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 13 Mar 2020 12:02:13 +0100 Subject: ma sickgear: bump to latest revision, not use hotfix branch --- makefu/2configs/sickbeard/sickgear.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makefu/2configs/sickbeard/sickgear.nix') diff --git a/makefu/2configs/sickbeard/sickgear.nix b/makefu/2configs/sickbeard/sickgear.nix index 281ec1845..9746ee073 100644 --- a/makefu/2configs/sickbeard/sickgear.nix +++ b/makefu/2configs/sickbeard/sickgear.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "sickgear"; #version = "0.21.6"; - version = "0.21.7"; + version = "0.21.21"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; - rev = "hotfix/${version}"; - sha256 = "0kj8l6xq7vycr6d15lxybnk02b39z0zk4jzy0b2lbapgk0kx3ims"; + rev = "release_${version}"; + sha256 = "15nlxg2867l846qqxklmfyqmn5nc01ksd4lpwbrbjdzpk4y3xi78"; }; dontBuild = true; -- cgit v1.2.3