From 0b62bef7f1174afd1f21aff2643a8c6b9fe0b4c4 Mon Sep 17 00:00:00 2001 From: Shaun Sharples <shaun.sharples@gmail.com> Date: Sat, 7 Jun 2014 14:58:41 +0200 Subject: [PATCH] sabnzbd: fixed typo in url and updated to 0.7.17 --- pkgs/servers/sabnzbd/builder.sh | 2 +- pkgs/servers/sabnzbd/default.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh index c263500cde45..c0408f89009d 100644 --- a/pkgs/servers/sabnzbd/builder.sh +++ b/pkgs/servers/sabnzbd/builder.sh @@ -9,7 +9,7 @@ echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd chmod +x $out/bin/sabnzbd for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \ + wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \ --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" done diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index ace96fbed637..09c0de9c74f1 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: +{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: -stdenv.mkDerivation { - name = "sabnzbd-0.4.12"; +stdenv.mkDerivation rec { + name = "sabnzbd-0.7.17"; src = fetchurl { - url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz; - sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32"; + url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz; + sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5"; }; - buildInputs = [makeWrapper python cheetahTemplate]; + buildInputs = [makeWrapper python sqlite3 cheetahTemplate]; inherit stdenv python cheetahTemplate par2cmdline unzip unrar; + inherit (pythonPackages) sqlite3; builder = ./builder.sh;