pyrox.dev
lol
Merge pull request #11678 from jcbrand/sabnzbd-ssl
sabnzbd: Add OpenSSL support and fix wrapping
+16
-15
+2
-5
pkgs/servers/sabnzbd/builder.sh
+2
-5
pkgs/servers/sabnzbd/builder.sh
···
3
3
tar xvfz $src
4
4
mv SABnzbd-* $out
5
5
6
-
# Create a start script and let wrapProgram with toPythonPath wrap it so that python is started with cheetahTemplate in its importpath (classpath)
7
6
mkdir $out/bin
8
7
echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
9
8
chmod +x $out/bin/sabnzbd
10
9
11
-
for i in $(cd $out/bin && ls); do
12
-
wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \
13
-
--prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
14
-
done
10
+
wrapPythonProgramsIn $out/bin "$pythonPath"
11
+
wrapProgram $out/bin/.sabnzbd-wrapped --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
15
12
16
13
echo $out
+14
-10
pkgs/servers/sabnzbd/default.nix
+14
-10
pkgs/servers/sabnzbd/default.nix
···
1
-
{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
1
+
{stdenv, fetchurl, python, pythonPackages, par2cmdline, unzip, unrar}:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "sabnzbd-0.7.17";
5
-
4
+
version = "0.7.20";
5
+
name = "sabnzbd-${version}";
6
+
6
7
src = fetchurl {
7
-
url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz;
8
-
sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5";
8
+
url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz";
9
+
sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0";
9
10
};
10
11
11
-
buildInputs = [makeWrapper python sqlite3 cheetahTemplate];
12
-
inherit stdenv python cheetahTemplate par2cmdline unzip unrar;
13
-
inherit (pythonPackages) sqlite3;
12
+
pythonPath = with pythonPackages; [ pyopenssl sqlite3 cheetah ];
13
+
buildInputs = with pythonPackages; [wrapPython];
14
+
inherit python par2cmdline unzip unrar;
14
15
15
16
builder = ./builder.sh;
16
-
17
-
meta = {
17
+
18
+
meta = with stdenv.lib; {
18
19
description = "Usenet NZB downloader, par2 repairer and auto extracting server";
20
+
homepage = http://sabnzbd.org;
21
+
license = licenses.gpl2Plus;
22
+
platforms = platforms.linux;
19
23
};
20
24
}