JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,878 Commits 2 Branches 0 Tags 12 GiB
99b88cfb53
Commit Graph

28 Commits

Author SHA1 Message Date
Eelco Dolstra
99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-09 00:41:27 +02: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
570b0f8c54 libtiff: major update to 4.* 
Also minor modification of ghostscript to work with it.
 2013-01-29 14:07:30 +01:00
Eelco Dolstra
99df2b42a7 libtiff: Update to 3.9.7 2012-09-26 14:59:48 -04: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
Eelco Dolstra
e2edc964fd * Updated libtiff to 3.9.6 and applied a fix for CVE-2012-1173. 
svn path=/nixpkgs/branches/x-updates/; revision=34124
 2012-05-15 21:13:46 +00:00
Eelco Dolstra
cceb5bcf80 * Work around (temporarily?) broken URL. 
svn path=/nixpkgs/branches/x-updates/; revision=22669
 2010-07-19 23:24:16 +00:00
Eelco Dolstra
964c3d351f * libtiff updated to 3.9.4. 
svn path=/nixpkgs/branches/x-updates/; revision=22640
 2010-07-18 21:54:28 +00:00
Eelco Dolstra
cb7dfb9652 * libtiff 3.9.1. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18027
 2009-10-29 14:19:58 +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
12f0f1ad20 * Updated a few packages. 
svn path=/nixpkgs/trunk/; revision=5246
 2006-05-01 17:57:42 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Armijn Hemel
531d25dafa package has moved...and there's a new version out btw... 
svn path=/nixpkgs/trunk/; revision=4597
 2006-01-26 16:47:27 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Eelco Dolstra
552de99c19 * Update a bunch of base packages. 
svn path=/nixpkgs/trunk/; revision=4065
 2005-10-11 14:29:30 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Eelco Dolstra
7775caaa35 * Evacuate tarballs. 
svn path=/nixpkgs/trunk/; revision=2527
 2005-04-11 13:09:01 +00:00
Eelco Dolstra
013300cb0e * Libtiff updated to 3.7.2. 
svn path=/nixpkgs/trunk/; revision=2519
 2005-04-11 08:54:32 +00:00
Eelco Dolstra
aac8011c8b * GTK 2.6 plus associated libraries. 
* Updated libtiff, libpng, libxml2, libxslt, gettext.

svn path=/nixpkgs/trunk/; revision=2238
 2005-02-15 16:22:20 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra
c58195fba0 * Libtiff updated to 3.6.1. 
svn path=/nixpkgs/trunk/; revision=1454
 2004-09-18 21:13:57 +00:00
Eelco Dolstra
de759967c8 * Update to GTK 2.4.0. 
svn path=/nixpkgs/trunk/; revision=906
 2004-04-02 13:58:55 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra
2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing 
broke.

svn path=/nixpkgs/trunk/; revision=870
 2004-03-29 10:25:25 +00:00
Eelco Dolstra
d74192ee38 * propagated-build-inputs should now be placed in $out/nix-support. 
svn path=/nixpkgs/trunk/; revision=823
 2004-03-09 10:59:55 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs. 
svn path=/nixpkgs/trunk/; revision=502
 2003-11-14 09:59:13 +00:00