nix: bump py3c for compilation of python3 svn

pkgs/overlays.nix

@@ -1,96 +1,100 b''
 self: super: {
 
   # change GIT version
   # latest supported are in: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
   git = super.lib.overrideDerivation super.git (oldAttrs: {
     name = "git-2.25.3";
     src = self.fetchurl {
       url = "https://www.kernel.org/pub/software/scm/git/git-2.25.3.tar.xz";
       sha256 = "0yvr97cl0dvj3fwblq1mb0cp97v8hrn9l98p8b1jx8815mbsnz9h";
     };
 
     # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git
     patches = [
       ./patches/git/docbook2texi.patch
       ./patches/git/git-sh-i18n.patch
       ./patches/git/ssh-path.patch
       ./patches/git/git-send-email-honor-PATH.patch
       ./patches/git/installCheck-path.patch
     ];
 
   });
 
   libgit2rc = super.lib.overrideDerivation super.libgit2 (oldAttrs: {
     name = "libgit2-1.0.1";
     version = "1.0.1";
 
     src = self.fetchFromGitHub {
         owner = "libgit2";
         repo = "libgit2";
         rev = "v1.0.1";
         sha256 = "0xqdnvrq1bnf8hxh9xjw25y2cg91agvd9jr5qwd30z2a0dzll22v";
     };
 
     cmakeFlags = [ "-DTHREADSAFE=ON" "-DUSE_HTTPS=no"];
 
     buildInputs = [
         super.zlib
         super.libssh2
         super.openssl
         super.curl
     ];
 
   });
 
   # Override subversion derivation to
   #  - activate special python bindings
   subversionrc =
+
   let
     py3c = self.python38Packages.buildPythonPackage rec {
         pname = "py3c";
-        version = "1.0";
+        version = "1.1";
         src = self.fetchurl {
-          url = "https://files.pythonhosted.org/packages/6a/aa/9f1a69a8c71e72553b281603633e42501de932aa4d9912bccbf9a2884093/py3c-1.0.tar.gz";
-          sha256 = "1h80jqi6r64kppxb4kshsiadrgc5hwk5arp3zcki01jf4ahknjz9";
+          url = "https://github.com/encukou/py3c/archive/v1.1.tar.gz";
+          sha256 = "086xxccgzr4zkhsjkbcakydghrmll3rkxdcxhp5d1pidr4mw5zy7";
         };
         format = "setuptools";
         doCheck = false;
         buildInputs = [];
         checkInputs = [];
         nativeBuildInputs = [];
         propagatedBuildInputs = [];
         meta = {
           license = [  ];
         };
+
+        preBuild = ''
+            make install
+        '';
     };
-  in
-  let
+
     pythonWithEnv = self.python38Packages.python.buildEnv.override {
         extraLibs = [ py3c ];
     };
-  in
-  let
+
     subversionWithPython = super.subversion.override {
       httpSupport = true; # client must support http
       pythonBindings = true;
       python = pythonWithEnv;
     };
 
   in
     super.lib.overrideDerivation subversionWithPython (oldAttrs: {
       name = "subversion-1.14.0";
       src = self.fetchurl {
         url = "https://archive.apache.org/dist/subversion/subversion-1.14.0.tar.gz";
         sha256 = "1l1px5kva5a13pi2rkxfgxfvypvl6bmbkdag6168fhayad3i2ggg";
       };
 
       ## use internal lz4/utf8proc because it is stable and shipped with SVN
       configureFlags = oldAttrs.configureFlags ++ [
         " --with-lz4=internal"
         " --with-utf8proc=internal"
+        " --with-py3c=${py3c}/include/python3.8/py3c/"
       ];
   });
 
 
 
 }

shell.nix

@@ -1,50 +1,50 b''
 # This file contains the adjustments which are desired for a development
 # environment.
 
 { pkgs ? (import <nixpkgs> {})
 , pythonPackages ? "python38Packages"
 , doCheck ? false
 }:
 
 let
 
   # Full runtime environment without the actual Python package
-  env = import ./default.nix {
+  PythonDepsEnv = import ./default.nix {
     inherit
       doCheck;
     pythonExternalOverrides = self: super: {
       rhodecode-vcsserver = null;
     };
   };
 
   # The python package with full runtime environment as dependency for nix-shell
   package = (import ./default.nix {
     inherit
       doCheck;
     pythonExternalOverrides = self: super: {
       rhodecode-vcsserver = super.rhodecode-vcsserver.overridePythonAttrs(attrs: {
         nativeBuildInputs = with self;
           attrs.nativeBuildInputs ++
           attrs.buildInputs ++
           attrs.propagatedBuildInputs ++ [
-          env
+          PythonDepsEnv
           pytest
           ipdb
           ipython
         ];
       });
     };
   }).passthru.pythonPackages.rhodecode-vcsserver;
 
 in package.overridePythonAttrs(attrs: {
   postShellHook= ''
     # Custom prompt to distinguish from other dev envs.
     export PS1="\n\[\033[1;32m\][vcsserver-shell:\w]$\[\033[0m\] "
 
     # Set locale
     export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
     export LC_ALL="en_US.UTF-8"
 
   '';
 
 })