Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk ... - 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500		2012-03-31 20:01:40 +00:00
..
all-packages.nix	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
guile-2-test.nix
haskell-packages.nix	Dropped obsolete Haskell packages.	2012-03-29 11:17:31 +00:00
make-tarball.nix	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
mingw.nix
perl-packages.nix	* Fix the build of Task::Catalyst::Tutorial (http://hydra.nixos.org/build/2307296).	2012-03-26 11:38:49 +00:00
platforms.nix	Updating the cifs utils (I think even the hash did not match for 4.5),	2012-02-15 11:08:38 +00:00
python-packages.nix	* Boto updated to 2.3.0.	2012-03-27 10:48:45 +00:00
release-cross.nix	release-cross: Build gnu.smbfs.hostDrv', not gnu.smbfs'.	2012-02-27 17:50:44 +00:00
release-lib.nix	* Add x86_64-freebsd to release-lib.nix	2012-03-08 12:52:00 +00:00
release-small.nix	completely removed gw6c. use gogoclient.	2012-03-11 14:35:36 +00:00
release.nix	* Fix the build of Task::Catalyst::Tutorial (http://hydra.nixos.org/build/2307296).	2012-03-26 11:38:49 +00:00