Dmitry Kalinkin c455adcc42 Merge branch 'master' into staging-next ... Fixes eval on darwin after #69072 Resolved conflict in pkgs/tools/security/thc-hydra/default.nix Basically had to revert a1c0e10564 which adapts #69210 to master that doesn't yet have 329a88efa7 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works		2019-09-25 19:21:46 -04:00
..
aliases.nix	Merge branch 'master' into staging-next	2019-09-24 08:14:34 +02:00
all-packages.nix	Merge branch 'master' into staging-next	2019-09-25 19:21:46 -04:00
beam-packages.nix
config.nix
coq-packages.nix	coq_8_10: 8.10+β2 → 8.10+β3	2019-09-16 11:41:43 -05:00
darwin-packages.nix
default.nix
dotnet-packages.nix
emacs-packages.nix
emscripten-packages.nix
haskell-packages.nix	Merge pull request #69033 from peti/t/drop-obsolete-ghc-versions	2019-09-18 19:35:17 +02:00
haxe-packages.nix
impure.nix
java-packages.nix
lua-packages.nix	lua*Packages: Consolidate separate setup hooks together	2019-09-01 17:42:20 +02:00
make-tarball.nix
metrics.nix
ocaml-packages.nix	ocamlPackages.containers: 1.4 → 2.6.1, and related fixes (#69132)	2019-09-24 07:48:26 +01:00
perl-packages.nix	perlPackages.MustacheSimple: init at 1.3.6	2019-09-25 01:16:02 +00:00
php-packages.nix
pure-packages.nix
python-packages.nix	pythonPackages.dict2xml: init at 1.6.1	2019-09-25 12:03:27 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix	release.nix: remove firefox-unwrapped from darwin-tested	2019-09-20 23:09:11 -04:00
ruby-packages.nix	ruby.withPackages: init	2019-09-03 19:44:49 +00:00
splice.nix
stage.nix
static.nix	static: disable python on macOS	2019-09-09 22:42:03 -04:00
unix-tools.nix
wine-packages.nix