From cee470de5a00410b0c4d9da2f5222f5e1cf3ecb2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 6 Jan 2012 19:02:07 +0000 Subject: [PATCH] Remove gtk+-2.16 svn path=/nixpkgs/trunk/; revision=31370 --- pkgs/development/libraries/atk/1.24.x.nix | 31 ---------------- pkgs/development/libraries/glib/2.20.x.nix | 33 ----------------- pkgs/development/libraries/gtk+/2.16.x.nix | 39 --------------------- pkgs/development/libraries/pango/1.24.x.nix | 29 --------------- pkgs/top-level/all-packages.nix | 14 -------- 5 files changed, 146 deletions(-) delete mode 100644 pkgs/development/libraries/atk/1.24.x.nix delete mode 100644 pkgs/development/libraries/glib/2.20.x.nix delete mode 100644 pkgs/development/libraries/gtk+/2.16.x.nix delete mode 100644 pkgs/development/libraries/pango/1.24.x.nix diff --git a/pkgs/development/libraries/atk/1.24.x.nix b/pkgs/development/libraries/atk/1.24.x.nix deleted file mode 100644 index 213c3ef72a45..000000000000 --- a/pkgs/development/libraries/atk/1.24.x.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: - -stdenv.mkDerivation rec { - name = "atk-1.24.0"; - - src = fetchurl { - url = "mirror://gnome/sources/atk/1.24/${name}.tar.bz2"; - sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803"; - }; - - buildNativeInputs = [perl]; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib]; - - meta = { - description = "ATK, the accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = http://library.gnome.org/devel/atk/; - - license = "LGPLv2+"; - }; - -} diff --git a/pkgs/development/libraries/glib/2.20.x.nix b/pkgs/development/libraries/glib/2.20.x.nix deleted file mode 100644 index c7a92a00b42c..000000000000 --- a/pkgs/development/libraries/glib/2.20.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl }: - -stdenv.mkDerivation rec { - name = "glib-2.20.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glib/2.20/${name}.tar.bz2"; - sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav"; - }; - - buildNativeInputs = [perl]; - buildInputs = [pkgconfig gettext]; - - # The nbd package depends on a static version of this library; hence - # the default configure flag --disable-static is switched off. - dontDisableStatic = true; - configureFlags = "--enable-static --enable-shared"; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix deleted file mode 100644 index 2c81ecc84e02..000000000000 --- a/pkgs/development/libraries/gtk+/2.16.x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, jasper, x11, glib, atk, pango -, libtiff, libjpeg, libpng, cairo, xlibs -, xineramaSupport ? true -}: - -stdenv.mkDerivation rec { - name = "gtk+-2.16.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2"; - sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3"; - }; - - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; - - propagatedBuildInputs = [ - x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr - ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/pango/1.24.x.nix b/pkgs/development/libraries/pango/1.24.x.nix deleted file mode 100644 index b2e61e6cae4e..000000000000 --- a/pkgs/development/libraries/pango/1.24.x.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - name = "pango-1.24.1"; - - src = fetchurl { - url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2"; - sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370"; - }; - - buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []); - - propagatedBuildInputs = [x11 glib cairo libpng]; - - meta = { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b8709114611..635094400d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3623,20 +3623,6 @@ let }); - gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in { - - glib = callPackage ../development/libraries/glib/2.20.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.24.x.nix { }; - - cairo = callPackage ../development/libraries/cairo { }; - - pango = callPackage ../development/libraries/pango/1.24.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { }; - - }); - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { };