colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python311Packages.wxpython: rename from wxPython_4_2

Browse Source
This commit is contained in:
Felix Buehler 2024-01-07 13:35:51 +01:00 committed by Martin Weinelt
parent e253a1d174
commit 2adcc8846a
23 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/easyabc/default.nix
View File

@ -7,7 +7,7 @@ let
packageOverrides = self: super: {
# currently broken with 4.2.1
# https://github.com/jwdj/EasyABC/issues/75
wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec {
wxpython = super.wxpython.overrideAttrs (args: rec {
version = "4.2.0";
src = fetchPypi {
inherit version;
@ -32,7 +32,7 @@ in python.pkgs.buildPythonApplication {
propagatedBuildInputs = with python.pkgs; [
cx-freeze
wxPython_4_2
wxpython
pygame
];

2
pkgs/applications/gis/grass/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
libmysqlclient # for `mysql_config`
netcdf # for `nc-config`
pkg-config
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
] ++ (with python3Packages; [ python-dateutil numpy wxpython ]);
buildInputs = [
blas

2
pkgs/applications/graphics/displaycal/default.nix
View File

@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
build
certifi
wxPython_4_2
wxpython
dbus-python
distro
numpy

2
pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
View File

@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
python3.pkgs.lxml
python3.pkgs.inkex
python3.pkgs.matplotlib
python3.pkgs.wxPython_4_2
python3.pkgs.wxpython
python3.pkgs.xmltodict
];

2
pkgs/applications/misc/loxodo/default.nix
View File

@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication {
patches = [ ./wxpython.patch ];
propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_2 ];
propagatedBuildInputs = with python3.pkgs; [ six wxpython ];
postInstall = ''
mv $out/bin/loxodo.py $out/bin/loxodo

2
pkgs/applications/misc/meerk40t/default.nix
View File

@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
pyserial
pyusb
setuptools
wxPython_4_2
wxpython
];
preFixup = ''

2
pkgs/applications/misc/metamorphose2/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_2 pillow six ];
propagatedBuildInputs = with python3.pkgs; [ mutagen wxpython pillow six ];
makeFlags = [ "PREFIX=$(out)" ];

2
pkgs/applications/misc/playonlinux/default.nix
View File

@ -61,7 +61,7 @@ let
libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ];
python = python3.withPackages(ps: with ps; [
wxPython_4_2
wxpython
setuptools
natsort
]);

2
pkgs/applications/misc/printrun/default.nix
View File

@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ glib wrapGAppsHook ];
propagatedBuildInputs = with python3Packages; [
appdirs cython dbus-python numpy six wxPython_4_2 psutil pyglet pyopengl pyserial cffi cairosvg lxml
appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml
];
# pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None"

2
pkgs/applications/office/timeline/default.nix
View File

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ];
pythonPath = with python3.pkgs; [
wxPython_4_2
wxpython
humblewx
icalendar
markdown

2
pkgs/applications/radio/chirp/default.nix
View File

@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
pyserial
requests
six
wxPython_4_2
wxpython
yattag
];

2
pkgs/applications/radio/quisk/default.nix
View File

@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
pyusb
wxPython_4_2
wxpython
];
doCheck = false;

2
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -118,7 +118,7 @@ let
wxGTK = wxGTK32;
python = python3;
wxPython = python.pkgs.wxPython_4_2;
wxPython = python.pkgs.wxpython;
addonPath = "addon.zip";
addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons;

4
pkgs/applications/science/robotics/mavproxy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy
, opencv4, pymavlink, pyserial, setuptools, wxPython_4_2, billiard
, opencv4, pymavlink, pyserial, setuptools, wxpython, billiard
, gnureadline }:
buildPythonApplication rec {
@ -24,7 +24,7 @@ buildPythonApplication rec {
pymavlink
pyserial
setuptools
wxPython_4_2
wxpython
] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];
# No tests

2
pkgs/by-name/as/asn1editor/package.nix
View File

@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
asn1tools
coverage
wxPython_4_2
wxpython
];
pythonImportsCheck = [ "asn1editor" ];

4
pkgs/by-name/ki/kikit/default.nix
View File

@ -12,7 +12,7 @@
, markdown2
, pytestCheckHook
, commentjson
, wxPython_4_2
, wxpython
, pcbnew-transition
, pybars3
, versioneer
@ -42,7 +42,7 @@ buildPythonApplication rec {
markdown2
commentjson
# https://github.com/yaqwsx/KiKit/issues/575
wxPython_4_2
wxpython
pcbnew-transition
pybars3
# https://github.com/yaqwsx/KiKit/issues/574

4
pkgs/development/python-modules/humblewx/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, wxPython_4_2
, wxpython
, python
}:
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
};
propagatedBuildInputs = [ wxPython_4_2 ];
propagatedBuildInputs = [ wxpython ];
checkPhase = ''
runHook preCheck

0
pkgs/development/python-modules/wxPython/4.2-ctypes.patch → pkgs/development/python-modules/wxpython/4.2-ctypes.patch
View File

5
pkgs/development/python-modules/wxPython/4.2.nix → pkgs/development/python-modules/wxpython/4.2.nix
View File

@ -40,13 +40,14 @@
}:
buildPythonPackage rec {
pname = "wxPython";
pname = "wxpython";
version = "4.2.1";
format = "other";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
pname = "wxPython";
inherit version;
hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw=";
};

2
pkgs/tools/games/mymcplus/default.nix
View File

@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
pyopengl
wxPython_4_2
wxpython
];
meta = with lib; {

2
pkgs/tools/misc/woeusb-ng/default.nix
View File

@ -35,7 +35,7 @@ buildPythonApplication rec {
parted
grub2
termcolor
wxPython_4_2
wxpython
six
];

5
pkgs/top-level/python-aliases.nix
View File

@ -492,8 +492,9 @@ mapAliases ({
webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
websocket_client = websocket-client; # added 2021-06-15
word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
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
wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19
wxPython_4_2 = wxpython; # added 2024-01-07
WSME = wsme; # added 2023-02-19
x11_hash = x11-hash; # added 2023-11-05
xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31

2
pkgs/top-level/python-packages.nix
View File

@ -16097,7 +16097,7 @@ self: super: with self; {
wurlitzer = callPackage ../development/python-modules/wurlitzer { };
wxPython_4_2 = callPackage ../development/python-modules/wxPython/4.2.nix {
wxpython = callPackage ../development/python-modules/wxpython/4.2.nix {
wxGTK = pkgs.wxGTK32.override {
withWebKit = true;
};