Commit Graph

14 Commits

Author SHA1 Message Date
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
Nixpkgs Monitor
393dcd9c84 gmime: update from 2.6.15 to 2.6.19 2013-12-10 11:57:15 +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
Vladimír Čunát
f4c84b3cf9 gmime: fix via updating the ancient version 2013-04-18 09:34:02 +02:00
Eelco Dolstra
61129e1ee9 Split some GTK/X11-related packages
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
2012-08-26 22:53:19 -04:00
Florian Friesdorf
45859265b0 gmime 2.4.24
svn path=/nixpkgs/trunk/; revision=27174
2011-05-06 21:49:12 +00:00
Eelco Dolstra
cc3d1e1c09 * Sync with trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26243
2011-03-10 08:48:14 +00:00
Eelco Dolstra
d10651a8b7 * zOMG, a new Pan release!
* Delete gmime 2.2.x because the old version of Pan was the only
  package that needed it.

svn path=/nixpkgs/trunk/; revision=26200
2011-03-07 17:11:50 +00:00
Eelco Dolstra
0b86d85634 * Updated gmime to 2.4.22.
svn path=/nixpkgs/branches/x-updates/; revision=25830
2011-02-09 12:35:20 +00:00
Eelco Dolstra
f2aa054357 * Revive gmime-2.2.x, because gmime-2.4.x is not backwards
compatible.  For instance, Pan requires gmime-2.2.

svn path=/nixpkgs/trunk/; revision=22543
2010-07-09 09:12:42 +00:00
Peter Simons
f3ceb181e2 gmime 2.4.15
svn path=/nixpkgs/trunk/; revision=21646
2010-05-07 14:01:46 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
405d314395 * Pan 0.96.
svn path=/nixpkgs/trunk/; revision=5280
2006-05-07 21:58:31 +00:00