Merge pull request #328439 from dotlambda/python3Packages.pysvn

python311Packages.pysvn: 1.9.20 -> 1.9.22

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

@@ -2,17 +2,18 @@
   lib,
   buildPythonPackage,
   fetchurl,
+  setuptools,
   python,
 }:
 
 buildPythonPackage rec {
   pname = "pycxx";
-  version = "7.1.4";
-  format = "setuptools";
+  version = "7.1.8";
+  pyproject = true;
 
   src = fetchurl {
     url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz";
-    sha256 = "MUMU+/qsm92WENYFxfjQsSuR8/nE/asYG8HgIbaAaz0=";
+    hash = "sha256-S5Hh4RQcI/vVA532NcS7bnVjIWhUj1a4POF3GTwMmMY=";
   };
 
   outputs = [
@@ -20,6 +21,8 @@ buildPythonPackage rec {
     "dev"
   ];
 
+  build-system = [ setuptools ];
+
   postInstall = ''
     mkdir -p $dev/include
     mv $out/include/${python.libPrefix}*/CXX/ $dev/include/CXX/
@@ -27,10 +30,10 @@ buildPythonPackage rec {
     sed -i "s|Src|$dev/src|" $dev/src/cxxextensions.c $dev/src/cxxsupport.cxx
   '';
 
-  meta = with lib; {
-    description = "set of classes to help create extensions of Python in the C++ language";
+  meta = {
+    description = "Set of classes to help create extensions of Python in the C++ language";
     homepage = "https://sourceforge.net/projects/cxx/";
-    maintainers = with maintainers; [ freezeboy ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }

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

@@ -2,6 +2,7 @@
   stdenv,
   lib,
   buildPythonPackage,
+  pythonAtLeast,
   fetchurl,
   isPy3k,
   python,
@@ -11,8 +12,8 @@
   e2fsprogs,
   expat,
   gcc,
-  glibcLocales,
   neon,
+  glibcLocales,
   openssl,
   pycxx,
   subversion,
@@ -20,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "pysvn";
-  version = "1.9.20";
+  version = "1.9.22";
   format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz";
-    hash = "sha256-LbAz+KjEY3nkSJAzJNwlnSRYoWr4i1ITRUPV3ZBH7cc=";
+    hash = "sha256-KfLg9tuuKpXxJoniD002kDXGCTwOZ9jurCoPrWMRo7g=";
   };
 
   patches = [ ./replace-python-first.patch ];
@@ -61,7 +62,7 @@ buildPythonPackage rec {
 
     # It is not only shebangs, some tests also write scripts dynamically
     # so it is easier to simply search and replace
-    sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh
+    sed -i "s|/bin/bash|${lib.getExe bash}|" ../Tests/test-*.sh
     make -C ../Tests
 
     runHook postCheck