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
..
patches	haskellPackages: unbreak amazonka (and other packages that use it)	2019-09-22 13:43:08 +02:00
configuration-common.nix	haskellPackages.MemoTrie: remove dontCheck and dontHaddock overrides.	2019-09-25 15:28:40 +02:00
configuration-ghc-8.2.x.nix	jailbreak-cabal: updated package needs updated Cabal library	2019-09-06 17:27:21 +02:00
configuration-ghc-8.4.x.nix	jailbreak-cabal: updated package needs updated Cabal library	2019-09-06 17:27:21 +02:00
configuration-ghc-8.6.x.nix	cabal2nix: add override to keep the ghc-8.6.x version compiling	2019-09-25 15:29:46 +02:00
configuration-ghc-8.8.x.nix	haskell-bencode: mark the package broken with ghc-8.8.x	2019-09-25 15:29:46 +02:00
configuration-ghc-head.nix	Merge pull request #56137 from jacereda/cereal-check-head	2019-02-21 11:54:11 +01:00
configuration-ghcjs.nix	haskell-stm: update overrides for the new 2.5.x version	2018-09-24 21:19:35 +02:00
configuration-hackage2nix.yaml	haskellPackages.hadolint: fix build by disabling static linking	2019-09-25 15:28:40 +02:00
configuration-nix.nix	Merge branch 'master' into staging-next	2019-09-25 19:21:46 -04:00
configuration-tensorflow.nix	haskell: fix evaluation error in tensorflow-proto	2019-09-11 10:52:04 +02:00
default.nix	haskell: have a dedicated file for non Hackage packages	2018-10-12 14:12:29 +02:00
generic-builder.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
generic-stack-builder.nix	haskell.buildStackProject: Pass nativeBuildInputs	2019-08-11 14:21:13 +03:00
hackage-packages.nix	hackage-packages.nix: automatic Haskell package set update	2019-09-25 15:29:47 +02:00
hoogle-local-wrapper.sh
hoogle.nix	Pass hoogle-local's buildCommand as a file.	2019-09-03 09:23:28 +02:00
initial-packages.nix
lib.nix	haskell/lib: Introduce markUnbroken helper	2019-07-14 12:26:04 -04:00
make-package-set.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
non-hackage-packages.nix	cabal-install: version 3.x is out officially	2019-08-28 15:50:33 +00:00
stack-hook.sh	stack-hook: deduplicate better	2019-03-02 02:21:32 -05:00
with-packages-wrapper.nix