diff --git a/libsearpc/default.nix b/libsearpc/default.nix index ff32219..14ef2e3 100644 --- a/libsearpc/default.nix +++ b/libsearpc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.0"; name = "libsearpc-${version}"; src = fetchFromGitHub { diff --git a/seafile-server/default.nix b/seafile-server/default.nix index 2fc1a80..22ab3ad 100644 --- a/seafile-server/default.nix +++ b/seafile-server/default.nix @@ -1,17 +1,18 @@ { 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, # for SeaHub - python27, python27Packages }: + python3, python3Packages }: let - version = "7.0.5"; - python = python27; - pythonPackages = python27Packages; + version = "7.1.1"; + python = python3; + pythonPackages = python3Packages; + django = pythonPackages.django_1_11; + djangoModules = with pythonPackages; [ django-statici18n django-post_office django-picklefield django-formtools djangorestframework ]; seahubPythonDependencies = with pythonPackages; [ - django pytz django-statici18n djangorestframework django_compressor - django-post_office django-constance gunicorn flup chardet dateutil six - openpyxl pysqlite jsonfield pillow - ]; + django django-webpack-loader future captcha gunicorn pymysql openpyxl qrcode dateutil requests pillow pyjwt pycryptodome + ] + ++ map (p: p.override { django = django; }) djangoModules; # build django modules with required version seafile-server-core = stdenv.mkDerivation rec { name = "seafile-server-core"; inherit version; @@ -19,7 +20,7 @@ owner = "haiwen"; repo = "seafile-server"; rev = "v${version}-server"; - sha256 = "sha256:1875qsdcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl"; + sha256 = "sha256:1805q0dcy6lw0nkjqjg8qwahwqxm8iy02lw8012s5qp91jcg8gpl"; }; # patch to work with latest, non-vulnerable libevhtp patches = [ @@ -48,7 +49,7 @@ owner = "haiwen"; repo = "seahub"; rev = "v${version}-server"; - sha256 = "sha256:04wy0cj76j8kwgnx6iqja5gpc3q661lcy64qpqf3bzi907bad6xp"; + sha256 = "sha256:1s5yd4w5z31hx3x7cd25zgzv7h2yzbdbryypa9in19akmsmb11fp"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; buildInputs = [ python pythonPackages.wrapPython ]; @@ -58,6 +59,7 @@ cd "$out" ${python.interpreter} -m compileall ./ buildPythonPath $propagatedBuildInputs + set -x patchPythonScript manage.py ''; meta = with lib; { @@ -65,22 +67,6 @@ 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 { name = "ccnet-server"; inherit version; @@ -88,7 +74,7 @@ owner = "haiwen"; repo = "ccnet-server"; rev = "v${version}-server"; - sha256 = "sha256:0mi0d2b4jwg511r0pp2ws9cw8ab6njplwy2a03wn6zi8q8fpjl38"; + sha256 = "sha256:0hf9mmf019984ybc20zxaqyhcfhhr3k0bjr45pq9d79w16ndnim8"; }; buildInputs = [ vala libsearpc libuuid sqlite openssl libevent glib python ]