JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,571 Commits 2 Branches 0 Tags 12 GiB
52f53c69ce
Commit Graph

3442 Commits

Author SHA1 Message Date
Oliver Charles
08d9755acb haskellngPackages.snaplet-redis: Remove doJailbreak 
Now handled by hackage2nix
 2015-01-15 14:53:25 +00:00
Oliver Charles
e259b1ed94 haskellngPackages.stripe: Remove doJailbreak 
0.8.3 does not need to be jailbroken.
 2015-01-15 14:51:44 +00:00
Oliver Charles
ef296fa407 haskell-ng.snaplet-stripe: Remove doJailbreak 
Now done automatically by hackage2nix
 2015-01-15 14:50:55 +00:00
Oliver Charles
2b63483bd5 haskellngPackages.fb: Update patch 2015-01-15 14:26:06 +00:00
Oliver Charles
1d4098dd03 Haskell: correct sha256 for tasty-ant-xml 
For some reason hackage2nix always outputs `nil`.

CC @peti
 2015-01-15 14:15:13 +00:00
Oliver Charles
0305f3b797 hackage-packages.nix: re-generate from Hackage 2015-01-15 14:11:26+00:00 2015-01-15 14:11:32 +00:00
Peter Simons
0e6fd630a4 hackage-packages.nix: drop hard-coded configureFlags and add automatic jailbreaks 
The new version of hackage2nix adds an automatic jailbreak=true attribute to
all builds that are known to fail because of unsatisfied dependency version
constraints. Of course, hackage2nix is only able to detect these problems for
the default package set -- "haskellngPackages" -- that's built with GHC 7.8.4.
It cannot know problems that might arise if you build a package with a
different version of GHC, which comes with different versions of the core
libraries. This change "fixed" 806 builds: http://hydra.cryp.to/eval/85620.

Please pay attention to possible jailbreaks when reporting build errors
upstream! If a build was run with jailbreaking enabled, the build log says

 | Running jailbreak-cabal to lift version restrictions on build inputs.

at the very top. Upstream bug reports about build errors should contain that
information, i.e. the package author should know that you're building with
different (newer!) library versions than they're specifying.

Furthermore, build expressions no longer contain an explicit list of every
Cabal flag setting. Instead, we trust that Cabal figures out an appropriate
configuration at build time. This makes the build expressions more space to
adapt to different configuration at the cost of being slightly less
deterministic.
 2015-01-15 10:15:13 +01:00
Peter Simons
02caf57cee jailbreak-cabal: build with Cabal 1.18.x on GHC 7.6.x 2015-01-15 10:15:11 +01:00
Peter Simons
ee158bf659 Cabal-1.18.x: remove unnecessary jailbreak 2015-01-15 10:15:11 +01:00
Peter Simons
5bb103b4b2 haskell-vector: fix test suite on i686 2015-01-15 10:15:10 +01:00
Peter Simons
841b829fcd haskell-ng: bump cabal2nix to latest Git version 2015-01-15 10:15:10 +01:00
Peter Simons
e8b14bd783 hackage-packages.nix: update from Hackage 2015-01-14T14:28:46+0100 2015-01-15 10:15:10 +01:00
Peter Simons
df76eb1268 ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc." 
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
 2015-01-14 22:24:33 +01:00
Oliver Charles
5b70a64286 haskell-ng.fb: Apply a patch to use monad-control >= 1.0.0 
Manually applying the patch at
https://github.com/prowdsponsor/fb/pull/33
 2015-01-14 14:10:34 +00:00
Oliver Charles
0059182821 snaplet-stripe: Jailbreak 
Necessary until https://github.com/LukeHoersten/snaplet-stripe/pull/4 is
merged and released.
 2015-01-14 13:54:16 +00:00
Oliver Charles
dd0bde0b3b haskell-ng.stripe: Jailbreak 
Necessary until https://github.com/michaelschade/hs-stripe/pull/37 is
merged and released.
 2015-01-14 13:51:49 +00:00
Oliver Charles
3dbb43e62e haskell-ng.snaplet-redis: Jailbreak 
Necessary until https://github.com/dzhus/snaplet-redis/pull/11 is merged and released.
 2015-01-14 13:47:38 +00:00
Oliver Charles
9c71a83fd1 haskellng.th-desugar: Don't run the tests 
Tests fail to build, see
https://github.com/goldfirere/th-desugar/issues/21
 2015-01-14 13:40:11 +00:00
Oliver Charles
06cfa238df hackage-packages.nix: re-generate from Hackage 2015-01-14T12:32:30+00:00 2015-01-14 12:32:35 +00:00
Peter Simons
a8076c7654 ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc. 
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
 2015-01-14 11:24:59 +01:00
Peter Simons
30904c7789 hackage-packages.nix: re-generate from Hackage 2015-01-14T09:34:03+0100 2015-01-14 11:24:16 +01:00
Peter Simons
007628fd49 haskell-generic-builder: use cpphs pre-processor by default on Darwin 
Allegedly, the cpp implementation of Clang is weird and causes errors.
 2015-01-13 22:33:17 +01:00
Peter Simons
67312f83ad haskell-generic-builder: pass "--with-gcc=$CC" on Darwin to help Cabal find Clang 
Suggested in https://github.com/NixOS/nixpkgs/pull/5746.
 2015-01-13 22:33:01 +01:00
Peter Simons
d6ed34170d haskell-configuration-common: fix reference to optparse-applicative_0_10_0 2015-01-13 20:43:18 +01:00
Peter Simons
9da7482e87 haskell-configuration-common: minor cosmetic 2015-01-13 20:22:07 +01:00
Tom Hunger
123039c22e haskellng: Make haskell-zeromq4 pick up the correct zeromq nix package. 2015-01-13 18:36:36 +00:00
Tom Hunger
381ba6b22f haskellng: disable safecopy's broken tests. 2015-01-13 18:00:01 +00:00
Tom Hunger
ffe05e7476 haskellng: Fix elm ecosytem by adding a few special cases. 2015-01-13 17:35:14 +00:00
Peter Simons
51b9c9b262 idris: fix build with GHC 7.8.x 2015-01-13 15:21:51 +01:00
Shea Levy
2ba3653ef6 Update hackage-packages 
Includes NixOS/cabal2nix#127
 2015-01-13 08:55:02 -05:00
Peter Simons
e4a68f0b98 haskell-ng: add more tools to our help function library 2015-01-13 12:44:53 +01:00
Shea Levy
9e114ccd26 haskellng: Make amazonka env externally visible 2015-01-12 18:13:40 -05:00
Shea Levy
3dc5be9ec5 More amazonka packages on 7.8 2015-01-12 20:58:57 +00:00
Shea Levy
67460ea19f haskellng: Fix amazonka-core on 7.8 
Required adding a flag to the generic builder to build Setup.hs with
core packages even if there is an override in buildInputs, to break
circular dependencies.
 2015-01-12 15:41:03 -05:00
Shea Levy
d30e9082bb D'oh 2015-01-12 12:20:42 -05:00
Shea Levy
3f714f32ac overrideCabal: Preserve overrideScope attr 2015-01-12 12:18:46 -05:00
Peter Simons
8e25e4e368 hackage-packages.nix: break infinite recursions and other evaluation errors 2015-01-12 16:35:15 +01:00
Peter Simons
2225b43bd4 hledger-web: test suite has been fixed 2015-01-12 16:35:14 +01:00
Peter Simons
36b5b900db haskell-modules-lib: add 'markBroken' helper function 2015-01-12 16:35:14 +01:00
Peter Simons
fecd280708 haskell-configuration-ghc-7.9.x: we can use a doctest release version now 2015-01-12 16:35:14 +01:00
Peter Simons
f7bca36c53 hackage-packages.nix: re-generate from Hackage 2015-01-12T10:33:40+0100 2015-01-12 16:35:14 +01:00
Shea Levy
e0b270efc9 Fix http-date build on ghc 7.10 2015-01-12 09:58:56 -05:00
Shea Levy
baa634cf18 Fix retry build on ghc 7.10 2015-01-12 09:46:35 -05:00
Shea Levy
2f5cd9ec85 haskell-chell: Fix for 7.10.1 2015-01-12 09:37:20 -05:00
Shea Levy
c972ea1e8c haskell-options: Fix for 7.10.1 2015-01-12 09:14:50 -05:00
Peter Simons
87eba920fa haskell-lib.nix: fix doCheck helper 2015-01-12 01:28:15 +01:00
Peter Simons
2f4dc089a9 haskell-ng: fix transformers-compat for GHC 7.6.x 2015-01-11 20:56:21 +01:00
Peter Simons
f49fa1f20b hackage-packages.nix: re-generate to fix ALUT 2015-01-11 20:56:21 +01:00
Peter Simons
4cd9c8c3ae haskell-ng: jailbreak AbortT-transformers to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons
cfc2aeaa91 haskell-ng: disable ABList test suite to fix the build 2015-01-11 20:56:21 +01:00
Peter Simons
3e64a6e382 haskell-ng: fix 7.6.3 build of hashable 2015-01-11 20:56:21 +01:00
Peter Simons
921bb64a6d haskell-ng: fix old Cabal builds 2015-01-11 20:56:21 +01:00
Peter Simons
bca9b8d867 haskell-generic-builder: make $shellHook in 'env' attribute more robust 
In case our GHC environment is empty, the old code ended up running
'grep export' on a GHC binary, which doesn't seem like a good idea.
 2015-01-11 11:59:47 +01:00
Peter Simons
dbb4012fdc haskell-generic-builder: add a helpful message that explains why it makes no sense to build an 'env' attribute 2015-01-11 11:39:16 +01:00
Peter Simons
7fa32aecd1 haskell-cabal-test-quickcheck: fix build with GHC 7.8.4 2015-01-11 01:46:30 +01:00
Peter Simons
b31082d246 haskell-generic-builder: propagate build inputs only if we're building a library 2015-01-10 23:54:30 +01:00
Peter Simons
be8219e35b haskell-ng: disable broken ghcjs build 2015-01-10 23:36:59 +01:00
Peter Simons
2ff8d1940f haskell-configuration-*: polish compiler-specific overrides 2015-01-10 23:36:59 +01:00
Peter Simons
55003ca34b pkgs/development/haskell-modules/lib.nix: add funky helper function for overriding 2015-01-10 23:36:59 +01:00
Peter Simons
7e2f1493b7 haskell-ng: update to jailbreak-cabal 1.2, which supports Cabal 1.22.x now 2015-01-10 18:50:49 +01:00
Shea Levy
e4c9a521ef haskellng: remove amazonka patches. 
New amazonka was released.

@peti Long-term, is there a way to have hackage2nix warn about patched
packages?
 2015-01-10 11:35:25 -05:00
Peter Simons
11ac18a6e6 haskell-ng: update cabal2nix snapshot 2015-01-10 15:55:47 +01:00
Peter Simons
89b5d9ee14 haskell-generic-builder: add an 'env' attribute to every Haskell expression that can be used with nix-shell to create an interactive build environment for this package 
For example:

  nix-shell --pure ~/.nix-defexpr -A haskell-ng.packages.ghc784.hsdns.env
 2015-01-10 15:55:47 +01:00
Peter Simons
f36973ce83 haskell-ng: Make ghcWithPackages available as ghc.withPackages, too. 2015-01-10 15:55:47 +01:00
Peter Simons
afca6145d4 haskell-generic-builder: simplify "package.conf.d" management 
The builder creates a temporary package.conf.d database in $TMP that
contains everything required to build the current package (i.e. the
transitive closure of the package's propagated build inputs). These
files are no longer installed, however, we just install the package.conf
file for the package we're actually building. This means that
package.conf.d directory in $out won't have collisions anymore, which
simplifies the with-packages-wrapper.nix a bit.
 2015-01-10 15:55:47 +01:00
Peter Simons
fa27f2af5b hackage-packages.nix: rebuild from Hackage 2015-01-10T13:56:15+0100 2015-01-10 15:55:47 +01:00
Peter Simons
cbca401a04 configuration-ghc-7.9.x: fix license attribute for doctest override 2015-01-10 15:55:46 +01:00
Peter Simons
2d83ff9f3e haskell-configuration-ghc-7.9.x: use current Git HEAD of doctest to fix lots of test suites 2015-01-10 11:31:04 +01:00
Peter Simons
60ecd42514 haskell-ng: add current Git version of cabal2nix to the package set 
nix-env -iA haskellPackages.cabal2nix    ==> 1.x branch
  nix-env -iA haskellngPackages.cabal2nix  ==> 2.x branch
 2015-01-10 11:31:04 +01:00
Shea Levy
6e008f05ab haskellng: Get amazonka family building 
amazonka-0.0.7 is broken, so I also updated hackage-packages after
applying NixOS/cabal2nix#119.
 2015-01-09 19:03:27 -05:00
Shea Levy
60fec84379 Disable split testsuite on 7.10 2015-01-09 17:02:42 -05:00
Shea Levy
dd558e0baa Disable old-locale for aeson on 7.10 
@peti why does hackage2nix enable that flag anyway?
 2015-01-09 16:24:38 -05:00
Shea Levy
69f5738668 attoparsec: Fix build for 7.10 2015-01-09 16:18:16 -05:00
Shea Levy
4d325bcede haskellng: bump text-icu 
Taken from d2566a190e
 2015-01-09 15:55:22 -05:00
Shea Levy
473b0d9535 Revert "hackage-packages.nix: Update to 2015/01/09-20:00 UTC" 
For some reason this set a lot of native dependencies to null. I'll just
take the text-icu bump by itself for now.

@peti how am I meant to use hackage2nix?

This reverts commit d2566a190e.
 2015-01-09 15:53:35 -05:00
Shea Levy
d2566a190e hackage-packages.nix: Update to 2015/01/09-20:00 UTC 
Needed text-icu bump
 2015-01-09 15:03:42 -05:00
Shea Levy
b1c3c3276d Miscellaneous ghcHEAD fixes 2015-01-09 14:57:39 -05:00
Shea Levy
93b75f6284 ghc-ng-7.10: More doctest fixes 2015-01-09 14:07:36 -05:00
Peter Simons
adf0a891be haskell-configuration-ghc-7.9.x: add a couple of overrides to disable failing test suites (mostly doctest) 2015-01-09 19:55:25 +01:00
Peter Simons
2761c63bcf configuration-ghc-7.9.x: GHC 7.10.1-rc1 can build Haddock documentation, but it cannot build Hoogle files 2015-01-09 19:55:25 +01:00
Peter Simons
2f2f767813 haskell-generic-builder: allow selective enabling/disabling of the --hoogle flag to Haddock 2015-01-09 19:55:25 +01:00
Michael Raskin
e67bb36821 Work around buildEnv sometimes deciding to make bin a symlink 2015-01-09 21:40:06 +03:00
Shea Levy
ad632cc9c8 utf8-string has too string base upper bound 2015-01-09 13:38:34 -05:00
Shea Levy
119f5baa22 Fix transformers-compat on 7.10-ng 2015-01-09 13:33:10 -05:00
Peter Simons
38e2e8702c ghcWithPackages: call this derivation exactly like the compiler it's based on 
Furthermore, export "name" and "version" attributes that match those of the
underlying compiler. These changes make a ghcWithPackages-generated wrapper
look exactly like a normal GHC derivation and it can be used anywhere in
Nixpkgs where a normal GHC would be used.
 2015-01-09 19:30:14 +01:00
Peter Simons
96ae5d58bf haskell-configuration-ghc-7.9.x: steal a working jailbreak-cabal binary from the 7.8.4 package set to alleviate the effects of https://github.com/peti/jailbreak-cabal/issues/3 2015-01-09 19:17:59 +01:00
Peter Simons
388848fa9f haskell-configuration-ghc-7.8.x: various build fixes 
- mtl-2.2.x needs transformers 0.4.x.
 - time-1.5.x can't build its test suite.
 - provide deep overrides for amazonka-* stuff to build with GHC 7.8.x
 2015-01-08 18:50:19 +01:00
Peter Simons
3c8b33eee4 haskell-modules: implement overrideScope method for deep overriding 
deepOverride turns out to be completely unfeasible for non-trivial overrides.
Nix evaluates for an eternity, and then comes back saying:

  Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
  nix-instantiate killed by signal 6

The hand-written deep-override, on the other hand, performs the job in a
fraction of a second, no problem.

All bow to Russell O'Connor!
 2015-01-08 18:50:19 +01:00
Peter Simons
d737d463c6 hackage-packages.nix: update from Hackage 2015-01-08T16:50:56+0100 
This update also brings monad-control version 1.x by default, and some
additional (older) versions of the amazonka package family.
 2015-01-08 18:50:19 +01:00
Peter Simons
197e7672e6 haskell-configuration-ghc-7.9.x: improve configuration to fix some builds 2015-01-08 13:46:47 +01:00
Peter Simons
0811375a69 haskell-configuration-common: cosmetic 2015-01-08 13:46:47 +01:00
Peter Simons
54baa53df1 Say hello to our brand-new Haskell infrastructure. 2015-01-07 23:45:21 +01:00