John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base ... Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh		2017-07-26 13:46:04 -04:00
..
patches	haskell-dbus: drop semicolons.patch; this change appears to have been included upstream	2017-04-21 16:25:52 +02:00
configuration-common.nix	haskell: provide the name 'bin-package-db' (null) to fix evaluation errors	2017-07-26 10:20:31 +02:00
configuration-ghc-6.12.x.nix	haskell-binary: update 0.8.x branch to latest version	2017-04-04 16:29:12 +02:00
configuration-ghc-7.0.x.nix	haskell-network: use older version to compile with GHC 7.4.x and before	2017-06-23 12:49:37 +02:00
configuration-ghc-7.2.x.nix	haskell-network: use older version to compile with GHC 7.4.x and before	2017-06-23 12:49:37 +02:00
configuration-ghc-7.4.x.nix	haskell-network: use older version to compile with GHC 7.4.x and before	2017-06-23 12:49:37 +02:00
configuration-ghc-7.6.x.nix	haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC	2017-06-23 12:49:37 +02:00
configuration-ghc-7.8.x.nix	haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC	2017-06-23 12:49:37 +02:00
configuration-ghc-7.10.x.nix	haskell: ghcjs packages: Remove ghcjs-prim	2017-04-07 21:41:01 +02:00
configuration-ghc-8.0.x.nix	hackage2nix: use older version of apply-refact with ghc-8.0.x	2017-07-01 09:46:02 +02:00
configuration-ghc-8.2.x.nix	haskell-lens: use latest version when compiling with ghc-8.2.x	2017-07-13 08:47:01 +02:00
configuration-ghc-head.nix	haskell-old-time: fix build with GHC HEAD	2017-04-21 16:25:54 +02:00
configuration-ghcjs.nix	miso: init at 0.2.0.0	2017-07-12 18:47:18 +00:00
configuration-hackage2nix.yaml	hackage2nix: disable failing builds	2017-07-26 10:19:58 +02:00
configuration-halvm-2.4.0.nix	Init HaLVM at 2.4.0	2017-03-10 19:31:12 -06:00
configuration-nix.nix	haskell-hledger-iadd: drop obsolete override (the build fails with or without it)	2017-07-17 22:04:25 +02:00
default.nix	haskellPackages: make configuration-{nix,common}.nix configurable	2017-06-22 13:25:53 +02:00
generic-builder.nix	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
generic-stack-builder.nix	Fix #26441 second try: avoid infinite recursion	2017-06-15 10:22:25 +02:00
hackage-packages.nix	hackage-packages.nix: automatic Haskell package set update	2017-07-26 10:20:25 +02:00
hoogle-local-wrapper.sh	Make hoogle-local compatible wih hoogle >= 5.0.4	2016-09-20 12:04:46 +02:00
hoogle.nix	ghcWithHoogle: fix for ghcjs	2017-02-14 22:50:29 +01:00
lib.nix	justStaticExecutables: enable -dead_strip on mac to shrink closure	2017-06-14 14:23:53 -03:00
make-package-set.nix	stdenv: add stawman docs for makeOverridable	2017-06-24 12:47:57 +02:00
with-packages-wrapper.nix	Fix use of isDarwin conditionals.	2017-05-05 09:53:08 -07:00