1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:48:10 +00:00
Commit graph

2568 commits

Author SHA1 Message Date
Shea Levy 1a1ad1a17d Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs"
This reverts commit c3af1210b4, reversing
changes made to 49f175cd0c.
2017-09-29 09:11:26 -04:00
Shea Levy c3af1210b4 Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs 2017-09-28 18:10:50 -04:00
John Ericson f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Mikael Brockman 0b8b72081b Merge branch 'master' into dapphub-hevm 2017-09-28 13:27:19 +03:00
Domen Kožar 61fbdb47a6
haskellPackages.foundation: disable tests on darwin 2017-09-26 19:00:27 +02:00
Peter Simons 042ca21c81 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.6-7-g3c87c13 from Hackage revision
8158338ed8.
2017-09-25 10:43:44 +02:00
Peter Simons 92576b77e9 haskell: provide a meta package "unbuildable" to fix evaluation of Win32 2017-09-25 10:43:42 +02:00
Peter Simons 69c4f038de haskell-accelerate-blas: don't distribute via Hydra
Depends on CUDA, which has a non-free license.
2017-09-25 10:43:42 +02:00
Peter Simons 1d73878e88 hackage2nix: update list of broken builds 2017-09-25 10:43:42 +02:00
Peter Simons 2a1c656c54 cabal2nix: update to version 2.6
- Add support for the 01-index tarball of cabal-install 2.x.
 - Add shell completions for fish and zsh.
2017-09-24 20:52:05 +02:00
Peter Simons 88bef1c019 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.6 from Hackage revision
a0cac3c9f2.
2017-09-24 20:52:00 +02:00
Mikael Brockman 74edd2c5db
hsevm: project was renamed to hevm
This also upgrades the hsevm package from v0.6.4 to v0.8.5.

The project `dapp` which depends on hsevm was also updated to use the
new name, so I have also upgraded that package from version v0.5.3 to
v0.5.7.

I also added a `dontCheck` to a Hackage dependency because its test
suite depends on Git and runs a bunch of Git repository manipulations.
2017-09-22 08:06:05 +03:00
John Ericson 139b4cd0e3 haskell generic-builder: Fix pkg-config dependency
It should be a nativeBuidInput
2017-09-21 15:49:55 -04:00
Peter Simons a68eea3cb0 Merge pull request #29089 from LnL7/vaultenv-0.5.0
vaultenv: init at 0.5.0
2017-09-21 21:13:53 +02:00
Peter Simons 0dddef468d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-9-g8a6ffec-dirty from Hackage revision
9e7aa353cc.
2017-09-20 16:18:36 +02:00
Peter Simons 2439a83072 haskell.lib: strip trailing whitespace 2017-09-19 15:55:50 +02:00
Peter Simons a8b69958cf haskell.lib: add doBenchmark helper function 2017-09-19 15:55:16 +02:00
Peter Simons eab41cb7be hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-8-ga66a429 from Hackage revision
511efbfbe7.
2017-09-19 15:48:00 +02:00
Peter Simons 8231045fb4 LTS Haskell 9.5 2017-09-19 15:47:58 +02:00
Peter Simons 33e34aa95b haskell-generic-builder: rename withBenchmarkDepends argument to doBenchmark
This partially undoes the change from 8788bfe762.
The 'doBenchmark' name is more consistent with the naming scheme used for
other phases, like 'doCheck', 'doHaddock', etc.
2017-09-19 15:42:51 +02:00
Patrick Callahan 8119e48c2d haskellPackages.tldr: fix build and add to top-level packages 2017-09-15 09:51:37 -07:00
Patrick Callahan 12aa8b2f2b shell-conduit: disable tests on Darwin to fix build 2017-09-15 09:51:36 -07:00
Peter Simons 3510197dcc Revert "haskell infra, ghc: Slight cleanup" 2017-09-15 18:45:15 +02:00
John Ericson 2295533f43 Merge pull request #29424 from obsidiansystems/slight-haskell-cleanup
haskell infra, ghc: Slight cleanup
2017-09-15 12:12:47 -04:00
John Ericson e92cda161a haskell infra: Fix cross as much as possible without changing hashes 2017-09-15 11:37:39 -04:00
Peter Simons 4944610903 haskell-cryptol: override happy to older version to fix the build 2017-09-14 15:25:46 +02:00
Peter Simons 62079ef824 haskell-pandoc: new versions compile with Cabal 2.x out of the box 2017-09-14 15:25:46 +02:00
Peter Simons 88630c94ae haskell: fix evaluation error in configuration-ghc-8.2.x.nix 2017-09-14 15:25:46 +02:00
Peter Simons c59c53bf39 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
095b0a6eb2.
2017-09-14 15:25:41 +02:00
Peter Simons 9aa82d7014 haskell-pandoc: bump version to pandoc-1.19.2.4 to fix the build with GHC 8.2.x 2017-09-14 15:25:38 +02:00
Peter Simons f59bcb64e8 LTS Haskell 9.4 2017-09-14 15:25:38 +02:00
Will Fancher dbd5009376 Merge branch 'master' into improved-make-overridable 2017-09-12 17:30:35 -04:00
Peter Simons a037526789 Merge pull request #29177 from LumiGuide/fix-attoparsec-data
haskell: fix build of attoparsec-data
2017-09-10 20:48:29 +02:00
Peter Simons ce481d2f18 Merge pull request #29182 from LumiGuide/fix-ghc-proof
haskellPackages.ghc-proofs: Disable hydra builds for ghc<8.2
2017-09-10 20:48:01 +02:00
Falco Peijnenburg 5d57aaebd5 haskellPackages.wai-secure-cookies: Fixed build 2017-09-10 20:47:01 +02:00
Peter Simons dc9c2c7bac Merge pull request #29188 from LumiGuide/fix-hw-xml
haskell: fix build of hw-xml
2017-09-10 20:42:41 +02:00
Peter Simons d96ad6b635 Merge pull request #29186 from LumiGuide/fix-hol
haskellPackages.hol: Fixed build
2017-09-10 20:42:02 +02:00
Peter Simons 2b7fac2eff Merge pull request #29183 from LumiGuide/fix-grakn
haskell: fix grakn-0.2.0
2017-09-10 20:41:08 +02:00
Peter Simons 7cd5ff6376 Merge pull request #29190 from LumiGuide/fix-LambdaHack
haskell: fix build of LambdaHack
2017-09-10 20:40:28 +02:00
Bas van Dijk b4ea459eab haskell: introduce failOnAllWarnings
Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the
`-Wall` and `-Werror` GHC options to turn all warnings into build failures.
2017-09-10 13:09:52 +02:00
Bas van Dijk 09bdd6260f haskell: fix build of LambdaHack 2017-09-10 12:24:24 +02:00
Bas van Dijk a759faf60b haskell: fix build of hw-xml 2017-09-10 11:56:48 +02:00
Falco Peijnenburg 78ddef2cae haskellPackages.hol: Fixed build 2017-09-10 11:45:24 +02:00
Bas van Dijk 40b1516d39 haskell: fix grakn-0.2.0 2017-09-10 11:17:24 +02:00
Falco Peijnenburg 7d714726a7 haskellPackages.ghc-proofs: Disable hydra builds for ghc<8.2 2017-09-10 10:45:33 +02:00
Bas van Dijk c910bbb134 haskell: fix build of attoparsec-data
Fixes: https://hydra.nixos.org/build/60421889
2017-09-10 10:36:40 +02:00
Peter Simons 9b611844f1 Agda: disable broken build 2017-09-10 09:41:49 +02:00
Peter Simons e960eb0bf5 haskell-text-zipper: disable test suite to fix the build 2017-09-09 17:08:17 +02:00
Daiderd Jordan c3f6b53bb6
vaultenv: init at 0.5.0 2017-09-09 12:43:04 +02:00
Peter Simons 8a71425b82 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
4c3ddafacc.
2017-09-08 16:09:21 +02:00
Peter Simons 72451b5b77 hackage2nix: include "haskell-gi-overloading == 0.0" in our package set 2017-09-08 16:09:21 +02:00
Ben Ford 94ba1c02f6 Change link in explanation to upstream issue 2017-09-08 13:45:56 +01:00
Ben Ford 30ce53d105 Add a note about the changes 2017-09-08 13:13:22 +01:00
Ben Ford 017a356082 Also had to add dontCheck integration test seems to hang
(unit tests all pass)
2017-09-08 13:08:26 +01:00
Ben Ford 3205d164c6 Fix hw-kafka-client haskell package 2017-09-08 12:31:02 +01:00
Peter Simons 9903f4e2ed haskell-binary-orphans: use latest version when compiling with ghc-8.2.x 2017-09-07 17:42:25 +02:00
Peter Simons 0898cd2521 haskell-Agda: use old Happy version to fix the build 2017-09-07 17:42:25 +02:00
Peter Simons 7af6cb984e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
119ce17843.
2017-09-07 17:42:20 +02:00
Peter Simons d2c9a8c6a4 hackage2nix: keep old happy 1.19.5 around for Agda 2017-09-07 17:42:04 +02:00
Peter Simons d382d2b91f hackage2nix: disable broken builds 2017-09-07 17:42:04 +02:00
Peter Simons 072a0d8872 haskell-happy: fix build with ghc-7.8.x 2017-09-07 17:41:27 +02:00
Peter Simons 8809e87684 haskell-pandoc: compile ghc-8.2.x version with Cabal 1.x to avoid errors in Setup.hs 2017-09-07 17:41:27 +02:00
Peter Simons e8826a9ac4 haskell-aws: jailbreak when building with ghc-8.2.x 2017-09-07 17:41:27 +02:00
Peter Simons e1c5e81b90 haskell-aeson-compat: use latest version when building with ghc 8.2.x
Also, disable test suite to avoid depending on QuickCheck 2.10.*.
2017-09-07 17:41:27 +02:00
Peter Simons a89d69a867 Merge pull request #28918 from cocreature/natural-transformations
haskell/natural-transformation: add dependency on semigroups for GHC 7.10
2017-09-06 19:42:19 +02:00
Peter Simons 89f5d52cf4 Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f25484, reversing
changes made to 7f8ff02437. These changes broke
the ghcWithPackages wrapper:

    nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
    /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
        (no packages)
2017-09-06 10:19:18 +02:00
Peter Simons f2a76b6c29 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
6bd6c397f5.
2017-09-06 10:19:12 +02:00
Peter Simons e1a67915f8 haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure 2017-09-06 10:17:46 +02:00
Peter Simons b2bff7e8ae LTS Haskell 9.3 2017-09-06 09:58:46 +02:00
Daiderd Jordan d0d905668c
haskell-hscolour: fix darwin build 2017-09-05 22:56:09 +02:00
Peter Simons 1357268b90 Merge pull request #28478 from obsidiansystems/haskell-custom-stdenv
haskell infra: Make sure packages get custom stdenv
2017-09-05 11:14:57 +02:00
Nicholas Clarke eb99d3a670 Fix git-annex. 2017-09-04 12:35:58 +01:00
Nicholas Clarke be90e9aa31 Fix broken rebase. 2017-09-04 12:35:58 +01:00
Nicholas Clarke 414a557904 Add specific overrides for a number of failing packages.
Finish overriding bin output for broken packages.

Put stack bash completions in $bin.
2017-09-04 12:35:58 +01:00
Nicholas Clarke 77cfb96fb1 Fix hastache build error.
`hastache` has no binary output but for `mkReadme`, so disable the
separate bin output and keep removing the `mkReadme`.
2017-09-04 12:35:57 +01:00
Nicholas Clarke 330d874ee3 Disable separate etc output for hscolour.
This is not needed, since `hscolour` has no output to `/etc`, and it
breaks certain old builds (see https://hydra.nixos.org/build/57925511)
because the older cabal used does not understand this flag.
2017-09-04 12:35:57 +01:00
Nicholas Clarke a1d78fa5bc Don't build separate bin output for alex.
It has files in /usr/share which reference the bin output.
2017-09-04 12:35:57 +01:00
Nicholas Clarke 8c642d5937 Provide hscolour, happy, alex bin to buildInputs.
Use stdenv.lib.getBin instead of `.bin`
2017-09-04 12:35:57 +01:00
Nicholas Clarke 676362494d Enable multiple outputs for Haskell packages. 2017-09-04 12:35:57 +01:00
Michael Alan Dorman 2bbab078fb haskell-taggy: include upstream patch to fix build 2017-09-03 16:29:56 +02:00
Peter Simons 813d907b1d haskell-filelock: disable test suite to fix build 2017-09-03 16:29:45 +02:00
Peter Simons b9edab7a17 haskell-sbv: fix build 2017-09-03 16:29:37 +02:00
Peter Simons 2a71b5c313 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-4-ge5c3d07 from Hackage revision
4a71559e57.
2017-09-03 16:29:32 +02:00
Moritz Kiefer 243952d9d4 haskell/natural-transformation: add dependency on semigroups for GHC 7.10 2017-09-03 07:50:40 +02:00
Domen Kožar 991654fa4a haskell: add combinator to enable DWARF debugging
Tested using:

$ cat test-strip.nix
with (import ./. {});
with haskell.lib;

haskell.packages.ghc802.override {
  overrides = self: super: {
    microlens = enableDWARFDebugging super.microlens;
  };
}

$ nix-build -A microlens test-strip.nix
$ objdump -t <path-to-so-file>
2017-09-02 11:25:50 +01:00
Matthew Pickering d1ce5b69c0 ghcHEAD: Add new boot packages to configuration file 2017-09-01 13:49:56 +00:00
Matthew Pickering d13f7c54e3 Use older version of jailbreak-cabal with ghcHEAD
See https://github.com/peti/jailbreak-cabal/issues/13
2017-09-01 13:49:56 +00:00
Peter Simons e21497f268 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-1-gf0558f5 from Hackage revision
e8af693832.
2017-08-31 21:54:17 +02:00
Peter Simons 2eeffa6993 hackage2nix: update list of broken builds 2017-08-31 21:54:15 +02:00
Bas van Dijk e410a191a1 haskell: add the checkUnusedPackages function including docs 2017-08-30 14:40:54 +02:00
Peter Simons 39cf16f10e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-1-gf0558f5 from Hackage revision
c0a5549498.
2017-08-28 21:52:39 +02:00
Peter Simons c0f77542c2 hackage2nix: update list of broken packages 2017-08-28 21:52:35 +02:00
Peter Simons a75491caa4 LTS Haskell 9.2 2017-08-28 21:52:34 +02:00
Will Fancher 4d860389d8 Merge branch 'master' into improved-make-overridable 2017-08-26 11:39:13 -04:00
Peter Simons 30c15c9149 Fix a bunch of ghc-8.2.x Haskell builds. 2017-08-25 14:42:04 +02:00
Jörg Thalheim 6ec7c5cff2 Merge pull request #28488 from alunduil/add-alunduil-maintainer
add alunduil as collection-json maintainer
2017-08-25 13:16:06 +01:00
Peter Simons f62ef84f3d haskell-semigroupoids: fix build with ghc-7.10.x and before 2017-08-23 19:53:11 +02:00
Peter Simons 111cff5f0e haskell-comonad: fix build with GHC 7.6.x 2017-08-23 19:53:11 +02:00
Peter Simons a3326e85c0 haskell-vector: mark broken on GHC 7.6.x and earlier 2017-08-23 19:53:11 +02:00
Peter Simons b5d4861356 haskell-text: fix build with GHC 7.6.x and earlier 2017-08-23 19:53:11 +02:00