From 55bf5657c4f5f311bb08ec77a9b2dba88fe74a6d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Jan 2023 23:47:48 +0800 Subject: gnome2.gnome_python_desktop: remove Unmaintained, depends on libgnome + python2 --- .../bindings/gnome-python-desktop/default.nix | 32 ---------------------- pkgs/desktops/gnome-2/default.nix | 7 ++--- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix deleted file mode 100644 index a350c224e8a6..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }: - -let - inherit (python2.pkgs) python pygtk; -in stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; - pname = "gnome-python-desktop"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 librsvg libwnck2 libgtop python ]; - propagatedBuildInputs = [ gnome_python pygtk ]; - - # gnome-python-desktop expects that .pth file is already installed by PyGTK - # in the same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth - ''; - - meta = with lib; { - homepage = "http://www.pygtk.org"; - description = "Python bindings for GNOME desktop packages"; - license = licenses.lgpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2082caf7f9d1..75ef97817c3a 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -35,8 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python = callPackage ./bindings/gnome-python { }; - gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -72,7 +70,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; - python_rsvg = self.gnome_python_desktop; gtkdoc = pkgs.gtk-doc; startup_notification = pkgs.libstartup_notification; @@ -82,5 +79,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; - libglademm = throw "libglademm has been removed"; # 2022-01-15 + gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 + libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 + python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 }) -- cgit v1.2.3 From 24d48710d8cb4e4059070b5e362496c19d1a7ab1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Jan 2023 23:51:14 +0800 Subject: gnome2.gnome_python: remove Unmaintained, depends on libgnome + python2 --- .../gnome-2/bindings/gnome-python/default.nix | 33 ---------------------- pkgs/desktops/gnome-2/default.nix | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix deleted file mode 100644 index 0c636ffa5417..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: - -with lib; - -let - inherit (python2.pkgs) python pygobject2 pygtk dbus-python; -in stdenv.mkDerivation rec { - pname = "gnome-python"; - version = "2.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2"; - sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; - propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; - - # gnome-python expects that .pth file is already installed by PyGTK in the - # same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth - ''; - - meta = with lib; { - homepage = "http://pygtk.org/"; - description = "Python wrapper for GNOME libraries"; - platforms = platforms.linux; - license = licenses.lgpl2; - maintainers = with maintainers; [ qknight ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 75ef97817c3a..3dfcc5190974 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -33,8 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_mime_data = callPackage ./platform/gnome-mime-data { }; - gnome_python = callPackage ./bindings/gnome-python { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -79,6 +77,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 -- cgit v1.2.3