Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
aliases.nix	Merge pull request #35844 from adisbladis/jquery-mv	2018-03-06 15:34:34 +08:00
all-packages.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
beam-packages.nix
coq-packages.nix
darwin-packages.nix
default.nix
dotnet-packages.nix	dotnetPackages.Nuget: fix binary casing issue	2018-03-08 21:09:02 +00:00
emacs-packages.nix
emscripten-packages.nix
haskell-packages.nix
haxe-packages.nix
impure.nix
java-packages.nix
lua-packages.nix	luaPackages.bit32: init at 5.3.0	2018-03-09 19:32:28 +00:00
make-tarball.nix
metrics.nix	metrics: fix "values" to be count not bytes, to match prev behavior	2018-03-13 13:29:15 -05:00
ocaml-packages.nix	ocamlPackages: default to 4.05	2018-03-14 16:24:27 +01:00
perl-packages.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
php-packages.nix	phpPackages.php-cs-fixer: 2.10.3 → 2.10.4	2018-03-09 05:07:29 +01:00
pure-packages.nix
python-packages.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
release-cross.nix
release-lib.nix	treewide: get rid of platforms.allBut	2018-03-14 18:44:42 -04:00
release-python.nix
release-small.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
release.nix	clang-6 test variants	2018-03-07 19:03:08 -06:00
splice.nix
stage.nix