Commit graph

44 commits

Author SHA1 Message Date
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Damien Cassou 386597c132 gdk-pixbuf: 2.32.3 -> 2.34.0 2016-04-20 16:45:59 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát 00aec448ab gdk-pixbuf: maintenance update 2.32.1 -> 2.32.3 2015-12-30 11:57:33 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Vladimír Čunát 91329b5c0a gdk-pixbuf: reduce unnecessary outputs
Also some other minor changes.
2015-10-28 12:05:37 +01:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Jude Taylor 484b4250ae disable gdk-pixbuf test build on darwin 2015-10-19 10:12:09 -07:00
Vladimír Čunát e8961181ea gdk-pixbuf: security update 2.32.0 -> 2.32.1
CVE-2015-7674, fixes #10441.
2015-10-18 09:07:20 +02:00
Vladimír Čunát 194f0e880f just add comments about outputs (cups, gdk-pixbuf) 2015-10-13 20:18:58 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát 23f75e9bb0 gdk-pixbuf: maintenance update 2.31.7 -> 2.32.0 2015-09-23 14:43:05 +02:00
Vladimír Čunát d77588d127 gdk_pixbuf: maintenance update 2.31.6 -> 2.31.7 2015-09-20 09:09:18 +02:00
Eelco Dolstra b1104d6082 gdk-pixbuf: Disable tests
The tests take an excessive amount of time (> 1.5 hours) and memory (>
6 GB).

http://hydra.nixos.org/build/24911713
http://hydra.nixos.org/build/24470055#tabs-buildsteps
2015-08-21 12:56:55 +02:00
Vladimír Čunát 3f1fa380b2 gdk-pixbuf: fix CVE-2015-4491 by maintenance update 2015-08-20 15:18:46 +02:00
Vladimír Čunát 748da7e541 gdk-pixbuf: maintenance update 2015-07-23 14:43:10 +02:00
Jude Taylor 4fd74930ce darwin purity: gdk-pixbuf 2015-06-25 16:36:05 -07:00
Vladimír Čunát c4f1011cab gtk+ stack: maintenance updates 2015-05-27 22:05:42 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
William A. Kennington III 755230967b gdk_pixbuf: 2.30.8 -> 2.31.3 2015-04-03 21:54:58 -07:00
Vladimír Čunát 381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát 055aeb6ef7 gdk_pixbuf: minor update 2.30.6 -> .8 2014-06-17 09:00:29 +02:00
Vladimír Čunát 1dc040a8ad gdk_pixbuf: minor update 2014-03-24 22:39:42 +01:00
Luca Bruno 53fbbe3262 gnome3: Setup hook for gdk-pixbuf and gnome-icon-theme
Add necessary paths to the environment so that
applications can find icons.
2014-02-28 01:40:21 +01:00
Vladimír Čunát 74c34763e7 gdk_pixbuf: bugfix update 2.30.3 -> .4 2014-02-10 19:08:42 +01:00
Vladimír Čunát d92f6c19db gdk-pixbuf: bugfix update 2.30.2 -> .3, enable tests
Hopefully the tests will succeed on Hydra, too.
2014-02-02 10:42:53 +01:00
Vladimír Čunát 51c83e927d gdk_pixbuf: minor update (mainly JPEG fixes) 2013-12-21 15:14:55 +01:00
Vladimír Čunát 5aaabde3b8 gdk_pixbuf: bugfix update 2.30.0 -> .1 2013-11-17 14:35:29 +01:00
Vladimír Čunát 68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Vladimír Čunát cb8fff57c1 update gtk deps, on GNOME-3.10 branches now 2013-10-05 21:25:53 +02:00
Mathijs Kwik 1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát 7fbcc56260 add introspection into GTK libs (part of #517)
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
2013-08-04 21:11:24 +02:00
Vladimír Čunát d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát 03f5775f87 gdk_pixbuf: bugfix update 2013-05-02 18:33:20 +02:00
Vladimír Čunát 4e7741d694 gtk2 platform: minor updates
Also make glib use libelf (a few hudred kBs).
2013-03-29 02:01:03 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát 6331d32267 rename the expressions of some gtk-related libraries
now the default (and usually only) version is called default
2013-01-29 16:48:23 +01:00
Eelco Dolstra 6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra 5398eceff3 * Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00
Renamed from pkgs/development/libraries/gtk-libs/1.x/gdk-pixbuf/default.nix (Browse further)