wxGTK30, wxmac: drop

nixos/modules/programs/ccache.nix

···
       type = types.listOf types.str;
       description = lib.mdDoc "Nix top-level packages to be compiled using CCache";
       default = [];
-      example = [ "wxGTK30" "ffmpeg" "libav_all" ];
+      example = [ "wxGTK32" "ffmpeg" "libav_all" ];
     };
   };
 

pkgs/development/haskell-modules/configuration-nix.nix

···
 
   # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
   # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK30; };
-  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
+  wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; };
+  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; };
 
   # Test suite wants to connect to $DISPLAY.
   bindings-GLFW = dontCheck super.bindings-GLFW;

pkgs/development/libraries/wxwidgets/wxGTK30.nix

···
-{ lib
-, stdenv
-, expat
-, fetchFromGitHub
-, gst_all_1
-, gtk3
-, libGL
-, libGLU
-, libSM
-, libXinerama
-, libXxf86vm
-, libpng
-, libtiff
-, libjpeg_turbo
-, zlib
-, pkg-config
-, xorgproto
-, compat26 ? false
-, compat28 ? true
-, unicode ? true
-, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, withWebKit ? false
-, webkitgtk
-, setfile
-, AGL
-, Carbon
-, Cocoa
-, Kernel
-, QTKit
-, AVFoundation
-, AVKit
-, WebKit
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wxwidgets";
-  version = "3.0.5.1";
-
-  src = fetchFromGitHub {
-    owner = "wxWidgets";
-    repo = "wxWidgets";
-    rev = "v${version}";
-    hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    libpng
-    libtiff
-    libjpeg_turbo
-    zlib
-  ] ++ lib.optionals stdenv.isLinux [
-    gtk3
-    libSM
-    libXinerama
-    libXxf86vm
-    xorgproto
-  ]
-  ++ lib.optional withMesa libGLU
-  ++ lib.optional (withWebKit && stdenv.isLinux) webkitgtk
-  ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
-  ++ lib.optionals stdenv.isDarwin [
-    expat
-    setfile
-    Carbon
-    Cocoa
-    Kernel
-    QTKit
-    AVFoundation
-    AVKit
-  ];
-
-  propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
-
-  patches = [
-    # https://github.com/wxWidgets/wxWidgets/issues/17942
-    ./patches/0001-fix-assertion-using-hide-in-destroy.patch
-  ];
-
-  configureFlags = [
-    "--disable-precomp-headers"
-    "--enable-mediactrl"
-    (if compat26 then "--enable-compat26" else "--disable-compat26")
-    (if compat28 then "--enable-compat28" else "--disable-compat28")
-  ] ++ lib.optional unicode "--enable-unicode"
-  ++ lib.optional withMesa "--with-opengl"
-  ++ lib.optionals stdenv.isDarwin [
-    # allow building on 64-bit
-    "--enable-universal-binaries"
-    "--with-macosx-version-min=10.7"
-    "--with-osx_cocoa"
-    "--with-libiconv"
-  ] ++ lib.optionals withWebKit [
-    "--enable-webview"
-    "--enable-webviewwebkit"
-  ];
-
-  SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib";
-
-  preConfigure = ''
-    substituteInPlace configure --replace \
-      'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
-    substituteInPlace configure --replace \
-      'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
-    substituteInPlace configure --replace \
-      /usr /no-such-path
-  '' + lib.optionalString stdenv.isDarwin ''
-    substituteInPlace configure \
-      --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
-    substituteInPlace configure \
-      --replace "-framework System" "-lSystem"
-  '';
-
-  postInstall = ''
-    pushd $out/include
-    ln -s wx-*/* .
-    popd
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://www.wxwidgets.org/";
-    description = "A Cross-Platform C++ GUI Library";
-    longDescription = ''
-      wxWidgets gives you a single, easy-to-use API for writing GUI applications
-      on multiple platforms that still utilize the native platform's controls
-      and utilities. Link with the appropriate library for your platform and
-      compiler, and your application will adopt the look and feel appropriate to
-      that platform. On top of great GUI functionality, wxWidgets gives you:
-      online help, network programming, streams, clipboard and drag and drop,
-      multithreading, image loading and saving in a variety of popular formats,
-      database support, HTML viewing and printing, and much more.
-    '';
-    license = licenses.wxWindows;
-    maintainers = with maintainers; [ wegank ];
-    platforms = platforms.unix;
-  };
-
-  passthru = {
-    inherit compat26 compat28 unicode;
-  };
-}

pkgs/development/libraries/wxwidgets/wxmac30.nix

···
-{ lib
-, stdenv
-, fetchFromGitHub
-, expat
-, libiconv
-, libjpeg
-, libpng
-, libtiff
-, zlib
-, AGL
-, Cocoa
-, Kernel
-, WebKit
-, derez
-, rez
-, setfile
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wxmac";
-  version = "3.0.5.1";
-
-  src = fetchFromGitHub {
-    owner = "wxWidgets";
-    repo = "wxWidgets";
-    rev = "v${version}";
-    hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
-  };
-
-  buildInputs = [
-    expat
-    libiconv
-    libjpeg
-    libpng
-    libtiff
-    zlib
-    AGL
-    Cocoa
-    Kernel
-    WebKit
-    derez
-    rez
-    setfile
-  ];
-
-  postPatch = ''
-    substituteInPlace configure --replace "-framework System" "-lSystem"
-  '';
-
-  configureFlags = [
-    "--disable-mediactrl"
-    "--disable-precomp-headers"
-    "--enable-clipboard"
-    "--enable-controls"
-    "--enable-dataviewctrl"
-    "--enable-display"
-    "--enable-dnd"
-    "--enable-graphics_ctx"
-    "--enable-std_string"
-    "--enable-svg"
-    "--enable-unicode"
-    "--enable-webkit"
-    "--with-expat"
-    "--with-libjpeg"
-    "--with-libpng"
-    "--with-libtiff"
-    "--with-macosx-version-min=10.7"
-    "--with-opengl"
-    "--with-osx_cocoa"
-    "--with-zlib"
-    "--without-liblzma"
-    "wx_cv_std_libfullpath=/var/empty"
-  ];
-
-  doCheck = true;
-  checkPhase = ''
-    ./wx-config --libs
-  '';
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-undef";
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = "https://www.wxwidgets.org/";
-    description = "A Cross-Platform C++ GUI Library - MacOS-only build";
-    longDescription = ''
-      wxWidgets gives you a single, easy-to-use API for writing GUI applications
-      on multiple platforms that still utilize the native platform's controls
-      and utilities. Link with the appropriate library for your platform and
-      compiler, and your application will adopt the look and feel appropriate to
-      that platform. On top of great GUI functionality, wxWidgets gives you:
-      online help, network programming, streams, clipboard and drag and drop,
-      multithreading, image loading and saving in a variety of popular formats,
-      database support, HTML viewing and printing, and much more.
-    '';
-    license = licenses.wxWindows;
-    maintainers = with maintainers; [ lnl7 ];
-    platforms = platforms.darwin;
-  };
-}

pkgs/top-level/aliases.nix

···
   wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
   wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
   wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
-  wxGTK30-gtk2 = throw "'wxGTK30-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-12-03
-  wxGTK30-gtk3 = throw "'wxGTK30-gtk3' has been renamed to/replaced by 'wxGTK30'"; # Added 2022-12-03
+  wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22
+  wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03
+  wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03
   wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27
   wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27
+  wxmac = wxGTK30; # Added 2023-03-22
   wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
   wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15
 

pkgs/top-level/all-packages.nix

···
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
-    inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
-  };
-
-  wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
-    inherit (darwin.stubs) derez rez setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
-  };
-
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;