From 5efd8de503ef713b7f80148d03cde0aeb852ef8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Dec 2022 12:26:58 -0800 Subject: [PATCH] python2Packages.pygobject2: move to python2-modules --- .../pygobject/default.nix | 7 ++++--- .../pygobject/pygobject-2.0-fix-darwin.patch | 0 pkgs/top-level/python-packages.nix | 2 -- pkgs/top-level/python2-packages.nix | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/{python-modules => python2-modules}/pygobject/default.nix (85%) rename pkgs/development/{python-modules => python2-modules}/pygobject/pygobject-2.0-fix-darwin.patch (100%) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix similarity index 85% rename from pkgs/development/python-modules/pygobject/default.nix rename to pkgs/development/python2-modules/pygobject/default.nix index 14acb15e03b5..2a09002976b2 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { disabled = pythonAtLeast "3.9"; src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; }; @@ -32,7 +32,7 @@ buildPythonPackage rec { # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. postInstall = lib.optionalString (!isPy3k) '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} + mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be # executed by the python program @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for GLib"; - platforms = platforms.unix; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch similarity index 100% rename from pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch rename to pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 821073b9c781..30d2c3c5e0d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7918,8 +7918,6 @@ self: super: with self; { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { # inherit (pkgs) meson won't work because it won't be spliced inherit (pkgs.buildPackages) meson; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a8b09c146aed..c5f47d24f7ad 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -43,6 +43,8 @@ with self; with super; { inherit (pkgs.buildPackages) meson; }; + pygobject2 = callPackage ../development/python2-modules/pygobject { }; + pygtk = callPackage ../development/python2-modules/pygtk { }; pyparsing = callPackage ../development/python2-modules/pyparsing { };