Commit Graph

1800 Commits

Author SHA1 Message Date
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
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
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00: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
Michael Alan Dorman
f226dbff00 lens-family-th: restrict version to 7.10.X compatible 2016-05-31 22:09:56 +02:00
Peter Simons
8277beff46 Fix LTS Haskell version of intervals. 2016-05-31 22:09:56 +02:00
Peter Simons
2d1e907c61 Fix LTS Haskell version of aeson. 2016-05-31 22:09:56 +02:00
Peter Simons
7e7c4ff779 Fix LTS Haskell builds of case-insensitive and semigroups. 2016-05-31 22:09:56 +02:00
Peter Simons
0331c3ee8d configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:56 +02:00
Peter Simons
4825b607f8 configuration-ghc-7.10.x.nix: add missing core library names from GHC 8.x to fix evaluation 2016-05-31 22:09:55 +02:00
Peter Simons
98c03caeac generate-hackage-package-set.nix: drop experimental code from master branch 2016-05-31 22:09:55 +02:00
Peter Simons
fc0c63d369 configuration-ghc-8.0.x.nix: update list of core packages 2016-05-31 22:09:55 +02:00
Peter Simons
4ab2a32888 configuration-ghc-8.0.x.nix: drop obsolete overrides
We're following Stackage Nightly with GHC 8.x now, so problems should be
reported there rather than fixed locally in Nixpkgs.
2016-05-31 22:09:55 +02:00
Peter Simons
2d201d41ca configuration-ghc-7.10.x.nix: update to cabal-install 1.24.x by default 2016-05-31 22:09:55 +02:00
Peter Simons
900aa31644 configuration-hackage2nix.yaml: update list of broken packages 2016-05-31 22:09:55 +02:00
Peter Simons
e343ec0822 Switch default Haskell compiler to GHC 8.0.1. 2016-05-31 22:09:54 +02:00
Peter Simons
4cea709ce0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-27-gc573068 using the following inputs:

  - Hackage: b000a1eee6
  - LTS Haskell: 042ef2187b
  - Stackage Nightly: c7757d46b6
2016-05-31 22:09:43 +02:00
Robin Gloster
2382084e3b haskellPackages.gtk{,3}: disable fortify hardening 2016-05-31 12:22:17 +00:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Peter Simons
aebfb40425 Revert "Don't use incompatible haddock-api."
This reverts commit 8fdcf556a1. I accidentally committed to the
wrong branch.
2016-05-27 19:18:31 +02:00
Michael Alan Dorman
8fdcf556a1 Don't use incompatible haddock-api. 2016-05-27 19:01:06 +02:00
Peter Simons
a2519c8da4 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-13-gf11ffc0 using the following inputs:

  - Hackage: 42718c5830
  - LTS Haskell: 4910435899
  - Stackage Nightly: f92320d2fa
2016-05-25 12:27:56 +02:00
Nikolay Amiantov
be5b596deb ghc801.linear: fix src checksum 2016-05-25 05:38:51 +03:00
Oliver Charles
b3acd8ca39 ghc801.MonadCatchIO-transformers: jailbreak 2016-05-23 16:55:41 +01:00
Joachim Fasting
6a2244e8f4
Revert "Merge pull request #15595 from laMudri/agda-stdlib"
This reverts commit ce4f6c215f, reversing
changes made to 7817d0901d.

See 68e1419cb8 (r64175487)
2016-05-23 09:07:02 +02:00
Joachim Fasting
ce4f6c215f Merge pull request #15595 from laMudri/agda-stdlib
Agda: 2.4.2.3 -> 2.5.1
2016-05-23 08:23:55 +02:00
laMudri
68e1419cb8 Agda: prebuild all of the new builtin modules 2016-05-21 17:27:19 +01:00
Peter Simons
7b75e82785 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-11-g659087e using the following inputs:

  - Hackage: a7fe14b44c
  - LTS Haskell: e1becfd6f8
  - Stackage Nightly: fac5530021
2016-05-20 14:47:06 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Dave Laing
0540a83789 llvm-general: Adds Darwin compatibilty 2016-05-13 09:41:15 +10:00
Ryan Trinkle
e3417b0f71 Merge pull request #15375 from ryantrinkle/ghc8-ghcjs-prim
ghc8 | config: ghcjs-prim: init at 0.1.0.0
2016-05-10 20:39:04 -04:00
Ryan Trinkle
2bae6b6737 ghc8 | config: ghcjs-prim: init at 0.1.0.0 2016-05-10 20:01:09 -04:00
Michael Alan Dorman
d2387e3c4a haskellPackages.hjsonschema: remove hjsonpointer override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
deba002b3c haskellPackages.hindent: remove testing override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman
d8c24dae8f haskellPackages.pipes-transduce: Remove foldl override 2016-05-10 12:28:36 +02:00
Peter Simons
d19e8ea429 configuration-ghc-7.10.x.nix: enable builds for cabal-install 1.24.x 2016-05-10 12:28:36 +02:00
Peter Simons
c23fd4fbc9 configuration-ghc-7.10.x.nix: remove obsolete override for linear 2016-05-10 12:28:36 +02:00
Peter Simons
2f9a2e6808 configuration-ghc-7.10.x.nix: switch jailbreak-cabal to Cabal 1.24.x 2016-05-10 12:28:35 +02:00
Peter Simons
85aa0ea16b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-11-g659087e using the following inputs:

  - Hackage: 62d7be84b9
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 186e5fa04d
2016-05-10 12:28:30 +02:00
Kosyrev Serge
b30ffdcc01 ghc8 | config: th-reify-many: drop the pin obviated by hackage import 2016-05-05 14:50:04 +03:00
Peter Simons
ef7e1af611 configuration-hackage2nix.yaml: update list of broken packages 2016-05-05 12:51:47 +02:00
Peter Simons
fb154cebba configuration-ghc-7.10.x.nix: trigger re-builds to mitigate broken library IDs 2016-05-05 12:51:47 +02:00
Peter Simons
f5a7f03bbe haskell-darcs: migrate overrides into cabal2nix generator 2016-05-05 12:51:47 +02:00
Peter Simons
17022a70f2 haskell-stack: migrate overrides into cabal2nix generator 2016-05-05 12:51:46 +02:00
Peter Simons
e5536b799a haskell-split: re-enable test suite
split version 0.2.3.1 ought to fix the issue we've had:

  a2e1692730 (commitcomment-17331531)
2016-05-05 12:51:13 +02:00
Peter Simons
0915df8233 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-9-g3afe33e using the following inputs:

  - Hackage: f392208d72
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 7135a992a4
2016-05-05 12:51:08 +02:00
Kosyrev Serge
a6a23d3a55 ghc8 | config: freer: jailbreak 2016-05-05 13:15:24 +03:00
Kosyrev Serge
9c979732b8 ghc8 | config: shelly: jailbreak 2016-05-05 13:15:24 +03:00
Kosyrev Serge
0438192122 ghc8 | config: turtle: jailbreak 2016-05-04 13:31:28 +03:00
Kosyrev Serge
2e72002012 ghc8 | config: trifecta: jailbreak 2016-05-04 13:31:28 +03:00
Kosyrev Serge
c9553d7b6d ghc8 | config: th-reify-many -> 0.1.4.1 2016-05-04 13:31:28 +03:00
Kosyrev Serge
81f12377e4 ghc8 | config: th-desugar -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
c03af86d39 ghc8 | config: stm-conduit -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
49a9213760 ghc8 | config: singletons -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
6ce39b317e ghc8 | config: servant*: jailbreak, disable tests 2016-05-04 13:28:26 +03:00
Kosyrev Serge
d27186a9ca ghc8 | config: sdl2: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
5e08a820dc ghc8 | config: reducers: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
1fa1be62b6 ghc8 | config: pointed -> pointed_5 2016-05-04 13:28:26 +03:00
Kosyrev Serge
4015f60d1d ghc8 | config: parsers: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
2018121298 ghc8 | config: monads-tf: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
62db240617 ghc8 | config: lucid-svg: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
944b28f7c5 ghc8 | config: linear -> git, unreleased fixes 2016-05-04 13:28:26 +03:00
Kosyrev Serge
38f9a1abdf ghc8 | config: force-layout: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
82b4224835 ghc8 | config: foldl: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
4d2b957b8b ghc8 | config: diagrams: jailbreak (doesn't make them build, issue filed) 2016-05-04 13:28:26 +03:00
Kosyrev Serge
6d18c05551 ghc8 | config: authenticate-oauth: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
1c88b276c3 ghc8 | config: active: jailbreak 2016-05-04 13:28:26 +03:00
Peter Simons
66ff540ee6 haskell-lens: update version used by GHC 8.0.x 2016-05-03 10:22:22 +02:00
Peter Simons
967901f195 haskell-binary: update version used for GHC releases prior to 7.8.x 2016-05-03 10:22:22 +02:00
Peter Simons
ddb8c06c2d haskell-yi: mark as broken 2016-05-03 10:22:22 +02:00
Peter Simons
ec49307518 haskell-hakyll: fix test suite by providing "rev" in test environment 2016-05-03 10:22:22 +02:00
Peter Simons
372782d1f0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-5-gcb85ef4 using the following inputs:

  - Hackage: 24af5f79f4
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 2b431f312c
2016-05-03 10:22:15 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Peter Simons
a2e1692730 haskell-split: disable test suite to avoid transient build failures
We have frequent build failures of "split" because the QuickCheck testsuite
cannot generate enough conclusive test cases, i.e. in

  https://hydra.nixos.org/build/34857780/nixlog/1/raw

Cc: @byorgey
2016-04-28 12:02:08 +02:00
Peter Simons
cf4a69e2ec haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages 2016-04-24 20:13:27 +02:00
Peter Simons
6700ed5f48 configuration-hackage2nix.yaml: update list of broken builds 2016-04-24 19:56:01 +02:00
Peter Simons
345ea398ad hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-3-gd7a4f81 using the following inputs:

  - Hackage: e8b3512fba
  - LTS Haskell: 573e5576f2
  - Stackage Nightly: 70928b4eec
2016-04-24 19:55:54 +02:00
Robin Gloster
0087d16120 haskellPackages: clean up unnecessary overrides 2016-04-20 17:08:26 +00:00
Peter Simons
4537e2be35 haskell-semigroups: fix build with pre 7.6.x versions of GHC 2016-04-20 13:46:10 +02:00
Peter Simons
c2545acecd haskell-configuration-ghc-8.0.x: doctest 0.11.x is now the default 2016-04-20 13:46:10 +02:00
Peter Simons
2c1f152c60 haskell-reflection: fix build with ghc versions prior to 7.6.x 2016-04-20 13:46:10 +02:00
Peter Simons
9a45c0cd9d hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-2-gc07fcb5 using the following inputs:

  - Hackage: 3346eec54c
  - LTS Haskell: 573e5576f2
  - Stackage Nightly: 70928b4eec
2016-04-20 13:46:10 +02:00
Robin Gloster
9a8a9c43b4 haskellPackages.pango: turn off fortify hardening 2016-04-19 12:21:06 +00:00
Robin Gloster
33ef14fb62 haskellPackages: clean up unnecessary overrides 2016-04-19 12:15:23 +00:00
Robin Gloster
fd77c5c5a0 haskellPackages.gio: turn off fortify hardening 2016-04-19 10:56:55 +00:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Charles Strahan
0be225a8dc ghcjs: update sources to latest 2016-04-16 01:55:56 -04:00
Peter Simons
232d843c8a haskell-src-exts: test suite fails when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
70f396fa48 haskell-generic-deriving: build fails Haddock phase with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
2be16386b5 haskell-lens: use latest version when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
d98a8f88d0 haskell-kan-extensions: use version 5.x when building with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
3babe992f9 haskell-semigroupoids: doctest suite won't build with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Peter Simons
15d7b7da10 haskell-bifunctors: use latest version 5.3 when compiling with GHC 8.0.x 2016-04-14 09:17:55 +02:00
Anthony Cowley
3f845da22a haskell-modules: darwin configuration-common
- Reconfigure OpenGL/CL related packages to propagate the necessary
  framework dependencies.

- Disable tests on all versions of c2hs so package sets such as LTS
  releases work.

Closes https://github.com/NixOS/nixpkgs/pull/14609.
2016-04-14 09:17:55 +02:00
Peter Simons
8a12018821 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-1-ge7059e3 using the following inputs:

  - Hackage: 4d5f229e9e
  - LTS Haskell: 924977cc28
  - Stackage Nightly: 0002f21766
2016-04-14 09:17:55 +02:00
Peter Simons
c7a4de7717 configuration-hackage2nix.yaml: update list of broken builds 2016-04-14 09:17:55 +02:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
obadz
7f2163fc97 haskellPackages.haste-compiler: fix so that it now builds and runs
Required adding:
haskellPackages.haste-Cabal, and
haskellPackages.haste-cabal-install
2016-04-11 15:24:56 +01:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Peter Simons
c0a5872c2c configuration-common.nix: fix syntax error (and cosmetic) 2016-04-07 07:58:32 +02:00
Peter Simons
07f26f3df1 configuration-ghc-8.0.x.nix: clean up overrides 2016-04-07 07:53:57 +02:00
Peter Simons
7694bb18c8 haskell-comonad: fix build with ghc-8.0.x 2016-04-07 07:53:57 +02:00
Peter Simons
7f976c7729 haskell-fail: fix build with ghc-8.0.x 2016-04-07 07:53:57 +02:00
Michael Alan Dorman
bec10ed1b8 haskell-present: remove obsolete patch 2016-04-07 07:53:57 +02:00
Michael Alan Dorman
2daf67bf87 haskell-pipes-transduce: fix build 2016-04-07 07:53:57 +02:00
Peter Simons
e6e5d984ab configuration-hackage2nix.yaml: update list of broken packages 2016-04-07 07:53:04 +02:00
Peter Simons
d8f99973df hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406 using the following inputs:

  - Hackage: 2266fbc644
  - LTS Haskell: 7a74143acf
  - Stackage Nightly: 5e435cbedb
2016-04-07 07:53:04 +02:00
obadz
8c2e8ec13c haskellPackages.dnssd: override the dns_sd dependency to point to avahi built with the right flags.
Fixes #14502
2016-04-06 22:21:56 +01:00
Robin Gloster
58a73d3f4b haskellPackages.lvmrun: disable format hardening 2016-04-06 08:26:01 +00:00
Robin Gloster
057a899791 haskellPackages.glib: disable fortify hardening 2016-04-06 08:18:14 +00:00
Robin Gloster
bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Peter Simons
0d39f485f0 haskell-hruby: remove obsolete override
Closes https://github.com/NixOS/nixpkgs/pull/13920.
2016-04-04 15:20:52 +02:00
Peter Simons
f5c95fc1b2 configuration-hackage2nix.yaml: disable broken builds 2016-04-04 15:20:52 +02:00
Peter Simons
de613e08dc haskell-doctest: use version 0.11.0 when compiling with GHC 8.0.x
Fixes https://github.com/sol/doctest/issues/125.
2016-04-04 15:20:52 +02:00
Peter Simons
574f63b956 haskell-hspec: fix infinite recursion in version 2.2.2 2016-04-04 15:20:37 +02:00
Peter Simons
0c0aa0413a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-5-g3e915af using the following inputs:

  - Hackage: 57b937334d
  - LTS Haskell: 7a74143acf
  - Stackage Nightly: 658d91e0e0
2016-04-04 15:20:26 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Nikolay Amiantov
cef2db7e76 haskellPackages.mueval: fix build 2016-03-29 02:23:06 +03:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Peter Simons
ce2c13675d configuration-hackage2nix.yaml: update list of broken packages 2016-03-26 11:20:07 +01:00
Peter Simons
0f5db56b0b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11-dirty using the following inputs:

  - Nixpkgs: 840709b4a3
  - Hackage: ab666959f0
  - LTS Haskell: 6c45757bda
  - Stackage Nightly: d8a2cae779
2016-03-26 11:20:07 +01:00
Peter Simons
7b5728c0d4 configuration-hackage2nix.yaml: update list of broken packages 2016-03-24 11:52:35 +01:00
Nikolay Amiantov
e74a8d08cc haskellPackages.Agda: add myself as a maintainer 2016-03-24 11:52:35 +01:00
Peter Simons
408f4aa654 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: bba4f2bbe3
  - Hackage: ab666959f0
  - LTS Haskell: 6c45757bda
  - Stackage Nightly: d8a2cae779
2016-03-24 11:52:19 +01:00
Peter Simons
9a0e630874 configuration-hackage2nix.yaml: update list of broken packages 2016-03-23 18:25:22 +01:00
Peter Simons
1e5d6e584d hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: 9da84a6af0
  - Hackage: 1e26fd1876
  - LTS Haskell: 6c45757bda
  - Stackage Nightly: d8a2cae779
2016-03-23 18:25:14 +01:00
Peter Simons
9405b1f497 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: cc6b62965c
  - Hackage: 8103415143
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: 26f7d11e37
2016-03-21 13:18:57 +01:00
Peter Simons
ca34db0409 configuration-hackage2nix.yaml: update list of broken packages 2016-03-21 13:18:56 +01:00
Peter Simons
bd2bc77f8c haskell-transformers-compat: fix build with GHC 8.0.x 2016-03-21 13:17:54 +01:00
Nikolay Amiantov
b1179bdbcf haskellPackages.Agda: use older cpphs
Package requires cpphs < 0.20.0.
2016-03-18 23:32:26 +03:00
Peter Simons
daa03b0229 configuration-hackage2nix.yaml: update list of broken Haskell builds
@gridaphobe, this affects your packages 'liquid-fixpoint', 'liquidhaskell', and
'target'.
2016-03-18 08:16:05 +01:00
Peter Simons
3689c34b31 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: 3b6870536f
  - Hackage: f6dcb81d2a
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: fbf2e48e58
2016-03-18 08:16:05 +01:00
Peter Simons
067f64469f configuration-common.nix: drop obsolete override 2016-03-18 07:52:37 +01:00
Peter Simons
57af6102f8 configuration-hackage2nix.yaml: enable builds for jsaddle, Agda, and Leksah 2016-03-18 07:52:37 +01:00
Peter Simons
fb1f18b98c haskell-jsaddle: fix build by disabling the test suite 2016-03-18 07:52:36 +01:00
Peter Simons
73d1d84e54 haskell-Agda: add necessary overrides for older versions to fix the LTS builds 2016-03-18 07:52:36 +01:00
obadz
a0f0a7191f leksah: add the appropriate deps to enable running 2016-03-18 07:52:36 +01:00
Peter Simons
fe5d98d4c2 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-3-g8057d11 using the following inputs:

  - Nixpkgs: 8b2661d933
  - Hackage: c6f8f98e57
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: fbf2e48e58
2016-03-18 07:52:31 +01:00
Peter Simons
b8635a2f45 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308-2-g1fd2040 using the following inputs:

  - Nixpkgs: 5963f785c9
  - Hackage: 918817d060
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: fbf2e48e58

Also update list of broken packages in configuration-hackage2nix.yaml.
2016-03-17 16:07:23 +01:00
Peter Simons
76dead2099 Merge pull request #13954 from grwlf/conduit-fix
haskell-modules: fix conduit runtime dependency
2016-03-16 14:47:26 +01:00
Sergey Mironov
b14a6f1f98 haskell-modules: fix conduit runtime dependency 2016-03-16 10:38:12 +03:00
Peter Simons
9f3ca09f94 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160308 using the following inputs:

  - Nixpkgs: 47c2c01ea7
  - Hackage: 435f8156b7
  - LTS Haskell: 6bcb171af7
  - Stackage Nightly: a161c91389

Also, update the list of broken builds in configuration-hackage2nix.yaml.
2016-03-15 13:16:12 +01:00
Ryan Trinkle
440b301d0a Merge pull request #13931 from mightybyte/unix-compat-needs-libiconv
ghcjs: on Darwin, build unix-compat with libiconv
2016-03-15 01:11:02 -04:00
Doug Beardsley
a0ecf9cee2 ghcjs: on Darwin, build unix-compat with libiconv 2016-03-15 12:07:59 +08:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Christoph Hrdinka
b10288eaa5 haskell-hs-blake2: fix dependency on libb2
`hs-blake2` currently wrongly depends on `pkgs.b2` which is an application
for backblazes storage service. This patch overrides it to link against
its correct native library `pkgs.libb2`.
2016-03-12 18:57:42 +01:00
Peter Simons
22f31ea6a0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-13-g1932303 using the following inputs:

  - Nixpkgs: 048b08e2df
  - Hackage: 9380d724dd
  - LTS Haskell: d2ad5fe903
  - Stackage Nightly: 04ed93d830
2016-03-08 10:50:13 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Peter Simons
48a9555bc0 Merge pull request #13695 from forked-upstream-packages-for-ghcjs/more-bootpkgs
ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's…
2016-03-07 14:15:42 +01:00
John Ericson
e4abe06b8a ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's pgks 2016-03-06 12:39:12 -08:00
Mathieu Boespflug
b1b85ddb81 buildStackPackage: Fix path to generic-stack-builder.nix.
Before:

```
error: getting status of
‘/home/user/nixpkgs/pkgs/development/development/haskell-modules/generic-stack-builder.nix’:
No such file or directory
```
2016-03-06 10:35:25 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Franz Pletz
d4ece75fd6 haskellPackages.epanet-haskell: Turn format hardening off 2016-03-05 16:53:38 +01:00
Nikolay Amiantov
0865d19ccd haskellPackages.Agda: use older unordered-containers to fix build
Fixes #13594.
2016-03-05 17:58:48 +03:00
Peter Simons
798a14d22c haskell-generic-stack-builder: strip trailing whitespace 2016-03-04 22:18:08 +01:00
Peter Simons
86d0a9c420 haskell.lib: fix use of callPackage 2016-03-04 22:17:53 +01:00
Mathieu Boespflug
7fedb7c992 Move buildStackProject to haskell.lib. 2016-03-04 21:24:42 +01:00
Mathieu Boespflug
ff9cba94f6 haskell: Rename file where buildStackProject is defined. 2016-03-04 21:18:14 +01:00
Peter Simons
def18c2408 hackage-packages.nix: update Haskell package set
This commit enables all haskellPackages builds so that we can discover builds
that have been fixed recently.

This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: a67868f060
  - Hackage: 1c84c94e14
  - LTS Haskell: d2ad5fe903
  - Stackage Nightly: c1be20cfc0
2016-03-04 10:54:48 +01:00
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Jude Taylor
4686bc54a6 add socket.io to interactive ghcjs environments 2016-03-01 16:06:29 -08:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Vladimír Čunát
0294fc5bbd haskellPackages: fix evaluation
It seems `self` was wanted instead of `pkgs` by the author of 3844206.
2016-02-29 10:54:25 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Michael Alan Dorman
3844206366 Make sure we use the older version of hjsonpointer 2016-02-28 11:34:59 +01:00
Michael Alan Dorman
08a02a84de Make sure an older version of hjsonpointer is included 2016-02-28 11:34:59 +01:00
Peter Simons
4ee5a8865d mwc-random: drop obsolete overrides 2016-02-28 11:34:59 +01:00
Peter Simons
6dd798f67f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: 82be4306ae
  - Hackage: 300be01a10
  - LTS Haskell: 45f9a3dc16
  - Stackage Nightly: 18441cd11a
2016-02-28 11:34:59 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
4ecb1ce679 Merge pull request #11274 from robgssp/ldap
ldap-client: don't break on test failures
2016-02-26 23:13:27 +00:00
Jude Taylor
bd9f128cc2 add darwin.libiconv to ghcjs packages 2016-02-24 13:33:16 -08:00
Peter Simons
e713765b53 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 096bee7aef
  - Hackage: 735e006a18
  - LTS Haskell: bbcada892f
  - Stackage Nightly: b41dbc58b2
2016-02-22 08:26:38 +01:00
Robin Gloster
bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
John Ericson
f13eede7e5 haskell: Tiny refactor in generic-builder. No hashes/interfaces changed. 2016-02-21 10:16:13 -08:00
John Ericson
51b66ed4d9 haskell: Add notion of cross compiler and define nativeGhc with it
Tested to not change hashes
2016-02-21 10:16:13 -08:00
Robin Gloster
23b4e6e19d haskellPackages: remove unnecessary hardening handling 2016-02-21 11:41:04 +00:00
Robin Gloster
1eed9435d5 haskellPackages.glib: simplify 2016-02-21 11:40:16 +00:00
Robin Gloster
0102e69707 haskellPackages.c2hs: fix evaluation 2016-02-21 11:39:41 +00:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Charles Strahan
516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00
Charles Strahan
e6e9970891 ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
2016-02-18 15:00:34 -05:00
Charles Strahan
97d9071b95 ghcjs: use native ghc to build Setup.hs 2016-02-18 03:15:59 -05:00
Charles Strahan
bbce88302a ghcjs: fix building with cabal-install-1.22.8.0 2016-02-18 03:15:59 -05:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Peter Simons
2029027d88 haskell-binary: update older compilers to the latest version 2016-02-15 19:06:04 +01:00
Peter Simons
3906a32bda haskell-QuickCheck: drop obsolete override for ghc-8.0.x 2016-02-15 19:06:03 +01:00