Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix		2018-04-16 21:13:30 +03:00
..
aliases.nix	Merge master into staging	2018-04-09 15:12:32 +02:00
all-packages.nix	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-16 21:13:30 +03:00
beam-packages.nix
coq-packages.nix
darwin-packages.nix	darling: init	2018-04-09 18:35:35 -05:00
default.nix
dotnet-packages.nix
emacs-packages.nix
emscripten-packages.nix
haskell-packages.nix
haxe-packages.nix
impure.nix
java-packages.nix
lua-packages.nix	luaPackages.mpack: fix hash	2018-04-13 20:54:31 +02:00
make-tarball.nix
metrics.nix
ocaml-packages.nix	ocamlPackages.js_of_ocaml-lwt: init at 3.1.0	2018-04-08 17:38:14 +00:00
perl-packages.nix	perlPackages.Socket6: fix sv_undef compilation error	2018-04-14 18:00:35 +02:00
php-packages.nix
pure-packages.nix
python-packages.nix	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-16 21:13:30 +03:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix
splice.nix
stage.nix
unix-tools.nix	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-16 21:13:30 +03:00