Peter Simons
ef6849ca63
structured-haskell-mode: fix location of the "site-lisp" symlink
2017-08-01 15:25:19 +02:00
Frederik Rietdijk
b2608b8910
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-29 13:08:11 +02:00
Peter Simons
47e3245691
haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functions
2017-07-29 12:39:26 +02:00
Frederik Rietdijk
55357de67a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-28 19:37:36 +02:00
Peter Simons
cb1742e76d
haskell: fix builds broken by LTS-9 update
2017-07-28 18:14:02 +02:00
Peter Simons
f442bbcdec
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
f72c20d338
2017-07-28 18:13:57 +02:00
Peter Simons
30fbeed254
LTS Haskell 9.0
...
Minus the broken wai-middleware-prometheus-0.2.0 package.
2017-07-28 18:13:27 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging
2017-07-28 16:08:30 +02:00
Peter Simons
382db8a9ad
cabal2nix: version 2.4 needs Cabal 2.x
2017-07-27 15:47:03 +02:00
Peter Simons
86b230efd9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4 from Hackage revision
3fd8431bf5
2017-07-27 15:46:59 +02:00
Nikolay Amiantov
94adf8d17d
haskellPackages.threadscope: fix build
2017-07-27 12:47:58 +03:00
Domen Kožar
073b30563d
ghc-mod: fix build to cope with new split-output work
2017-07-27 09:12:41 +02:00
Peter Simons
2b0ce7aeab
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
8b34a74f81
2017-07-27 09:12:36 +02:00
michael bishop
be63b1994d
enable split-output builds for all haskellPackages
2017-07-27 09:12:06 +02:00
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
William Casarin
d680c2352c
jailbreak-cabal: specifically use ghc802 override in ghc821 config
...
Otherwise this will infinite loop when:
pkgs.haskellPackages = pkgs.haskell.packages.ghc821
2017-07-26 10:44:50 -07:00
John Ericson
ea7d13cf1a
stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
...
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
John Ericson
f6f40e3fe5
stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
...
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Peter Simons
175c3526ae
haskell: provide the name 'bin-package-db' (null) to fix evaluation errors
2017-07-26 10:20:31 +02:00
Peter Simons
28c01703f0
haskell: remove all code related to the "haste" compiler
...
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Peter Simons
a9111840fa
haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors
2017-07-26 10:20:30 +02:00
Peter Simons
91a8ed37af
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
2b4eeaa78b
2017-07-26 10:20:25 +02:00
Peter Simons
1178136336
hackage2nix: disable failing builds
2017-07-26 10:19:58 +02:00
Peter Simons
fd6f0a2127
hackage2nix: drop obsolete version of zlib
2017-07-26 10:19:57 +02:00
Peter Simons
8a3c080237
hackage2nix: drop old packages that were required for stack prior to version 1.5.x
2017-07-26 10:19:57 +02:00
Peter Simons
4664cf8079
hackage2nix: keep Cabal 1.24.x around for the time being
2017-07-26 10:19:57 +02:00
Peter Simons
efa3ba8950
haskell-diagrams-solve: disable failing test suite to fix the build
2017-07-26 10:18:10 +02:00
Peter Simons
27ca0cb3d4
haskell-generic-builder: fix syntax high-lightning in Emacs
2017-07-26 10:17:48 +02:00
Peter Simons
e69c7f5641
haskell-generic-builder: include setupHaskellDepends in the generated "env" attribute
...
We achieve this by moving setupHaskellDepends from the buildInputs attribute
into "otherBuildInputs", which is the attribute the builder uses to construct
the build inputs in both the actual build as well as the "env" attribute.
2017-07-26 10:17:48 +02:00
John Ericson
b087618ac0
Revert "stdenv: Store one package per line in nix-support/propagated-*"
...
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.
This reverts commit 3cb745d5a6https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
Frederik Rietdijk
29f91c107f
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-23 11:23:43 +02:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv
2017-07-21 20:36:34 -05:00
Peter Simons
3cc46829c7
haskell-symengine: the build is broken because the system library this code binds to does not exist
...
This error isn't easily detectable, however, because the Cabal files declares
the dependency on "symengine" for the test program rather than for the library
itself.
https://github.com/symengine/symengine.hs/pull/14
2017-07-19 18:55:38 +02:00
Peter Simons
476fc5f26e
haskell-cautious-file: jailbreak to fix the build
2017-07-18 16:51:09 +02:00
Peter Simons
85a70b50b9
haskell-hledger-iadd: drop obsolete override (the build fails with or without it)
2017-07-17 22:04:25 +02:00
Peter Simons
47feb45313
haskell-hsyslog: update version override
...
And move it from configuration-nix to configuration-common.
2017-07-17 22:04:25 +02:00
Peter Simons
6de60af3a9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-12-gcb2265e from Hackage revision
f69cfc36c9
2017-07-17 22:04:25 +02:00
Peter Simons
dd7824919e
LTS Haskell 8.23
2017-07-17 22:04:24 +02:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging
2017-07-15 12:15:56 +02:00
Domen Kožar
0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
...
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.
http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
John Ericson
ea9af6e3bd
Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup
...
Stdenv setup misc cleanups
2017-07-13 18:41:33 -04:00
Peter Simons
85c884278e
haskell-lens: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
559b1b7647
haskell-semigroupoids: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
c6ccfcd01a
haskell-base-orphans: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
bde4ef2234
haskell-hashable: jailbreak to fix build with ghc-8.2.x
2017-07-13 08:44:18 +02:00
Peter Simons
2180d2c118
haskell-jailbreak-cabal: use stable version from ghc-8.0.x in ghc-8.2.x package set
...
The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
2017-07-13 08:44:18 +02:00
Peter Simons
26762f1e1e
haskell-base-orphans: disable test suite to avoid build failures with ghc-8.2.x
2017-07-13 08:44:18 +02:00
Peter Simons
0ee5424ebf
haskell-doctest: remove obsolete jailbreak; ghc-8.2.x can build this package now
2017-07-13 08:44:18 +02:00
Peter Simons
f980dbec97
haskell-ChasingBottoms: jailbreak to fix build with ghc-8.2.x
2017-07-13 08:44:17 +02:00
Peter Simons
e59c532c23
haskell-hspec-meta: use latest version when compiling with ghc-8.2.x
...
Fixes https://github.com/hspec/hspec/issues/323 .
2017-07-13 08:44:17 +02:00
