diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-09-27 16:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-27 16:27:34 +0200 |
| commit | 36586c2ab3171445d17dd2d5fd3569c6d186ad7e (patch) | |
| tree | 3fc06f7c724e719f18f309b311071af9e6306a7b /pkgs | |
| parent | deb32ec23fa34b354f683256f4a8f082f9987515 (diff) | |
| parent | a1f6a1a938d246598b1027aa684d5553c4ace48c (diff) | |
| download | nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar.gz nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar.bz2 nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar.lz nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar.xz nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.tar.zst nixlib-36586c2ab3171445d17dd2d5fd3569c6d186ad7e.zip | |
Merge pull request #18984 from FRidh/sabnzbd
sabnzbd: 0.7.20 -> 1.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sabnzbd/builder.sh | 13 | ||||
| -rw-r--r-- | pkgs/servers/sabnzbd/default.nix | 27 |
2 files changed, 18 insertions, 22 deletions
diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh deleted file mode 100644 index c446891d8dc3..000000000000 --- a/pkgs/servers/sabnzbd/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -tar xvfz $src -mv SABnzbd-* $out - -mkdir $out/bin -echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd -chmod +x $out/bin/sabnzbd - -wrapPythonProgramsIn $out/bin "$pythonPath" -wrapProgram $out/bin/.sabnzbd-wrapped --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" - -echo $out diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index ee2176ae49a1..382e8de224c7 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,24 +1,33 @@ -{stdenv, fetchurl, python, pythonPackages, par2cmdline, unzip, unrar}: +{stdenv, fetchurl, python, par2cmdline, unzip, unrar, p7zip, makeWrapper}: -stdenv.mkDerivation rec { - version = "0.7.20"; +let + pythonEnv = python.withPackages(ps: with ps; [ pyopenssl python.modules.sqlite3 cheetah]); + path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; +in stdenv.mkDerivation rec { + version = "1.1.0"; name = "sabnzbd-${version}"; src = fetchurl { - url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz"; - sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0"; + url = "https://github.com/sabnzbd/sabnzbd/archive/${version}.tar.gz"; + sha256 = "16srhknmjx5x2zsg1m0w9bipcv9b3b96bvb27fkf4dc2aswwcsc7"; }; - pythonPath = with pythonPackages; [ pyopenssl sqlite3 cheetah ]; - buildInputs = with pythonPackages; [wrapPython]; - inherit python par2cmdline unzip unrar; + buildInputs = [ pythonEnv makeWrapper ]; - builder = ./builder.sh; + installPhase = '' + mkdir -p $out + cp -R * $out/ + mkdir $out/bin + echo "${pythonEnv}/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd + chmod +x $out/bin/sabnzbd + wrapProgram $out/bin/sabnzbd --set PATH : ${path} + ''; meta = with stdenv.lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; homepage = http://sabnzbd.org; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fridh ]; }; } |