Commit Graph

1553 Commits

Author SHA1 Message Date
YPares
3868cad832 haskell: generic-stack-builder sets an env var
generic-stack-builder was not setting STACK_PLATFORM_VARIANT="nix".
This is required by stack when handling its haskell packages database
snapshot. Stack must keep separated packages built with its own GHC
and those built with GHC from Nixpkgs.
2016-06-15 17:08:41 +02:00
Peter Simons
8d86c8274f callHackage: generate expressions for the appropriate target system and compiler 2016-06-13 23:09:56 +02:00
Peter Simons
ee933f5d73 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613 using the following inputs:

  - Hackage: b9e58743e7
  - LTS Haskell: 2a2cddb443
  - Stackage Nightly: 4b8c8abac5
2016-06-13 23:09:44 +02:00
Peter Simons
52edff8689 Merge pull request #15989 from mboes/stack-builder-tweaks
haskell.lib.buildStackProject: allow passing in a custom GHC version.
2016-06-13 12:15:11 +02:00
Michael Alan Dorman
b40e1efe00 haskell generic-builder: don't propagate setupHaskellDepends
Without this patch, attempts to install at least some of the packages
that start to use setupHaskellDepends (mostly gtk-related packages)
results in collisions:

    building path(s) ‘/nix/store/63k5smns43f5r2ad8wcc242x0gwd70m3-ghc-8.0.1’
    collision between `/nix/store/k18i1nm5hgnb82y9w2g9hmlwhk3szjld-ghc-8.0.1/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi' and `/nix/store/0rwhbwsg9kmywgbrib2bs29p2hmi80za-Cabal-1.24.0.0/lib/ghc-8.0.1/Cabal-1.24.0.0/Distribution/Compat/Binary.dyn_hi'
    builder for ‘/nix/store/vrjkfpm8sb96m9i5k74h8vn0rwddgy4v-ghc-8.0.1.drv’ failed with exit code 25

This would appear to me to be a consequence of setupHaskellDepends
entries being added to propagateBuildInputs.  It is sufficient in the
cases I'm familiar with (taffyBar), and I think correct, to simply add
it to the otherBuildInputs.
2016-06-13 09:51:35 +02:00
Mathieu Boespflug
70bc97b731 haskell.lib.buildStackProject: fix treatment of LD_LIBRARY_PATH.
Don't make LD_LIBRARY_PATH pick up cwd when original string is empty,
due to colon terminated search path.
2016-06-13 00:55:34 +02:00
Mathieu Boespflug
292a8892a0 haskell.lib.buildStackProject: allow passing in a custom GHC version.
Previously, the user could only compile using the default version of
GHC in Nixpkgs. Now this can be changed by setting the `ghc` attribute
appropriately.
2016-06-13 00:55:33 +02:00
Peter Simons
2862d272a6 haskell: add support for all of Hackage
The function "callHackage <name> <version>" generates build instructions for
the requested library version on-the-fly. All of Hackage is available. Note:
this code is brand-new, experimental, and it might change in the future. Don't
base production code on this feature yet.

Example usage:

  $ nix-shell -p 'haskellPackages.callHackage "cpphs" "1.19.3" {}' --run "cpphs --version"
  cpphs 1.19.3

  $ nix-shell -p 'haskellPackages.ghcWithPackages (self: [(self.callHackage "hsdns" "1.6.1" {})])' --run "ghc-pkg list hsdns"
  /nix/store/p6r81k2vb2pzy4wcvri6z9m492i0hg63-ghc-8.0.1/lib/ghc-8.0.1/package.conf.d
      hsdns-1.6.1
2016-06-12 08:37:06 +02:00
Peter Simons
52aad6c77d haskell.lib.withHoogle: remove obsolete function 2016-06-12 08:37:06 +02:00
Peter Simons
00bebe798c haskell-http2: remove obsolete override 2016-06-12 08:37:06 +02:00
Peter Simons
cc09d421f2 haskell-hslogger: fix LTS build 2016-06-12 08:37:05 +02:00
Peter Simons
71f0092143 haskell-lhc: drop obsolete override 2016-06-12 08:37:05 +02:00
Peter Simons
8ffcd238c3 haskell-generic-builder: add support for setupHaskellDepends 2016-06-12 08:37:01 +02:00
Peter Simons
bef4cf54d5 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160611 using the following inputs:

  - Hackage: 8f99b2654a
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 504ee2b3bb
2016-06-12 08:36:53 +02:00
Peter Simons
0f7a0a0377 haskell-stack: apply small patch from Git to fix "stack repl" for GHC 8.x 2016-06-10 14:41:01 +02:00
Peter Simons
7914242b37 haskell-timezone-series: fix build with GHC 8.0.1
- Fix the incorrect sha256 hash of the patch.
 - Apply the patch only when compiling with GHC 8.0.x.
2016-06-09 21:51:09 +02:00
Peter Simons
cf042ae750 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-38-g2269395 using the following inputs:

  - Hackage: 65d1dbe8dd
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 5863aeaee3
2016-06-09 21:51:00 +02:00
Peter Simons
dc6f1cf4b3 Merge pull request #16080 from mstarzyk/timezone-series
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
obadz
fcb0023e80 haskellPackages.intero: fix tests (thanks @rvl) 2016-06-09 08:53:47 +01:00
Maciek Starzyk
0158d124bd haskellPackages.timezone-series: Download patch instead of checking it into nixpkgs 2016-06-09 00:03:41 +02:00
Maciek Starzyk
10c87e69b4 haskellPackages.timezone-series: Add support for time-1.6 - applied patch https://github.com/ygale/timezone-series/pull/1 2016-06-08 23:35:44 +02:00
obadz
d13378ffd1 haskellPackages.libmpd: remove upper bound on time 2016-06-08 19:14:27 +01:00
Peter Simons
71fc5083be git-annex: work around Joey Hess' latest brain fart
Now we're releasing incomplete Hackage tarballs on purpose:

  http://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/

You know, I'll fix this shit one last time, but on the next occasion
upstream breaks the build for no apparent reason, I'm going to abandon
this project and leave it to someone else to package, because these kind
of wacko engineering decisions cast a bad light on the soundness of
git-annex as a whole, IMHO.
2016-06-07 21:59:52 +02:00
Peter Simons
637f901f3e hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-35-g2a2d30b using the following inputs:

  - Hackage: 7a03eee484
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 7e90e5529b
2016-06-07 21:59:04 +02:00
Peter Simons
3e4cd62903 Merge pull request #16053 from obadz/ghc-mod-ghc8
haskellPackages.ghc-mod: add support for GHC8
2016-06-07 21:50:35 +02:00
obadz
99717f7a56 haskellPackages.intero: don't run tests 2016-06-07 20:36:35 +01:00
obadz
679a51b116 haskellPackages.ghc-mod: add overrides to support ghc8 2016-06-07 20:33:48 +01:00
Peter Simons
0cc1b3744e haskell-semigroups: fix build with older compilers 2016-06-06 09:33:31 +02:00
Peter Simons
a01fab64e2 haskell-binary: update overrides for latest version 2016-06-06 09:33:31 +02:00
Peter Simons
c7639f4e56 haskell-esqueleto: remove broken overrides
These overrides didn't work, because they created a mixture of different
versions of 'persistent' in the build tree. Furthermore, we cannot pin
specific versions like that in configuration-common.nix because this
breaks builds in other package sets, i.e. the LTS variants.
2016-06-06 09:33:30 +02:00
Peter Simons
513d648f40 configuration-common.nix: drop obsolete overrides 2016-06-06 09:33:30 +02:00
Peter Simons
ac3ccce0c1 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-31-gd9dda87 using the following inputs:

  - Hackage: 4c643345f3
  - LTS Haskell: 1a80e0660e
  - Stackage Nightly: 3ba38d9d9e
2016-06-06 09:33:25 +02:00
Peter Simons
d27881c014 haskell-pandoc: fix build 2016-06-03 16:12:41 +02:00
Peter Simons
d2bb38e59b configuration-ghc-8.0.x.nix: throw out commented-out code 2016-06-03 16:12:41 +02:00
Peter Simons
3fd03fb644 haskell-pandoc: add myself as a maintainer 2016-06-03 16:12:41 +02:00
Peter Simons
fba8635991 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-30-g704cd27 using the following inputs:

  - Hackage: 5f6653ffd9
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: a2b989788f
2016-06-03 16:12:41 +02:00
Peter Simons
05cdb0f621 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-28-g35f7635 using the following inputs:

  - Hackage: 21e9bc8a5e
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: 2f54d84973
2016-06-02 09:30:38 +02:00
Peter Simons
edfee2098f configuration-hackage2nix.yaml: update list of broken builds 2016-06-02 09:30:38 +02:00
Peter Simons
3fb2006846 haskell-bytes: fix LTS build 2016-06-02 09:30:38 +02:00
Michael Alan Dorman
d631679b83 cabal: fix expressions 2016-06-02 09:30:38 +02:00
Michael Alan Dorman
76db3f6e63 esqueleto: fix dependencies 2016-06-02 09:30:38 +02:00
Nikolay Amiantov
d82b15d57b haskell.cabal-install: remove override 2016-06-02 01:11:01 +03:00
Nikolay Amiantov
adfe65edf2 haskell.cabal-install: use new Cabal 2016-06-02 00:59:08 +03:00
Michael Alan Dorman
5ca5a4f773 gtk2hs-buildtools: hand-code some dependencies
A change in the way the gtk2hs libraries make use of gtk2hs-buildtools
caused them to move the dependency into a stanza where cabal2nix doesn't
pick it up---so we need to do these by hand for the moment.
2016-05-31 22:09:57 +02:00
Michael Alan Dorman
b0f64b04fc pandoc: jailbreak 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
20cf5c9750 hackage2nix: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
5c803214ee distribution-nixpkgs: Compile with older deepseq-generics 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
607e123d11 ghc-mod: Depend on cabal-helper 0.6.3.1 2016-05-31 22:09:57 +02:00
Michael Alan Dorman
be6c46c3b3 gtk2hs-buildtools: ensure appropriate Cabal version 2016-05-31 22:09:56 +02:00
Michael Alan Dorman
ffe733a52d cereal: Add dependency for 7.10.x compatibility 2016-05-31 22:09:56 +02:00