Merge pull request #222069 from wegank/wxpython-cleanup

python3Packages.wxPython_4_{0,1}: drop

pkgs/development/python-modules/wxPython/4.0.nix

@@ -1,88 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchPypi
-, setuptools
-, pkg-config
-, which
-, cairo
-, pango
-, python
-, doxygen
-, ncurses
-, libintl
-, wxGTK
-, gtk3
-, IOKit
-, Carbon
-, Cocoa
-, AudioToolbox
-, OpenGL
-, CoreFoundation
-, pillow
-, numpy
-, six
-}:
-
-buildPythonPackage rec {
-  pname = "wxPython";
-  version = "4.0.7.post2";
-  format = "other";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e";
-  };
-
-  doCheck = false;
-
-  nativeBuildInputs = [ pkg-config which doxygen setuptools wxGTK ];
-
-  buildInputs = [ ncurses libintl ]
-  ++ (if stdenv.isDarwin
-  then
-    [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
-  else
-    [ gtk3 ]
-  );
-
-  propagatedBuildInputs = [
-    numpy
-    pillow
-    six
-  ];
-
-  DOXYGEN = "${doxygen}/bin/doxygen";
-
-  preConfigure = lib.optionalString (!stdenv.isDarwin) ''
-    substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
-      --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
-    substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
-      --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
-        ("gdk",        "${gtk3}/lib/libgtk-x11-2.0.so"),
-        ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
-        ("appsvc",     None)
-      ]}'
-  '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
-    # Remove the OSX-Only wx.webkit module
-    sed -i "s/makeETGRule(.*'WXWEBKIT')/pass/" wscript
-  '';
-
-  buildPhase = ''
-    ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py
-  '';
-
-  installPhase = ''
-    ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out
-  '';
-
-  passthru = { wxWidgets = wxGTK; };
-
-
-  meta = {
-    description = "Cross platform GUI toolkit for Python, Phoenix version";
-    homepage = "http://wxpython.org/";
-    license = lib.licenses.wxWindows;
-  };
-
-}

pkgs/development/python-modules/wxPython/4.1.nix

@@ -1,146 +0,0 @@
-{ lib
-, stdenv
-, fetchPypi
-, fetchpatch
-, buildPythonPackage
-, setuptools
-, which
-, pkg-config
-, python
-, isPy27
-, doxygen
-, cairo
-, ncurses
-, pango
-, wxGTK
-, gtk3
-, AGL
-, AudioToolbox
-, AVFoundation
-, AVKit
-, Carbon
-, Cocoa
-, CoreFoundation
-, CoreMedia
-, IOKit
-, Kernel
-, OpenGL
-, Security
-, WebKit
-, pillow
-, numpy
-, six
-, libXinerama
-, libSM
-, libXxf86vm
-, libXtst
-, libGLU
-, libGL
-, xorgproto
-, gst_all_1
-, libglvnd
-, mesa
-, webkitgtk
-, autoPatchelfHook
-}:
-let
-  dynamic-linker = stdenv.cc.bintools.dynamicLinker;
-in
-buildPythonPackage rec {
-  pname = "wxPython";
-  version = "4.1.1";
-  disabled = isPy27;
-  format = "other";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80";
-  };
-
-  # ld: framework not found System
-  postPatch = ''
-    for file in ext/wxWidgets/configure*; do
-      substituteInPlace $file --replace "-framework System" ""
-    done
-  '';
-
-  # https://github.com/NixOS/nixpkgs/issues/75759
-  # https://github.com/wxWidgets/Phoenix/issues/1316
-  doCheck = false;
-
-  nativeBuildInputs = [
-    which
-    doxygen
-    gtk3
-    pkg-config
-    setuptools
-  ] ++ lib.optionals stdenv.isLinux [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    gtk3
-    ncurses
-  ] ++ lib.optionals stdenv.isLinux [
-    libXinerama
-    libSM
-    libXxf86vm
-    libXtst
-    xorgproto
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    libGLU
-    libGL
-    libglvnd
-    mesa
-    webkitgtk
-  ] ++ lib.optionals stdenv.isDarwin [
-    AGL
-    AudioToolbox
-    AVFoundation
-    AVKit
-    Carbon
-    Cocoa
-    CoreFoundation
-    CoreMedia
-    IOKit
-    Kernel
-    OpenGL
-    Security
-    WebKit
-  ];
-
-  propagatedBuildInputs = [
-    pillow
-    numpy
-    six
-  ];
-
-  DOXYGEN = "${doxygen}/bin/doxygen";
-
-  preConfigure = lib.optionalString (!stdenv.isDarwin) ''
-    substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
-      --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
-        ("gdk",        "${gtk3}/lib/libgtk-x11-3.0.so"),
-        ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
-        ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"),
-        ("appsvc",     None)
-      ]}'
-  '';
-
-  buildPhase = ''
-    ${python.pythonForBuild.interpreter} build.py -v build_wx dox etg --nodoc sip build_py
-  '';
-
-  installPhase = ''
-    ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out
-    wrapPythonPrograms
-  '';
-
-  meta = with lib; {
-    description = "Cross platform GUI toolkit for Python, Phoenix version";
-    homepage = "http://wxpython.org/";
-    license = licenses.wxWindows;
-    maintainers = with maintainers; [ tfmoraes ];
-  };
-}

pkgs/top-level/python-aliases.nix

@@ -289,6 +289,8 @@ mapAliases ({
   weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
   webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
   websocket_client = websocket-client; # added 2021-06-15
+  wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
+  wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
   WSME = wsme; # added 2023-02-19
   xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
   XlsxWriter = xlsxwriter; # added 2023-02-19

pkgs/top-level/python-packages.nix

@@ -12596,20 +12596,6 @@ self: super: with self; {
 
   wurlitzer = callPackage ../development/python-modules/wurlitzer { };
 
-  wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix {
-    inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL;
-    wxGTK = pkgs.wxGTK30.override {
-      withWebKit = true;
-    };
-  };
-
-  wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
-    inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit;
-    wxGTK = pkgs.wxGTK31.override {
-      withWebKit = true;
-    };
-  };
-
   wxPython_4_2 = callPackage ../development/python-modules/wxPython/4.2.nix {
     wxGTK = pkgs.wxGTK32.override {
       withWebKit = true;