Commit graph

10 commits

Author SHA1 Message Date
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 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 c55f5ae19d tulip: update to fix compilation with libpng-1.6 2013-02-16 16:16:32 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Michael Raskin e6fa414b64 Update and fix Tulip
svn path=/nixpkgs/trunk/; revision=32613
2012-02-27 07:10:05 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Michael Raskin b973f98afa Make tulip run without hassle. Unfortunately, some operations repeatably crash tulip even when built vs Qt4.6
svn path=/nixpkgs/trunk/; revision=27570
2011-07-01 09:53:11 +00:00
Michael Raskin a4be010d31 Update Tulip
svn path=/nixpkgs/trunk/; revision=27566
2011-07-01 07:01:46 +00:00
Michael Raskin b1eb6c96a8 Update Tulip. Unicode support should be available now.
svn path=/nixpkgs/trunk/; revision=22484
2010-07-06 07:25:07 +00:00
Ludovic Courtès 5be3acda2d Add Tulip, a graph visualization framework.
svn path=/nixpkgs/trunk/; revision=22264
2010-06-14 18:30:35 +00:00