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
Peter Simons
5f9645ef2e
haskell-semigroups: fix build with ghc-7.10.x and earlier
2017-08-23 19:53:11 +02:00
Peter Simons
074581c1a4
haskell-comonad: fix build with ghc-7.10.x and earlier
2017-08-23 19:53:11 +02:00
Peter Simons
b8314072f9
haskell-vector: fix build with ghc-7.8.x and earlier
2017-08-23 19:53:10 +02:00
Peter Simons
1e4c4ccb5d
haskell-distributive: fix build on GHC versions older than 8.x
2017-08-23 19:53:10 +02:00
Peter Simons
92bc6a7bbc
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
c3ae828aa9
.
2017-08-23 19:53:01 +02:00
Peter Simons
2939d8a049
hackage2nix: update list of broken builds
2017-08-23 19:53:00 +02:00
Peter Simons
1fb8734fdd
Merge pull request #28492 from ttuegel/idris-packages
...
Update Idris
2017-08-23 14:03:39 +02:00
Thomas Tuegel
b438d394ce
idrisPackages.idris: 1.0 -> 1.1.1
2017-08-23 06:45:32 -05:00
Alex Brandt
8b4fec00e0
add alunduil as collection-json maintainer
2017-08-22 18:31:08 -05:00
John Ericson
19de1f537e
haskell infra: Make sure packages get custom stdenv
...
One of the goals of 74f5fe5
was to allow passing in a custom stdenv,
which would be used for genericBuilder's `mkDerivation` call. That does
work, but if packages takes `stdenv` as an parameter for any reason,
they'll get the default one instead. This change remedies it.
2017-08-22 16:00:21 -04:00
Peter Simons
7b16f5974e
git-annex: update to version 6.20170818
...
Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
2017-08-22 14:52:29 +02:00
Peter Simons
499b9ebc01
liquidhaskell: fix build of the required old aeson version
...
Closes https://github.com/NixOS/nixpkgs/issues/28372 .
2017-08-22 14:52:29 +02:00
Peter Simons
f445fe7574
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
a355eb34ee
.
2017-08-22 14:52:25 +02:00
Peter Simons
4ad193dd27
hackage2nix: partially revert https://github.com/NixOS/nixpkgs/pull/28383 to fix evaluation
...
5342bffc15
refers to an unknown Nixpkgs maintainer.
2017-08-22 14:51:57 +02:00
Peter Simons
4c07f40597
hackage2nix: keep old base-orphans around for liquidhaskell
2017-08-22 14:51:57 +02:00
Domen Kožar
37c340728e
servant-auth: tests pass for a while now
2017-08-21 14:42:05 +02:00
Peter Simons
6fe751fb5c
ghcWithHoogle: deal gracefully with packages that have no haddockDir attribute
2017-08-19 17:20:39 +02:00
Peter Simons
01b8c4c9e5
ghcWithHoogle: cosmetic for the sake of Emacs syntax highlighting
2017-08-19 17:19:47 +02:00
Peter Simons
1ddf621b4e
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
cf0ce68962
.
2017-08-19 16:28:19 +02:00
Peter Simons
5468d5c662
Merge pull request #27991 from Profpatsch/hoogleLocal-fix
...
Fix the `ghcWithHoogle` function to cope with the presence of separate `doc` outputs.
2017-08-19 16:26:30 +02:00
Alex Brandt
5342bffc15
remove collection-json from dont-distribute-packages
...
I believe I've fixed the build issues for collection-json and would like
to see it make it into the next stable release of NixOS. I'm also
adding myself as maintainer.
Let me know if there is anything I did incorrectly or missed.
2017-08-19 08:41:23 +02:00
Peter Simons
b6a746daa1
Merge pull request #28097 from cocreature/sdistTarball-doc
...
haskell: remove any extraneous outputs from sdistTarball
2017-08-18 16:32:51 +02:00
Daiderd Jordan
d491eebffd
haskell-packages: fix evaluation
2017-08-17 22:43:15 +02:00
Peter Simons
7b73fb3b8a
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
79410fccc7
.
2017-08-17 21:32:29 +02:00
Peter Simons
6ff62030d9
LTS Haskell 9.1
2017-08-17 21:32:26 +02:00
Domen Kožar
105864a24d
purescript: fix building #28296
2017-08-16 15:44:28 +02:00
rnhmjoj
da8712e4e9
haskellPackages.shell-conduit: fix failing test
2017-08-15 12:06:53 +02:00
Jude Taylor
6883119ab0
add some overrides for ghc 7.10.3 to build ghcjs
2017-08-13 13:32:08 -07:00
Frederik Rietdijk
13bbaee21d
Merge pull request #27881 from mimadrid/fix/http-https
...
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Frederik Rietdijk
7ebcd39a0f
Merge commit '4c49205' into HEAD
2017-08-13 18:34:59 +02:00
Peter Simons
a9e463bc9d
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1 from Hackage revision
3ff230318a
.
2017-08-12 18:15:49 +02:00
Domen Kožar
486e1c3c16
Merge pull request #27998 from davidak/macOS
...
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
Moritz Kiefer
291da85ed9
haskell: remove any extraneous outputs from sdistTarball
2017-08-10 08:48:59 +02:00
Jude Taylor
7e3e790675
add override for html-entities
2017-08-08 14:29:33 -07:00
Jude Taylor
eeeead21c5
add override for digestive-functors-blaze
2017-08-08 11:56:31 -07:00
Peter Simons
550373b000
cabal-install: fix build after updating to version 2.x
2017-08-08 10:09:56 +02:00
Peter Simons
35dd36a027
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1 from Hackage revision
d913f9a17b
.
2017-08-08 10:09:46 +02:00
Peter Simons
142df08825
hackage2nix: update list of broken packages
2017-08-08 10:09:44 +02:00
davidak
3270aa896b
replace "Mac OS X" and "OS X" with "macOS"
...
as it is the official name since 2016
https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop
exception are parts refering to older versions of macOS like
"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Domen Kožar
4f80406fdd
Merge pull request #27615 from NickHu/cuda
...
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-08-07 16:13:49 +02:00
Peter Simons
f152749c99
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4.1 from Hackage revision
cfa51cac76
.
2017-08-07 08:58:48 +02:00
Profpatsch
4a8efae000
pkgs/haskell-modules/hoogle.nix: find haddocks by haddockDir
...
Previously a few clumsy shell globs were used to find haddock output, which
broke every time something in `generic-builder.nix` changed.
Use the new `haddockDir` identifier exported by haskell packages.
2017-08-06 22:02:50 +02:00
Profpatsch
e9e25ec5fe
pkgs/haskell-modules: expose haddockDir as passthru variable
...
WIP
If the `hoogle.nix` file wants to have any sane chance of finding haddock
outputs, the packages need to export the haddock folders as an identifier.
A few TODOs still stand, like passing self to the package instead of needing to
pass it to `haddockDir`. Maybe the exported identifier should be integrated into
the fixpoint somehow instead of using `passthru`?
2017-08-06 21:48:22 +02:00
Profpatsch
3f27a36912
pkgs/haskell-modules: two small vanity fixes
2017-08-06 21:46:49 +02:00
Profpatsch
4e6c41e7fa
pkgs/haskell-modules: fix hoogleLocal docstring
2017-08-06 21:46:22 +02:00
Domen Kožar
71bebd5254
{fs,h}notify: move to configuration-nix.nix
2017-08-06 10:42:37 +02:00
Domen Kožar
8e16cee256
double-conversion: remove patch superseeded by ghc patch
...
https://github.com/NixOS/nixpkgs/pull/27584
2017-08-06 10:42:37 +02:00
Robin Gloster
688f066da2
haskellPackages.servant: fix hash
2017-08-04 17:04:03 +02:00
John Ericson
74f5fe5068
haskell infra: Misc cleanups
...
- The haskell lib is very close to not relying on Nixpkgs. I think
this is good---simpler to think about and matches Nixpkgs's lib.
- The haskell lib is only imported once
- stdenv is exposed more shallowly so it can be overriden more easily.
I'll eventually use this on Darwin to avoid the Sierra shared
library problems (unless changes are to be made system-wide).
Closes https://github.com/NixOS/nixpkgs/pull/27840 .
2017-08-03 13:12:01 +02:00
Peter Simons
a2825a3c6f
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
c54ab27c33
.
2017-08-03 13:11:56 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
...
Homepage link "http://.../ " is a permanent redirect to "https://.../ " and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
John Wiegley
0396ca6150
ghc-events_0_6_0 no longer exists
2017-08-01 09:34:50 -07:00
Peter Simons
92031d6e01
structured-haskell-mode: bump version to latest git head
...
Chris doesn't seem to make release any more.
2017-08-01 15:35:44 +02:00
Peter Simons
4fe328c6ca
haskell-hindent: fix location of the "site-lisp" symlink
2017-08-01 15:25:19 +02:00
Peter Simons
ef6849ca63
structured-haskell-mode: fix location of the "site-lisp" symlink
2017-08-01 15:25:19 +02:00
Frederik Rietdijk
b2608b8910
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-29 13:08:11 +02:00
Peter Simons
47e3245691
haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functions
2017-07-29 12:39:26 +02:00
Frederik Rietdijk
55357de67a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-28 19:37:36 +02:00
Peter Simons
cb1742e76d
haskell: fix builds broken by LTS-9 update
2017-07-28 18:14:02 +02:00
Peter Simons
f442bbcdec
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
f72c20d338
.
2017-07-28 18:13:57 +02:00
Peter Simons
30fbeed254
LTS Haskell 9.0
...
Minus the broken wai-middleware-prometheus-0.2.0 package.
2017-07-28 18:13:27 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging
2017-07-28 16:08:30 +02:00
Peter Simons
382db8a9ad
cabal2nix: version 2.4 needs Cabal 2.x
2017-07-27 15:47:03 +02:00
Peter Simons
86b230efd9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.4 from Hackage revision
3fd8431bf5
.
2017-07-27 15:46:59 +02:00
Nikolay Amiantov
94adf8d17d
haskellPackages.threadscope: fix build
2017-07-27 12:47:58 +03:00
Domen Kožar
073b30563d
ghc-mod: fix build to cope with new split-output work
2017-07-27 09:12:41 +02:00
Peter Simons
2b0ce7aeab
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
8b34a74f81
.
2017-07-27 09:12:36 +02:00
michael bishop
be63b1994d
enable split-output builds for all haskellPackages
2017-07-27 09:12:06 +02:00
John Ericson
9be40841ea
Merge remote-tracking branch 'upstream/master' into staging-base
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/build-support/gcc-wrapper-old/builder.sh
pkgs/build-support/trivial-builders.nix
pkgs/desktops/kde-4.14/kde-package/default.nix
pkgs/development/compilers/openjdk-darwin/8.nix
pkgs/development/compilers/openjdk-darwin/default.nix
pkgs/development/compilers/openjdk/7.nix
pkgs/development/compilers/openjdk/8.nix
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
pkgs/development/compilers/zulu/default.nix
pkgs/development/haskell-modules/generic-builder.nix
pkgs/misc/misc.nix
pkgs/stdenv/generic/builder.sh
pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
William Casarin
d680c2352c
jailbreak-cabal: specifically use ghc802 override in ghc821 config
...
Otherwise this will infinite loop when:
pkgs.haskellPackages = pkgs.haskell.packages.ghc821
2017-07-26 10:44:50 -07:00
John Ericson
ea7d13cf1a
stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
...
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
John Ericson
f6f40e3fe5
stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
...
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Peter Simons
175c3526ae
haskell: provide the name 'bin-package-db' (null) to fix evaluation errors
2017-07-26 10:20:31 +02:00
Peter Simons
28c01703f0
haskell: remove all code related to the "haste" compiler
...
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Peter Simons
a9111840fa
haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors
2017-07-26 10:20:30 +02:00
Peter Simons
91a8ed37af
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
2b4eeaa78b
.
2017-07-26 10:20:25 +02:00
Peter Simons
1178136336
hackage2nix: disable failing builds
2017-07-26 10:19:58 +02:00
Peter Simons
fd6f0a2127
hackage2nix: drop obsolete version of zlib
2017-07-26 10:19:57 +02:00
Peter Simons
8a3c080237
hackage2nix: drop old packages that were required for stack prior to version 1.5.x
2017-07-26 10:19:57 +02:00
Peter Simons
4664cf8079
hackage2nix: keep Cabal 1.24.x around for the time being
2017-07-26 10:19:57 +02:00
Peter Simons
efa3ba8950
haskell-diagrams-solve: disable failing test suite to fix the build
2017-07-26 10:18:10 +02:00
Peter Simons
27ca0cb3d4
haskell-generic-builder: fix syntax high-lightning in Emacs
2017-07-26 10:17:48 +02:00
Peter Simons
e69c7f5641
haskell-generic-builder: include setupHaskellDepends in the generated "env" attribute
...
We achieve this by moving setupHaskellDepends from the buildInputs attribute
into "otherBuildInputs", which is the attribute the builder uses to construct
the build inputs in both the actual build as well as the "env" attribute.
2017-07-26 10:17:48 +02:00
Nick Hu
34beeac70b
fix haskellPackages.cuda and some tools dependent on cudatoolkit
2017-07-24 16:55:11 +01:00
John Ericson
b087618ac0
Revert "stdenv: Store one package per line in nix-support/propagated-*"
...
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.
This reverts commit 3cb745d5a6
.
[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
Frederik Rietdijk
29f91c107f
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-23 11:23:43 +02:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv
2017-07-21 20:36:34 -05:00
Peter Simons
3cc46829c7
haskell-symengine: the build is broken because the system library this code binds to does not exist
...
This error isn't easily detectable, however, because the Cabal files declares
the dependency on "symengine" for the test program rather than for the library
itself.
https://github.com/symengine/symengine.hs/pull/14
2017-07-19 18:55:38 +02:00
Peter Simons
476fc5f26e
haskell-cautious-file: jailbreak to fix the build
2017-07-18 16:51:09 +02:00
Peter Simons
85a70b50b9
haskell-hledger-iadd: drop obsolete override (the build fails with or without it)
2017-07-17 22:04:25 +02:00
Peter Simons
47feb45313
haskell-hsyslog: update version override
...
And move it from configuration-nix to configuration-common.
2017-07-17 22:04:25 +02:00
Peter Simons
6de60af3a9
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-12-gcb2265e from Hackage revision
f69cfc36c9
.
2017-07-17 22:04:25 +02:00
Peter Simons
dd7824919e
LTS Haskell 8.23
2017-07-17 22:04:24 +02:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging
2017-07-15 12:15:56 +02:00
Will Fancher
05f9db601a
Added self
views of the interface in makeExtensibleWithInterface
...
Fixing the `overrideScope` in `haskellpackages`.
2017-07-14 06:43:33 -04:00
Domen Kožar
0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417'
...
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.
http://hydra.nixos.org/eval/1375094
2017-07-14 11:55:41 +02:00
John Ericson
ea9af6e3bd
Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup
...
Stdenv setup misc cleanups
2017-07-13 18:41:33 -04:00
Will Fancher
8b764960e9
Added overrideScope
for callPackageWith
...
Consequently removing several ad-hoc definitions of the same concept.
2017-07-13 14:56:13 -04:00
Peter Simons
85c884278e
haskell-lens: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
559b1b7647
haskell-semigroupoids: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
c6ccfcd01a
haskell-base-orphans: use latest version when compiling with ghc-8.2.x
2017-07-13 08:47:01 +02:00
Peter Simons
bde4ef2234
haskell-hashable: jailbreak to fix build with ghc-8.2.x
2017-07-13 08:44:18 +02:00
Peter Simons
2180d2c118
haskell-jailbreak-cabal: use stable version from ghc-8.0.x in ghc-8.2.x package set
...
The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
2017-07-13 08:44:18 +02:00
Peter Simons
26762f1e1e
haskell-base-orphans: disable test suite to avoid build failures with ghc-8.2.x
2017-07-13 08:44:18 +02:00
Peter Simons
0ee5424ebf
haskell-doctest: remove obsolete jailbreak; ghc-8.2.x can build this package now
2017-07-13 08:44:18 +02:00
Peter Simons
f980dbec97
haskell-ChasingBottoms: jailbreak to fix build with ghc-8.2.x
2017-07-13 08:44:17 +02:00
Peter Simons
e59c532c23
haskell-hspec-meta: use latest version when compiling with ghc-8.2.x
...
Fixes https://github.com/hspec/hspec/issues/323 .
2017-07-13 08:44:17 +02:00
Will Fancher
e11dbc3710
Update haskellPackages
to use new features of makeOverridable
...
Instead of manually using `makeExtensible`, which broke `override`.
Fixes #26561
2017-07-12 18:36:18 -04:00
John Ericson
8d76effc17
stdenv-setup: Make the package accumulators associative arrays instead of strings
...
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
2017-07-12 15:30:56 -04:00
David Johnson
51edf3bf88
miso: init at 0.2.0.0
2017-07-12 18:47:18 +00:00
John Ericson
a889454869
Merge pull request #27284 from obsidiansystems/prop-lines
...
stdenv: Store one package per line in nix-support/propagated-*
2017-07-11 14:33:23 -04:00
John Ericson
3cb745d5a6
stdenv: Store one package per line in nix-support/propagated-*
...
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.
Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.
Two misc notes:
- `propagated-user-env-packages` also needed to be adjusted as
sometimes it is copied to/from the propagated input files.
- `local fd` should ensure that file descriptors aren't clobbered
during recursion.
2017-07-10 13:32:13 -04:00
Sarah Brofeldt
05c2d80025
haskellPackages.inline-java: Add jdk build dependency
2017-07-10 03:08:26 +02:00
Peter Simons
ab8af93b26
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-4-gaa50929-dirty from Hackage revision
da393a1dae
.
2017-07-06 15:28:20 +02:00
Peter Simons
7e31862657
haskell-tinc: use default versions of cabal-install and cabal2nix
2017-07-04 15:50:27 +02:00
Peter Simons
3d03ec8d2e
haskell-vector: use newer version to compile with ghc-8.2.x
2017-07-04 15:50:26 +02:00
Peter Simons
26271d0811
haskell-doctest: jailbreak to fix build with ghc-8.2.x
2017-07-04 15:50:26 +02:00
Peter Simons
f8f9fccd32
haskell-syb: use newer version to compile with ghc-8.2.x
2017-07-04 15:50:26 +02:00
Peter Simons
1fb109090e
haskell-primitive: use newer version to compile with ghc-8.2.x
2017-07-04 15:50:25 +02:00
Peter Simons
55545d1b76
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.3.1-4-gaa50929 from Hackage revision
82bc7a9031
.
2017-07-04 15:50:25 +02:00
Peter Simons
641bd6e0ca
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
b275173e92
.
2017-07-01 09:46:20 +02:00
RFish ⚓
be23568daa
hackage2nix: use older version of apply-refact with ghc-8.0.x
...
Version 0.4 of apply-refact doesn't compile with GHC 8.0.x. This patch
updates configurations-ghc-8.0.x to use apply-refact version 0.3.0.1.
Closes https://github.com/NixOS/nixpkgs/pull/26896 .
Fixes https://github.com/NixOS/nixpkgs/issues/26895 .
2017-07-01 09:46:02 +02:00
Peter Simons
7d8adcab38
LTS Haskell 8.21
2017-07-01 09:45:31 +02:00
Peter Simons
ad6c235857
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
68ba901b90
.
2017-06-29 17:35:45 +02:00
Peter Simons
46fe4bd8f3
ghc-syb-utils: disable test suite for GHC 8.x or later
...
The test suite fails when compiling with GHC 8.x. This seems to be a known issue.
Cc: https://github.com/nominolo/ghc-syb/issues/20 , https://github.com/NixOS/nixpkgs/issues/26689
2017-06-29 17:35:44 +02:00
Peter Simons
78377ae5cf
haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade-syslog
2017-06-29 17:35:44 +02:00
Peter Simons
298c3bdac0
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
8860e9a322
.
2017-06-28 15:37:53 +02:00
Peter Simons
668c2c348b
hackage2nix: disable broken hydra builds
2017-06-28 15:37:52 +02:00
Peter Simons
b5729a2571
LTS Haskell 8.20
2017-06-28 15:37:52 +02:00
Frederik Rietdijk
8a62a9b064
Merge pull request #26125 from volth/webkitgtk-naming
...
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
2017-06-28 13:54:38 +02:00
Peter Simons
c43a2d392f
git-annex: the overrideScope must be applied first to avoid bug https://github.com/NixOS/nixpkgs/issues/26852
2017-06-25 21:24:22 +02:00
Peter Simons
b4973a5bbb
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
ec9f3d302b
.
2017-06-25 12:21:55 +02:00
Peter Simons
9721c54592
git-annex: replacing optparse-applicative needs a deep override
...
| Warning: This package indirectly depends on multiple versions of the same
| package. This is highly likely to cause a compile failure.
| package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
| package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
| package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
| package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
2017-06-25 12:21:55 +02:00
Gleb Peregud
0123200dee
stdenv: add stawman docs for makeOverridable
...
Also fix a typo in docs in haskell-modules.
2017-06-24 12:47:57 +02:00
Peter Simons
e31b99c187
haskell-network: use older version to compile with GHC 7.4.x and before
...
Recent versions of network no longer support base libraries that old.
2017-06-23 12:49:37 +02:00
Peter Simons
6b6cf6942c
haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC
2017-06-23 12:49:37 +02:00
Peter Simons
8ddaef6ddf
haskell: fix logic error in generic builder introduced in 00892b7e4e
...
Closes https://github.com/NixOS/nixpkgs/issues/26760 .
2017-06-23 12:49:36 +02:00
Peter Simons
d83fb640db
haskell-opencv: ensure that the underlying C++ library has contrib code enabled
...
0335b93284 (commitcomment-22638850)
2017-06-23 12:49:36 +02:00
Peter Simons
bc20886345
git-annex: enable shell completions for zsh and fish
...
The latest optparse-applicative version can do that.
2017-06-23 12:49:36 +02:00
Peter Simons
5148757e8c
haskell-hspec-core: break infinity dependency cycle
...
Test suite dependencies silently and temporary depend on hspec-core in their
test suites.
2017-06-23 12:49:36 +02:00
Peter Simons
7673cd0cd4
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
e0fa80e591
.
2017-06-23 12:49:29 +02:00
Peter Simons
167b27b6a7
LTS Haskell 8.19
2017-06-23 12:48:44 +02:00
Domen Kožar
bb9e23837a
haskellPackages: make configuration-{nix,common}.nix configurable
...
The motivation is to be able to get rid of common configuration
when initial packages differs since common configuration assumes
a very specific version set.
cc @jmitchell @peti
2017-06-22 13:25:53 +02:00
Peter Simons
534a8efe17
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
da66240a00
.
2017-06-19 22:42:48 +02:00
Peter Simons
bb394afa25
haskell-ghc-syb-utils: force update to latest version
...
We need 0.2.3.2 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.
Closes https://github.com/NixOS/nixpkgs/issues/26689 .
2017-06-19 22:42:47 +02:00
Peter Simons
cb6a99d878
haskell-test-framework-quickcheck2: force update to latest version
...
We need 0.3.0.4 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.
2017-06-19 22:42:47 +02:00
John Ericson
8a8f0408cd
generic-builder: use buildInputs for Haskell dependencies
...
This actually will matter when I (soon) land cross-compilation support,
and native deps are compiled for the build, instead of host, platform.
But even now, it's good style do this, and one less thing to review
later.
The use of `$nativePkgs` is unfortunate, as it will need to be
swapped out for `$crossPkgs` for build != host builds. This will just a
temporarily cause pain, however, as eventually I will change stdenv to
use a `$runPkgs` (or moral equivalent) in both case.
Closes https://github.com/NixOS/nixpkgs/pull/26480 .
2017-06-16 20:18:38 +02:00
Peter Simons
7bcfdc1c11
stack: build with hpack version 0.17.x
2017-06-16 20:18:38 +02:00
Peter Simons
35762f6ce3
git-annex: update hash for new version
2017-06-16 20:18:38 +02:00
Peter Simons
0335b93284
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-10-g4e4961f from Hackage revision
e2c9a8916e
.
2017-06-16 20:18:38 +02:00
Peter Simons
46f8242d89
hackage2nix: disable broken 'trasa-reflex' package
...
Depends on insecure webkitgtk-2.4.11.
2017-06-16 20:18:38 +02:00
Peter Simons
0bb2f9af5e
LTS Haskell 8.18
2017-06-16 20:18:38 +02:00
Peter Simons
c3399e5934
haskell-hastache: don't install the internal mkReadme tool
2017-06-16 13:51:45 +02:00
Renzo Carbonara
5f94d85e5e
ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507)
...
The approach taken to add this package was to port over the definitions
currently existing for HEAD, and making the necessesary changes to get
this building.
The Haskell package set associated with this compiler doesn't yet
guarantee that all or most of the packages successfully build with this
new compiler, but that will improve over time after this GHC 8.2.1
is officially released and the ecosystem catches up.
2017-06-15 19:59:38 +02:00
Domen Kožar
525c10ecbd
hackage2nix: purescript{,-bridge} compiles now
2017-06-15 13:35:52 +02:00
Domen Kožar
72f530ba33
Fix #26441 second try: avoid infinite recursion
2017-06-15 10:22:25 +02:00
Domen Kožar
7c455b5b7e
Revert "Fix #26441 : avoid infinite recursion"
...
This reverts commit 9cad7076d1
.
See 9cad7076d1 (commitcomment-22548331)
2017-06-15 10:19:29 +02:00
michael bishop
24d313e203
justStaticExecutables: enable -dead_strip on mac to shrink closure
2017-06-14 14:23:53 -03:00
Domen Kožar
9cad7076d1
Fix #26441 : avoid infinite recursion
2017-06-14 10:33:37 +02:00
Shea Levy
b349d4b899
haskellPackages.developPackage: Add overrides argument
2017-06-12 19:29:46 -04:00
Shea Levy
01e047d088
Add haskellPackages.developPackage for local development default.nixes
2017-06-10 20:13:21 -04:00
Shea Levy
219bb1c80c
Add packageSourceOverrides function to haskell package sets
2017-06-10 20:13:17 -04:00
Jörg Thalheim
da690bdf2d
Merge pull request #26493 from dmjio/patch-1
...
generic-builder.nix: Update doHaddock
2017-06-10 23:42:23 +01:00
Peter Simons
8a9a74a481
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-9-gd15c465 from Hackage revision
4e0abeed5f
.
2017-06-10 23:35:15 +02:00
Peter Simons
fd36209f23
hackage2nix: enable builds for LambdaHack and Allure again
...
Closes https://github.com/LambdaHack/LambdaHack/issues/103 .
2017-06-10 23:35:14 +02:00
Peter Simons
7a67c9da33
hackage2nix: fix inverted logic error in the first section of dont-distribute-packages
...
This change addresses https://github.com/LambdaHack/LambdaHack/issues/103 .
2017-06-10 23:35:14 +02:00
Peter Simons
386706f9a3
LTS Haskell 8.17
2017-06-10 23:35:14 +02:00
David Johnson
00892b7e4e
generic-builder.nix: Update doHaddock
...
By default, `ghcjs` haddocks are precluded from being built. I see no reason to disallow building haddocks on projects built with `ghc` and `ghcjs` (someone can correct me here). `HaLVM` currently does not support `haddock` since it's a Stage 1 `GHC`. https://github.com/GaloisInc/HaLVM/blob/master/src/misc/build.mk.in#L20
Currently, building `haddocks` for `ghcjs` projects requires altering the derivation, which doesn't allow users to take advantage of the cache. This change will relieve that.
2017-06-09 10:04:34 -07:00
Peter Simons
f11d5c1630
haskell-doctest: fix build with ghc-7.4.x
2017-06-07 22:12:35 +02:00
Peter Simons
0b58fdb8eb
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.2.1-7-g2ed2e10 from Hackage revision
35d1e1157e
.
2017-06-07 22:12:30 +02:00
Peter Simons
905790c783
LTS Haskell 8.16
2017-06-07 22:12:27 +02:00
Peter Simons
ec9a23332f
Merge pull request #26253 from jmitchell/fix/haskell-modules-refactoring
...
haskell-modules: refactor package set
2017-05-30 21:03:25 +02:00
Jacob Mitchell
ed6ecacf64
haskell-modules: refactor package set
...
This change is effectively a no-op to nixpkgs. However, it gives users
the flexibility to create and maintain their own package sets per
project, while benefiting from nix's Haskell configurations.
I would make immediate use of this change in stack2nix, a project that
generates nix expressions for all the dependencies of a given Haskell
project. @domenkozar is familiar with the motivations and helped
refine this change
2017-05-30 11:27:32 -07:00