Commit Graph
2284 Commits
Author SHA1 Message Date
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: https://github.com/NixOS/nixpkgs/commit/a67868f0602d13d13e2f21ffb43dac37910bb65e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/1c84c94e147ab380bb0e954d13fd248238eb72b3
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d2ad5fe9030deeacf1ed9c9de9045c65e597ca76
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c1be20cfc01ee9f7431bc71f4377896ab2f352d2
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: https://github.com/NixOS/nixpkgs/commit/82be4306aef14f3d97c4bf6bebcb875bf046b12e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/300be01a1038afe0c7b12f3737b8c06f2103e855
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/45f9a3dc1607fcbd0be11ab4c185c0cb9baf9d99
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/18441cd11a18cd8f47f2e1efe89e02049b9e292f
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: https://github.com/NixOS/nixpkgs/commit/096bee7aef8258ca1d62544c2ddd9f82008af9e8
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/735e006a185b5a0b998e33eb7deab87cd71ef8df
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/bbcada892fe77b0f4cdb3efca602c85a872e888b
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b41dbc58b210ff13eccf71b04d9ed7055aa07df3
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
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: https://github.com/NixOS/nixpkgs/commit/94492ca8484ac1cc1962d42050ff6cdc145665f6
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b3a9ab4a6048a52dbabe68389d8edc10062ee925
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b98e7e2d4fc1c47179a362d16d98290990eb8c28
2016-02-15 19:05:02 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +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
Robin Gloster 5969a59052 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-09 16:28:44 +00:00
Robin Gloster 20d568aed5 haskellPackages.glib: turn off fortify hardening 2016-02-09 14:41:48 +00:00
Robin Gloster f8963e2ea7 haskell builder: allow disabling fortify hardening 2016-02-09 14:41:11 +00: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: https://github.com/NixOS/nixpkgs/commit/45176e62cac5a125e2766103c6d584ba812da687
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/4eb768170375f9a545c38db20ce635b7291ece78
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a84b3a147a5c0bbaa634f2623ad6e679f33751a1
2016-02-09 12:00:07 +01:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Thomas Tuegel c8577b9f30 haskell-double-conversion: add libstdc++ to inputs 2016-02-05 14:26:01 -06: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: https://github.com/NixOS/nixpkgs/commit/e9a140b725c33c2de64026044544b2f1d479cd7f
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/346d9f8466727dd495535d31f12b385f19b52cc2
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/666104569234eea5aee0233b4c94450f1b8c303a
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/0ad9eda835c17a297978b940a95a92d81ecb2b85
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