From 9bcc347c837194c355f01e6bcca7fbc8b1075fc6 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sat, 12 Oct 2019 22:45:05 +0200
Subject: [PATCH] fix django-constance build and add licenses

---
 default.nix                |  1 +
 seafile-server/default.nix | 39 +++++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/default.nix b/default.nix
index dc0038d..8c94652 100644
--- a/default.nix
+++ b/default.nix
@@ -6,5 +6,6 @@ self: super: rec {
     django-jsonfield = super.python27Packages.callPackage ./django-jsonfield/default.nix {};
     jsonfield = super.python27Packages.callPackage ./jsonfield/default.nix {};
     django-post_office = super.python27Packages.callPackage ./django-post_office/default.nix { inherit jsonfield; };
+    django-statici18n = super.python27Packages.callPackage ./django-statici18n/default.nix {};
   };
 }
diff --git a/seafile-server/default.nix b/seafile-server/default.nix
index f5c7fde..8cd707f 100644
--- a/seafile-server/default.nix
+++ b/seafile-server/default.nix
@@ -22,6 +22,11 @@
       nativeBuildInputs = [ autoconf automake libtool pkgconfig vala autoreconfHook which ];
       buildInputs = [ sqlite glib python27 libuuid openssl fuse libarchive ccnet-server libevent libsearpc libevhtp ];
       checkPhase = "bash ./run_tests.sh";
+
+      meta = with lib; {
+        license = licenses.agpl3; # with additional OpenSSL linking exception
+        maintainers = with maintainers; [ schmittlauch ];
+      };
     };
     seahub = python27Packages.buildPythonApplication rec {
       name = "seahub";
@@ -33,25 +38,29 @@
         #sha256 = "sha256:1aypbqrv30x9mmhiwcmkmzmac0mw0gx7cb1n4x90h46iqlbanhnq";
         sha256 = "sha256:19f9279zqkfy39gs1qfaj0m8asva5jgadh8f0yln8ln4khsrcnk8";
       };
-      phases = [ "installPhase" "fixupPhase" "distPhase" ];
-      installPhase = ''
-        find ./
-        '';
-    };
-    propagatedBuildInputs = with python27Packages; [
-      django pytz django-statici18n djangorestframework django_compressor
-      django-post_office django-constance gunicorn flup chardet dateutil six
-      openpyxl
+      phases = [ "unpackPhase" "fixupPhase" "distPhase" ];
+      propagatedBuildInputs = with python27Packages; [
+        django pytz django-statici18n djangorestframework django_compressor
+        django-post_office django-constance gunicorn flup chardet dateutil six
+        openpyxl
       ];
-    django-constance = python27.buildPythonPackage rec {
+      meta = with lib; {
+        license = licenses.asl20;
+        maintainers = with maintainers; [ schmittlauch ];
+      };
+    };
+    django-constance = python27Packages.buildPythonPackage rec {
       pname = "django-constance";
       version = "1.0.1";
       src = fetchFromGitHub {
         owner = "haiwen";
         repo = pname;
         rev = "bde7f7c";
-        sha256 = "sha256:12ccqa3168n0s8mqgywbg87qk72yh9salqxafcq4nc4lc3mcsmxx";
+        sha256 = "sha256:0m5hhylsrs6bn7ma04615r1n7jwykyw8kmbw1xqrkgxs259lm77h";
       };
+      propagatedBuildInputs = with python27Packages; [ django ];
+      checkInputs = [ python27Packages.redis python27Packages.coverage python27Packages.django-picklefield ];
+      doCheck = false; # figure that out later
       meta = {
         license = lib.licenses.bsd3;
       };
@@ -90,6 +99,10 @@
       mkdir "$out"
       cd "$out"
       ln -s ${seahub} seahub
-      ln -s ${seafile-server-core} seafile-core
+      ln -s ${seafile-server-core} seaf-server
       '';
-  }
+    meta = with lib; {
+      maintainers = with maintainers; [ schmittlauch ];
+      license = licenses.free; # components with different free software licenses are combined
+    };
+}