From f05b34d39c9706ca9af6d52a6a7ef7f9062be148 Mon Sep 17 00:00:00 2001 From: Matheus Paschoal Date: Thu, 21 Nov 2024 20:49:28 -0500 Subject: [PATCH] pyfa: 2.60.2 -> 2.61.0 --- pkgs/by-name/py/pyfa/package.nix | 111 ++++++++++++++++++++++++++++--- 1 file changed, 102 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index bf9785d49468..949f99618882 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -1,21 +1,114 @@ { lib, - appimageTools, - fetchurl, + python3Packages, + fetchFromGitHub, + gsettings-desktop-schemas, + adwaita-icon-theme, + wrapGAppsHook3, + gdk-pixbuf, }: let - version = "2.60.2"; + version = "2.61.0"; in -appimageTools.wrapType2 { +python3Packages.buildPythonApplication rec { inherit version; pname = "pyfa"; + format = "other"; - src = fetchurl { - name = "pyfa-appimage-${version}"; - url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage"; - hash = "sha256-6doetQ6E1Occ/SqewfxRqPEX1MnUuFomm+8VmetIz4Y="; + src = fetchFromGitHub { + owner = "pyfa-org"; + repo = "Pyfa"; + rev = "refs/tags/v${version}"; + hash = "sha256-VSuRQugUODc+LbhKbzsA09pnqPEIAt0pQS2An/p7r9A="; }; + build-system = [ python3Packages.setuptools ]; + dependencies = with python3Packages; [ + wxpython + logbook + matplotlib + python-dateutil + requests + sqlalchemy_1_4 + cryptography + markdown2 + beautifulsoup4 + pyaml + roman + numpy + python-jose + requests-cache + ]; + + buildInputs = [ + gsettings-desktop-schemas + adwaita-icon-theme + gdk-pixbuf + ]; + + dontWrapGApps = true; + nativeBuildInputs = [ + python3Packages.pyinstaller + wrapGAppsHook3 + ]; + + # + # upstream does not include setup.py + # + patchPhase = '' + cat > setup.py <