mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
python311Packages.wxpython: rename from wxPython_4_2
This commit is contained in:
parent
e253a1d174
commit
2adcc8846a
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
build
|
||||
certifi
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
dbus-python
|
||||
distro
|
||||
numpy
|
||||
|
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pyserial
|
||||
pyusb
|
||||
setuptools
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -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)" ];
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ let
|
|||
libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ];
|
||||
|
||||
python = python3.withPackages(ps: with ps; [
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
setuptools
|
||||
natsort
|
||||
]);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pyserial
|
||||
requests
|
||||
six
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
yattag
|
||||
];
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyusb
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
asn1tools
|
||||
coverage
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asn1editor" ];
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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=";
|
||||
};
|
||||
|
|
@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyopengl
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -35,7 +35,7 @@ buildPythonApplication rec {
|
|||
parted
|
||||
grub2
|
||||
termcolor
|
||||
wxPython_4_2
|
||||
wxpython
|
||||
six
|
||||
];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue