Commit Graph

1376 Commits

Author SHA1 Message Date
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
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
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
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
Jude Taylor
4686bc54a6 add socket.io to interactive ghcjs environments 2016-03-01 16:06:29 -08: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
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
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
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
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
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
Peter Simons
8d0219c6ef haskell-transformers-compat: drop obsolete override for ghc-8.0.x 2016-02-15 19:05:39 +01:00
Peter Simons
7c7b08add4 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 94492ca848
  - Hackage: b3a9ab4a60
  - LTS Haskell: e7c3629999
  - Stackage Nightly: b98e7e2d4f
2016-02-15 19:05:02 +01:00
Peter Simons
328d9967d3 haskell-pandoc: drop obsolete override 2016-02-12 21:14:03 +01:00
Peter Simons
e771dc4b06 haskell-hans: drop obsolete patch 2016-02-12 21:14:03 +01:00
Peter Simons
d6f38f5fd8 xmonad-contrib: drop obsolete overrides 2016-02-12 21:14:03 +01:00
Peter Simons
23b747e38a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: 45176e62ca
  - Hackage: 4eb7681703
  - LTS Haskell: e7c3629999
  - Stackage Nightly: a84b3a147a
2016-02-09 12:00:07 +01:00
Peter Simons
e389794857 haskell-binary: update use of 0.8.0.1 to 0.8.2.0 2016-02-03 18:51:53 +01:00
Peter Simons
9e06f6880c cabal-install: build with native Cabal library when compiling with GHC 8.0.x
Fixes https://github.com/NixOS/nixpkgs/issues/12726.
2016-02-03 18:51:53 +01:00
Peter Simons
0b2fded69c hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: e9a140b725
  - Hackage: 346d9f8466
  - LTS Haskell: 6661045692
  - Stackage Nightly: 0ad9eda835
2016-02-03 18:51:53 +01:00
Erik Rybakken
3333a9edab haskell-miniball: fix package by adding the missing pkgs.miniball dependency 2016-02-03 18:28:49 +01:00
Charles Strahan
fdd54a9434 ghcjs-ffiqq: init at rev da31b1858 (Oct 12, 2015) 2016-02-01 02:13:45 -05:00
Charles Strahan
142b417284 ghcWithHoogle: fix haddocks for GHCJS builtin libs 2016-02-01 00:10:45 -05:00
Charles Strahan
1a2d7c679a ghcWithHoogle: add support for ghcjs 2016-01-31 23:00:43 -05:00
Charles Strahan
c01eb06954 ghcjs: build with GHC 7.10.3 2016-01-31 20:44:49 -05:00
Michael Alan Dorman
a9b0bfe3bb ghc-imported-from: builds again 2016-01-28 16:47:22 +01:00
Peter Simons
81c8babb38 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 34e1e2890f
  - Hackage: 152c587fd1
  - LTS Haskell: 9b9c0dc0e3
  - Stackage Nightly: 486fdffc71
2016-01-28 16:45:46 +01:00