From 87860d17da952823be00a2176172fc5d43c46d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Dec 2024 21:30:55 -0800 Subject: [PATCH] python312Packages.pysvn: 1.9.22 -> 1.9.23 --- .../python-modules/pysvn/default.nix | 30 +++++-------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 24c75bf05e81..da2930e54190 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -7,40 +7,28 @@ apr, aprutil, bash, - e2fsprogs, - expat, gcc, - neon, - glibcLocales, - openssl, pycxx, subversion, }: buildPythonPackage rec { pname = "pysvn"; - version = "1.9.22"; - format = "other"; + version = "1.9.23"; + pyproject = false; src = fetchurl { url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; - hash = "sha256-KfLg9tuuKpXxJoniD002kDXGCTwOZ9jurCoPrWMRo7g="; + hash = "sha256-ABru1nng1RaYfZwe0Z0NxE90rU/J2h/BhzUnvgrasCk="; }; patches = [ ./replace-python-first.patch ]; - buildInputs = - [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + buildInputs = [ + subversion + apr + aprutil + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -56,8 +44,6 @@ buildPythonPackage rec { --svn-bin-dir=${subversion.out}/bin ''; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3520aaec7e9a..c4dfc8a1c4c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12615,7 +12615,7 @@ self: super: with self; { pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; pysvn = callPackage ../development/python-modules/pysvn { - inherit (pkgs) bash subversion apr aprutil expat neon openssl; + inherit (pkgs) bash subversion apr aprutil; }; pyswitchbee = callPackage ../development/python-modules/pyswitchbee { };