diff --git a/pkgs/by-name/py/pyfa/dark-theme-wxpython-4.2-compat.patch b/pkgs/by-name/py/pyfa/dark-theme-wxpython-4.2-compat.patch new file mode 100644 index 000000000000..1827b8cebc22 --- /dev/null +++ b/pkgs/by-name/py/pyfa/dark-theme-wxpython-4.2-compat.patch @@ -0,0 +1,19 @@ +--- a/gui/utils/dark.py ++++ b/gui/utils/dark.py +@@ -45,12 +45,12 @@ + return False + + theme = ThemeSettings.getInstance().get('theme') +- appearance = { +- ThemeSettings.SYSTEM: wx.App.Appearance.System, +- ThemeSettings.DARK: wx.App.Appearance.Dark, +- }.get(theme, wx.App.Appearance.Light) + + try: ++ appearance = { ++ ThemeSettings.SYSTEM: wx.App.Appearance.System, ++ ThemeSettings.DARK: wx.App.Appearance.Dark, ++ }.get(theme, wx.App.Appearance.Light) + if 'wxMSW' in wx.PlatformInfo and theme != ThemeSettings.BRIGHT: + flags = wx.App.DarkMode_Always if theme == ThemeSettings.DARK else wx.App.DarkMode_Auto + if not app.MSWEnableDarkMode(flags): diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 3a75269e3d9d..ecf1c552f170 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -11,7 +11,7 @@ copyDesktopItems, }: let - version = "2.68.0"; + version = "2.69.0"; in python3Packages.buildPythonApplication rec { inherit version; @@ -22,9 +22,11 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-obx4YG75XxpdlaFlmFmkXdkazHERhm5boOzSx7zDRQs="; + hash = "sha256-sLZ5907hsiYerYDKOWrBfnoNueqg7lbff0e1Eh4ia0g="; }; + patches = [ ./dark-theme-wxpython-4.2-compat.patch ]; + desktopItems = [ (makeDesktopItem { name = "pyfa"; @@ -43,9 +45,10 @@ python3Packages.buildPythonApplication rec { matplotlib python-dateutil requests - sqlalchemy_1_4 + sqlalchemy cryptography markdown2 + packaging beautifulsoup4 pyaml roman @@ -72,7 +75,7 @@ python3Packages.buildPythonApplication rec { # # upstream does not include setup.py # - patchPhase = '' + postPatch = '' cat > setup.py <