b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python2Packages.{pygtk,pyGtkGlade}: remove libglade support

Browse source
This commit is contained in:
piegames 2022-01-15 23:19:32 +01:00
parent a9bbc8be84
commit 724822a79d
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/python2-modules/pygtk/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango { lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
, buildPythonPackage, libglade ? null, isPy3k }: , buildPythonPackage, isPy3k }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pygtk"; pname = "pygtk";
@ -27,7 +27,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
pango pango
] ++ lib.optional (libglade != null) libglade; ];
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
@ -39,7 +39,7 @@ buildPythonPackage rec {
installPhase = "installPhase"; installPhase = "installPhase";
checkPhase = lib.optionalString (libglade == null) checkPhase =
'' ''
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
tests/common.py tests/common.py

1
pkgs/top-level/python-aliases.nix
View file

@ -72,6 +72,7 @@ mapAliases ({
prometheus_client = prometheus-client; # added 2021-06-10 prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22 prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
pysmart-smartx = pysmart; # added 2021-10-22 pysmart-smartx = pysmart; # added 2021-10-22

4
pkgs/top-level/python2-packages.nix
View file

@ -108,10 +108,6 @@ with self; with super; {
pygtk = callPackage ../development/python2-modules/pygtk { }; pygtk = callPackage ../development/python2-modules/pygtk { };
pyGtkGlade = self.pygtk.override {
inherit (pkgs.gnome2) libglade;
};
pyjwt = callPackage ../development/python2-modules/pyjwt { }; pyjwt = callPackage ../development/python2-modules/pyjwt { };
pyroma = callPackage ../development/python2-modules/pyroma { }; pyroma = callPackage ../development/python2-modules/pyroma { };