Shea Levy a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs ... z3: version 4.3.1		2014-03-28 23:54:43 -04:00
..
applications	Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs	2014-03-28 23:54:43 -04:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +01:00
data	man-pages-posix: update 2003a -> 2013-a	2014-03-16 17:39:50 +01:00
desktops	Add shotwell 1.15.1	2014-03-18 18:23:13 +01:00
development	Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs	2014-03-28 23:25:25 -04:00
games	Merge branch 'master' of git://github.com/fmap/nixpkgs	2014-03-28 23:09:25 -04:00
misc	nixpkgs-lint: add the platforms meta attr for most of my packages	2014-03-16 12:08:26 +01:00
os-specific	Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs	2014-03-28 23:39:01 -04:00
servers	Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs	2014-03-28 21:38:30 -04:00
shells	fish: Fix propagatedBuildInputs and other assorted changes	2014-02-15 12:17:06 +01:00
stdenv	Explicitly require Nix 1.6	2014-03-17 11:33:36 +01:00
test
tools	Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs	2014-03-28 23:45:00 -04:00
top-level	Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs	2014-03-28 23:54:43 -04:00