Commit Graph

1594 Commits

Author SHA1 Message Date
Ryan Trinkle
0905aea14e Merge pull request #17276 from ryantrinkle/ghcjs-8.0-support
ghcjs: refactor stage2 handling
2016-07-27 12:26:45 -04:00
Ryan Trinkle
c564997ba0 ghcjs: refactor stage2 handling
Previously, the stage2 information was stored in haskell-modules, and imported directly from there.  However, the correct stage2 information is determined by the version of ghcjs-boot repository.  This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs.
2016-07-26 16:58:56 -04:00
Peter Simons
66ca9b9146 git-annex: update hash for new version 2016-07-26 10:37:55 +02:00
Peter Simons
24bb4333cd hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:

  - Hackage: de00016925
  - LTS Haskell: d085132b77
  - Stackage Nightly: bf146896f3
2016-07-26 10:37:55 +02:00
Gabriel Ebner
66041a4475 configuration-hackage2nix.yaml: re-enable ghc-mod 2016-07-23 11:41:55 +02:00
Benno Fünfstück
2e48d838d0 haskell/Glob: fix build 2016-07-23 01:27:40 +02:00
Peter Simons
f162a1349a haskell-bifunctors: fix build with GHC 7.6.x 2016-07-21 17:57:28 +02:00
Peter Simons
60d7f39ec0 configuration-hackage2nix.yaml: update list of broken builds
These packages are broken in "haskellPackages" and have been for quite a while:

 - disable goatee, goatee-gtk, and qtah-* (ping @khumba)
 - disable persistent-mongoDB (ping @psibi)
2016-07-21 16:40:03 +02:00
Peter Simons
3d5556b2cc haskell-ghcjs-prim: mark broken 2016-07-21 16:40:02 +02:00
Peter Simons
1545d241b6 haskell-semigroups: fix build with old compilers 2016-07-21 16:40:02 +02:00
Peter Simons
6f26617737 haskell-bifunctors: fix build with old compilers 2016-07-21 16:40:02 +02:00
Peter Simons
2720ee84ad hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-12-gb304101 using the following inputs:

  - Hackage: b135e7a1de
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: bf146896f3
2016-07-21 16:39:56 +02:00
Peter Simons
641fc0e683 haskell: remove all but the latest LTS package sets (version 6.7)
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.

More details are at:

  http://permalink.gmane.org/gmane.linux.distributions.nixos/20505

Closes https://github.com/NixOS/nixpkgs/issues/14897.

Also relevant:

 - https://github.com/NixOS/nixpkgs/issues/16130
 - https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Peter Simons
beab1adb6e configuration-hackage2nix.yaml: update list of broken builds 2016-07-21 13:52:48 +02:00
Peter Simons
ddfc4ba977 haskell-Glob: fix LTS build 2016-07-20 12:50:06 +02:00
Peter Simons
c2656d6809 Merge pull request #15423 from dalaing/llvm-general-darwin
llvm-general: Adds Darwin compatibilty
2016-07-19 22:44:28 +02:00
Peter Simons
c0b5213aad haskell-hfsevents: remove obsolete override
cabal2nix generates correct build instructions now.
Fixes https://github.com/NixOS/nixpkgs/pull/17046.
2016-07-19 14:20:53 +02:00
Peter Simons
450fa8d9a0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-11-gcec8f95 using the following inputs:

  - Hackage: 19ec8f3a6d
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: bf146896f3
2016-07-19 14:20:40 +02:00
Peter Simons
3bfe30a042 haskell: update our Hackage database to the latest version 2016-07-16 13:34:06 +02:00
Peter Simons
1b0e82d6ff Merge pull request #16974 from khumba/hoppy+qtah-maintainer
hoppy, qtah: add myself as maintainer
2016-07-15 20:27:22 +02:00
Peter Simons
9fc0347c93 Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin
inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00
Bryan Gardiner
5e685121e4
hoppy, qtah: add myself as maintainer 2016-07-14 23:07:53 -07:00
Peter Simons
6af0f57f91 haskell-binary: update to latest version 2016-07-14 22:13:48 +02:00
Peter Simons
d477991c48 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-4-gb156b94 using the following inputs:

  - Hackage: 5bb0a1b20f
  - LTS Haskell: a5a99cf176
  - Stackage Nightly: 3664752ea8
2016-07-14 22:13:09 +02:00
Peter Simons
8436458865 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:

  - Hackage: d6d8323227
  - LTS Haskell: 52eeaf4edc
  - Stackage Nightly: 64dfa6aa2e
2016-07-07 17:18:35 +02:00
Peter Simons
6a6b8fa36f cabal2nix: update to version 2.0 from Hackage
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.

Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(

If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Peter Simons
a828d79a8a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-2-g0bc3d6d using the following inputs:

  - Hackage: fcabbcc70b
  - LTS Haskell: 52eeaf4edc
  - Stackage Nightly: ff50bc1a46
2016-07-05 23:45:41 +02:00
Peter Simons
cbcb23dcf6 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 8b1e5923b5
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: 39da79aced
2016-07-02 20:59:02 +02:00
Peter Simons
14a42dba66 haskell-semigroups: add missing overrides for old version of the package 2016-07-01 12:01:04 +02:00
Peter Simons
ec2e568b35 configuration-hackage2nix.yaml: disable failing builds 2016-07-01 12:01:04 +02:00
Peter Simons
a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Peter Simons
77f6750ef0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 53b696d106
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: affdd756e9
2016-07-01 12:00:58 +02:00
Peter Simons
e2c1926758 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-11-g57dddc7 using the following inputs:

  - Hackage: 6d525b6502
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: b1d16f45de
2016-06-29 11:54:27 +02:00
Peter Simons
99c6c9d42f Merge pull request #16370 from rasendubi/haskell-hoogle
haskell-hoogle: adapt to GHC docs split
2016-06-20 23:52:47 +02:00
Alexey Shmalko
87aa864ff9
haskell-hoogle: adapt to GHC docs split
The docs were split at #16167 and broke google support. @peti fixed
build, however hoogle still didn't see packages shipped with GHC. This
patch fixes location of the libraries shipped with GHC.
2016-06-20 22:52:20 +03:00
Peter Simons
06d3636596 git-annex: update sha256 hash 2016-06-20 17:01:36 +02:00
Peter Simons
1178ccf085 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-7-g3089457 using the following inputs:

  - Hackage: 08c95c9ddf
  - LTS Haskell: 2a2cddb443
  - Stackage Nightly: 5f88469291
2016-06-20 17:01:36 +02:00
Peter Simons
06489a1850 haskell-hoogle: remedy some fallout from https://github.com/NixOS/nixpkgs/pull/16167
ghcWithHoogle builds with this patch applied, but it's probably still broken in
the sense that links might point nowhere or that the generated databases and/or
documentation might be incomplete.
2016-06-20 14:50:52 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Bas van Dijk
d0c7056b92 inline-c-cpp: fix build on darwin 2016-06-16 01:03:22 +02:00
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