schmittlauch/nixos-seafile-overlay
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

bump versions of Seafile 7.1.1 components and adapt to python3

Browse source
This commit is contained in:
Trolli Schmittlauch 2019-12-25 01:39:32 +01:00
parent 6b5ed21c12
commit dee32b0b70
2 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libsearpc/default.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: {stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.1.0"; version = "3.2.0";
name = "libsearpc-${version}"; name = "libsearpc-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {

40
seafile-server/default.nix
View file

@ -1,17 +1,18 @@
{ stdenv, lib, fetchFromGitHub, { stdenv, lib, fetchFromGitHub,
autoconf, automake, autoreconfHook, pkgconfig, curl, libevent, glib, libuuid, intltool, sqlite, withMysql ? true, libmysql, libarchive, libtool, jansson, vala, fuse, openssl, libevhtp, ccnet, libsearpc, which, autoconf, automake, autoreconfHook, pkgconfig, curl, libevent, glib, libuuid, intltool, sqlite, withMysql ? true, libmysql, libarchive, libtool, jansson, vala, fuse, openssl, libevhtp, ccnet, libsearpc, which,
# for SeaHub # for SeaHub
python27, python27Packages }: python3, python3Packages }:
let let
version = "7.0.5"; version = "7.1.1";
python = python27; python = python3;
pythonPackages = python27Packages; pythonPackages = python3Packages;
django = pythonPackages.django_1_11;
djangoModules = with pythonPackages; [ django-statici18n django-post_office django-picklefield django-formtools djangorestframework ];
seahubPythonDependencies = with pythonPackages; [ seahubPythonDependencies = with pythonPackages; [
django pytz django-statici18n djangorestframework django_compressor django django-webpack-loader future captcha gunicorn pymysql openpyxl qrcode dateutil requests pillow pyjwt pycryptodome
django-post_office django-constance gunicorn flup chardet dateutil six ]
openpyxl pysqlite jsonfield pillow ++ map (p: p.override { django = django; }) djangoModules; # build django modules with required version
];
seafile-server-core = stdenv.mkDerivation rec { seafile-server-core = stdenv.mkDerivation rec {
name = "seafile-server-core"; name = "seafile-server-core";
inherit version; inherit version;
@ -19,7 +20,7 @@
owner = "haiwen"; owner = "haiwen";
repo = "seafile-server"; repo = "seafile-server";
rev = "v${version}-server"; rev = "v${version}-server";
sha256 = "sha256:1875qsdcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl"; sha256 = "sha256:1805q0dcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl";
}; };
# patch to work with latest, non-vulnerable libevhtp # patch to work with latest, non-vulnerable libevhtp
patches = [ patches = [
@ -48,7 +49,7 @@
owner = "haiwen"; owner = "haiwen";
repo = "seahub"; repo = "seahub";
rev = "v${version}-server"; rev = "v${version}-server";
sha256 = "sha256:04wy0cj76j8kwgnx6iqja5gpc3q661lcy64qpqf3bzi907bad6xp"; sha256 = "sha256:1s5yd4w5z31hx3x7cd25zgzv7h2yzbdbryypa9in19akmsmb11fp";
}; };
phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
buildInputs = [ python pythonPackages.wrapPython ]; buildInputs = [ python pythonPackages.wrapPython ];
@ -58,6 +59,7 @@
cd "$out" cd "$out"
${python.interpreter} -m compileall ./ ${python.interpreter} -m compileall ./
buildPythonPath $propagatedBuildInputs buildPythonPath $propagatedBuildInputs
set -x
patchPythonScript manage.py patchPythonScript manage.py
''; '';
meta = with lib; { meta = with lib; {
@ -65,22 +67,6 @@
maintainers = with maintainers; [ schmittlauch ]; maintainers = with maintainers; [ schmittlauch ];
}; };
}; };
django-constance = pythonPackages.buildPythonPackage rec {
pname = "django-constance";
version = "1.0.1";
src = fetchFromGitHub {
owner = "haiwen";
repo = pname;
rev = "bde7f7c";
sha256 = "sha256:0m5hhylsrs6bn7ma04615r1n7jwykyw8kmbw1xqrkgxs259lm77h";
};
propagatedBuildInputs = with pythonPackages; [ django ];
checkInputs = [ pythonPackages.redis pythonPackages.coverage pythonPackages.django-picklefield ];
doCheck = false; # figure that out later
meta = {
license = lib.licenses.bsd3;
};
};
ccnet-server = stdenv.mkDerivation rec { ccnet-server = stdenv.mkDerivation rec {
name = "ccnet-server"; name = "ccnet-server";
inherit version; inherit version;
@ -88,7 +74,7 @@
owner = "haiwen"; owner = "haiwen";
repo = "ccnet-server"; repo = "ccnet-server";
rev = "v${version}-server"; rev = "v${version}-server";
sha256 = "sha256:0mi0d2b4jwg511r0pp2ws9cw8ab6njplwy2a03wn6zi8q8fpjl38"; sha256 = "sha256:0hf9mmf019984ybc20zxaqyhcfhhr3k0bjr45pq9d79w16ndnim8";
}; };
buildInputs = [ vala libsearpc libuuid sqlite openssl libevent glib python ] buildInputs = [ vala libsearpc libuuid sqlite openssl libevent glib python ]