Vladimír Čunát 35a927149f Merge branch 'master' into x-updates ... Conflicts (both messed with mesa): pkgs/top-level/all-packages.nix		2013-02-02 21:11:00 +01:00
..
all-packages.nix	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
guile-2-test.nix
haskell-defaults.nix	GHC 7.6.2	2013-01-29 20:42:28 +01:00
haskell-packages.nix	Add haskell-ghc-vis, haskell-heap-view and deps.	2013-02-02 20:26:34 +01:00
make-tarball.nix	Nixpkgs channel: Use XZ compression for nixexprs.tar	2013-01-30 12:52:07 +01:00
mingw.nix
node-packages.nix	node/bson: fix sha256	2013-01-13 14:54:26 +01:00
perl-packages.nix	JSON::Any: Pull in JSON	2013-01-28 23:14:59 +01:00
platforms.nix	Add kgdb to the sheeveaplug. It can help in case of troubles.	2012-12-29 12:22:50 +01:00
python-packages.nix	awscli: Remove Python prefix	2013-01-30 15:55:39 +01:00
release-cross.nix	openoffice: Remove	2013-01-29 12:43:53 +01:00
release-lib.nix	Add config option ‘allowUnfree’	2013-01-17 23:41:37 +01:00
release-python.nix	openoffice: Remove	2013-01-29 12:43:53 +01:00
release-small.nix	nxml-mode: remove from release as well	2012-11-23 19:59:19 +01:00
release.nix	openoffice: Remove	2013-01-29 12:43:53 +01:00