From 818b88aa9c4b1b20407112490510e5c794b389d1 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sun, 31 Oct 2021 18:19:26 -0600 Subject: [PATCH 1/3] python38Packages.generic: init at 1.0.1 --- .../python-modules/generic/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/generic/default.nix diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix new file mode 100644 index 000000000000..87dca630a1b8 --- /dev/null +++ b/pkgs/development/python-modules/generic/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "generic"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ex93I+ofo5lP6qoolZwzjxSspeqJimY3vpB32RLJ00k="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ "generic" ]; + + meta = with lib; { + description = "Generic programming (Multiple dispatch) library for Python"; + maintainers = with maintainers; [ wolfangaukang ]; + homepage = "https://github.com/gaphor/generic"; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71ce88d4672f..b15459dec7e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2958,6 +2958,8 @@ in { genanki = callPackage ../development/python-modules/genanki { }; + generic = callPackage ../development/python-modules/generic { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; genpy = callPackage ../development/python-modules/genpy { }; From c3cd0c0a74c8f684b08ba048e226cc720e903a95 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sun, 31 Oct 2021 18:17:04 -0600 Subject: [PATCH 2/3] python38Packages.gaphas: init at 3.1.9 --- .../python-modules/gaphas/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/gaphas/default.nix diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix new file mode 100644 index 000000000000..a6351aeeadd7 --- /dev/null +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, poetry-core +, gobject-introspection +, gtk3 +, pycairo +, pygobject3 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "gaphas"; + version = "3.1.9"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ gobject-introspection gtk3 ]; + + propagatedBuildInputs = [ + pycairo + pygobject3 + typing-extensions + ]; + + pythonImportsCheck = [ "gaphas" ]; + + meta = with lib; { + description = "GTK+ based diagramming widget"; + maintainers = with maintainers; [ wolfangaukang ]; + homepage = "https://github.com/gaphor/gaphas"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b15459dec7e8..18c4d6628050 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2920,6 +2920,8 @@ in { pythonPackages = self; }); + gaphas = callPackage ../development/python-modules/gaphas { }; + garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { }; From 992b117aae76a3f187d78bf2710a8cf611a02e77 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 12 Nov 2021 09:24:28 -0600 Subject: [PATCH 3/3] gaphor: init at 2.6.5 --- pkgs/tools/misc/gaphor/default.nix | 66 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/tools/misc/gaphor/default.nix diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix new file mode 100644 index 000000000000..6105b07c3450 --- /dev/null +++ b/pkgs/tools/misc/gaphor/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonApplication +, fetchPypi +, poetry-core +, gobject-introspection +, pango +, gtksourceview4 +, wrapGAppsHook +, makeDesktopItem +, copyDesktopItems +, gaphas +, generic +, pycairo +, pygobject3 +, python +, tinycss2 +}: + +buildPythonApplication rec { + pname = "gaphor"; + version = "2.6.5"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-IFsbWx5lblKsnEibVihM6ZPRoydXC+JM1gdZEUUTKxw="; + }; + + nativeBuildInputs = [ + poetry-core copyDesktopItems gobject-introspection wrapGAppsHook + ]; + + # Setting gobject-introspection on booth nativeBuildInputs and + # buildInputs because of #56943. This recognizes pango, avoiding + # a "ValueError: Namespace PangoCairo not available". + buildInputs = [ gobject-introspection gtksourceview4 pango ]; + + propagatedBuildInputs = [ + gaphas + generic + pycairo + pygobject3 + tinycss2 + ]; + + desktopItems = makeDesktopItem { + name = pname; + exec = "gaphor"; + icon = "gaphor"; + comment = meta.description; + desktopName = "Gaphor"; + }; + + postInstall = '' + install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg + ''; + + meta = with lib; { + description = "Simple modeling tool written in Python"; + maintainers = with maintainers; [ wolfangaukang ]; + homepage = "https://github.com/gaphor/gaphor"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28d1fd6d800d..a669438a488f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5336,6 +5336,8 @@ with pkgs; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; + gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {};