Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv ... Conflicts: pkgs/tools/security/gnupg/default.nix		2014-10-09 10:57:57 +02:00
..
5.0.3.nix
5.1.darwin.patch
5.1.nix
5.2.darwin.patch
5.2.nix
expat.nix
filesystem.nix
sec.nix
sockets.nix
zip.nix	New package: lua-zip-1.2.3	2014-09-20 23:32:17 +01:00
zip.patch	New package: lua-zip-1.2.3	2014-09-20 23:32:17 +01:00