Author: urkud
Date: Sun Apr 1 19:42:27 2012
New Revision: 33523
URL: https://nixos.org/websvn/nix/?rev=33523&sc=1
Log:
Move many glib/gtk major.minor.x.nix to default.nix
We have one version of each package.
Added:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/2.2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/2.22.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/2.30.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/2.30.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.24.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
- copied unchanged from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/1.29.x.nix
Deleted:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/2.2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/2.22.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/2.30.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/2.30.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.24.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/1.29.x.nix
Modified:
nixpkgs/branches/glib-2.32/pkgs/top-level/all-packages.nix
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/2.2.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/2.2.x.nix)
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, perl, glib }:
+
+stdenv.mkDerivation rec {
+ name = "atk-2.2.0";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
+ sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
+ };
+
+ buildNativeInputs = [ pkgconfig perl ];
+
+ propagatedBuildInputs = [ glib ];
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ 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+";
+
+ maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+
+}
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/default.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/2.22.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atkmm/2.22.x.nix)
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "atkmm-2.22.6";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz;
+ sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
+ };
+
+ propagatedBuildInputs = [ atk glibmm ];
+
+ buildNativeInputs = [ pkgconfig ];
+}
Copied:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix)
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
+, jasper }:
+
+stdenv.mkDerivation {
+ name = "gdk-pixbuf-2.24.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz;
+ sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
+ };
+
+ # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+ buildInputs = [ libX11 ];
+
+ buildNativeInputs = [ pkgconfig ];
+
+ propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
+
+ configureFlags = "--with-libjasper --with-x11";
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ meta = {
+ description = "A library for image loading and manipulation";
+
+ homepage = http://library.gnome.org/devel/gdk-pixbuf/;
+
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/2.30.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/2.30.x.nix)
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
+, python, pcre }:
+
+# TODO:
+# * Add gio-module-fam
+# Problem: cyclic dependency on gamin
+# Possible solution: build as a standalone module, set env. vars
+# * Make it build without python
+# Problem: an example (test?) program needs it.
+# Possible solution: disable compilation of this example somehow
+# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
+# $out/bin/gtester-report' to postInstall if this is solved
+
+stdenv.mkDerivation rec {
+ name = "glib-2.30.3";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
+ sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
+ };
+
+ # configure script looks for d-bus but it is only needed for tests
+ buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildNativeInputs = [ perl pkgconfig gettext python ];
+
+ propagatedBuildInputs = [ zlib libffi ];
+
+ configureFlags = "--with-pcre=system --disable-fam";
+
+ passthru.gioModuleDir = "lib/gio/modules";
+
+ postInstall = ''rm -rvf $out/share/gtk-doc'';
+
+ 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+";
+
+ maintainers = with stdenv.lib.maintainers; [raskin urkud];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/default.nix (from
r33522, nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/2.30.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glibmm/2.30.x.nix)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
+
+stdenv.mkDerivation rec {
+ name = "glibmm-2.30.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
+ sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
+ };
+
+ buildNativeInputs = [pkgconfig];
+ propagatedBuildInputs = [glib libsigcxx];
+
+ meta = {
+ description = "C++ interface to the GLib library";
+
+ homepage = http://gtkmm.org/;
+
+ license = "LGPLv2+";
+
+ maintainers = with stdenv.lib.maintainers; [urkud raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.24.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix Sun Apr
1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.24.x.nix)
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+, gdk_pixbuf, xz
+, xineramaSupport ? true
+, cupsSupport ? true, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+stdenv.mkDerivation {
+ name = "gtk+-2.24.10";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz;
+ sha256 = "128fb8vmsqmfmpf1r8na65281jwkqix4q7wix399xqfnp4dy6mpa";
+ };
+
+ patches =
+ [ # Fix broken icons such as the back/forward buttons in Firefox.
+ # http://bugs.gentoo.org/339319
+ ./old-icons.patch
+ ];
+
+ enableParallelBuilding = true;
+
+ buildNativeInputs = [ perl pkgconfig ];
+
+ propagatedBuildInputs =
+ [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+ xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
+ ]
+ ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
+ ++ stdenv.lib.optionals cupsSupport [ cups ];
+
+ configureFlags = "--with-xinput=yes";
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ 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+";
+
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.2.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix Sun Apr
1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.2.x.nix)
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+, gdk_pixbuf, xz
+, xineramaSupport ? true
+, cupsSupport ? true, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+stdenv.mkDerivation rec {
+ name = "gtk+-3.2.3";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
+ sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
+ };
+
+ enableParallelBuilding = true;
+
+ buildNativeInputs = [ perl pkgconfig ];
+
+ propagatedBuildInputs =
+ [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+ xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
+ ]
+ ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
+ ++ stdenv.lib.optionals cupsSupport [ cups ];
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ 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+";
+
+ maintainers = with stdenv.lib.maintainers; [urkud raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
Copied: nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
(from r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/1.29.x.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Sun Apr 1 19:42:27 2012 (r33523, copy of r33522,
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/1.29.x.nix)
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
+
+stdenv.mkDerivation rec {
+ name = "pango-1.29.4";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
+ sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
+ };
+
+ buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
+
+ buildNativeInputs = [ pkgconfig ];
+
+ propagatedBuildInputs = [ x11 glib cairo libpng ];
+
+ postInstall = "rm -rf $out/share/gtk-doc";
+
+ 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+";
+
+ maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
Modified: nixpkgs/branches/glib-2.32/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/top-level/all-packages.nix Sun Apr 1
18:31:28 2012 (r33522)
+++ nixpkgs/branches/glib-2.32/pkgs/top-level/all-packages.nix Sun Apr 1
19:42:27 2012 (r33523)
@@ -3740,32 +3740,32 @@
gtkmm;
};
- glib = callPackage ../development/libraries/glib/2.30.x.nix { };
+ glib = callPackage ../development/libraries/glib { };
- glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
+ glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {};
- atk = callPackage ../development/libraries/atk/2.2.x.nix { };
+ atk = callPackage ../development/libraries/atk { };
- atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
+ atkmm = callPackage ../development/libraries/atkmm { };
cairo = callPackage ../development/libraries/cairo { };
- pango = callPackage ../development/libraries/pango/1.29.x.nix { };
+ pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
- gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
+ gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
- gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+ gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
gtk = pkgs.gtk2;
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };
- gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
+ gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { });
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtksharp2;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
