Merge pull request #152912 from dotlambda/seahub-remove

pkgs/development/libraries/libsearpc/default.nix

@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages
-, glib, jansson }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, python3
+, glib
+, jansson
+}:
 
 stdenv.mkDerivation rec {
   version = "3.2.0";
@@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
     sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = with python3Packages; [ python simplejson ];
-  propagatedBuildInputs = [ glib jansson ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    python3
+  ];
+
+  propagatedBuildInputs = [
+    glib
+    jansson
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/haiwen/libsearpc";

pkgs/development/python-modules/seahub/default.nix

@@ -1,56 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, makeWrapper }:
-
-python3Packages.buildPythonPackage rec {
-  pname = "seahub";
-  version = "8.0.7";
-
-  src = fetchFromGitHub {
-    owner = "haiwen";
-    repo = "seahub";
-    rev = "4f7bb3f617dd847cf0a6b33c0bfb567b44c06059"; # using a fixed revision because upstream may re-tag releases :/
-    sha256 = "09d05sxly1bljxxzm77limhwsbg8c4b54fzv3kmaih59pjnjyr03";
-  };
-
-  dontBuild = true;
-  doCheck = false; # disabled because it requires a ccnet environment
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  propagatedBuildInputs = with python3Packages; [
-    django
-    future
-    django-statici18n
-    django-webpack-loader
-    django-simple-captcha
-    django-picklefield
-    django-formtools
-    mysqlclient
-    pillow
-    python-dateutil
-    django_compressor
-    djangorestframework
-    openpyxl
-    requests
-    requests_oauthlib
-    pyjwt
-    pycryptodome
-    qrcode
-    pysearpc
-    seaserv
-  ];
-
-  installPhase = ''
-    cp -dr --no-preserve='ownership' . $out/
-    wrapProgram $out/manage.py \
-      --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" \
-      --prefix PATH : "${python3Packages.python}/bin"
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/haiwen/seahub";
-    description = "The web end of seafile server";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ greizgh schmittlauch ];
-  };
-}

pkgs/servers/seafile-server/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, python3Packages, autoreconfHook
+{ stdenv, lib, fetchFromGitHub, pkg-config, python3, autoreconfHook
 , libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which
 , vala, cmake, oniguruma }:
 
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     glib
     libsearpc
     libevent
-    python3Packages.python
+    python3
     fuse
     libarchive
     which

pkgs/top-level/python-packages.nix

@@ -7355,7 +7355,9 @@ in {
 
   pysdl2 = callPackage ../development/python-modules/pysdl2 { };
 
-  pysearpc = toPythonModule pkgs.libsearpc;
+  pysearpc = toPythonModule (pkgs.libsearpc.override {
+    python3 = self.python;
+  });
 
   pysecuritas = callPackage ../development/python-modules/pysecuritas { };
 
@@ -8772,9 +8774,9 @@ in {
 
   seabreeze = callPackage ../development/python-modules/seabreeze { };
 
-  seahub = callPackage ../development/python-modules/seahub { };
-
-  seaserv = toPythonModule pkgs.seafile-server;
+  seaserv = toPythonModule (pkgs.seafile-server.override {
+    python3 = self.python;
+  });
 
   seatconnect = callPackage ../development/python-modules/seatconnect { };