Commit Graph

1406 Commits

Author SHA1 Message Date
Hamish Mackenzie
f056dd34cd
Fix the way ExeDependency is handled (#1036)
See https://github.com/input-output-hk/nix-tools/pull/101

We should look up hsPkgs.${pkg-name}.components.exe.${component-name}
instead of including the package as a dependency.

Adding `hsPkgs.${pkg-name}` a tool it is not clear which executable in the package `haskell.nix` should choose.

Haskell.nix did not deal with this well and in fact it could lead to `nix-shell` crashing.  For instance using `shellFor` to make a shell for building `haskell-language-server` with `cabal build` crashed as a dependency on `ghcide` the executable (by the `ghcide-bench` executable) caused infinite recursion.  Allowing `ghcide-bench` to correctly depend just on `components.exes.ghcide` fixes this.

This PR also includes:

* Updated materialized files built with the new nix-tools and latest index-state
* Small update to GHCJS (pins happy) to fix issue that showed up when the materialization was updated
* A fix for the infinite recursion issue when updating materialized files (by adding ghc-boot-packages-unchecked).
* Performance fix for shellFor (checks just the names of component derivations when filtering).
2021-02-12 10:45:23 +13:00
IOHK
7ea47464aa Update Hackage and Stackage 2021-02-11 01:15:14 +00:00
Hamish Mackenzie
89f50a96dd
Use pkgs.lib instead of stdenv.lib (#1031)
Fixes:

Warning: `stdenv.lib` is deprecated and will be removed in the next release. Please use `pkgs.lib` instead. For more information see https://github.com/NixOS/nixpkgs/issues/108938
2021-02-11 01:07:16 +13:00
Hamish Mackenzie
1498e70fcb
Pin index-state used for hls until latest hackage works (#1035) 2021-02-10 17:27:23 +13:00
IOHK
31e732fecb Update Hackage and Stackage 2021-02-10 01:12:45 +00:00
Hamish Mackenzie
cd91692380
GHC 8.10.4 (#1033)
* Adds GHC 8.10.4 support

* Drops GHC 8.8.3, 8.10.2 and 8.10.3 from CI

* Adds warning to encourage people to use less buggy ghc
2021-02-09 14:30:32 +13:00
IOHK
34f03f77ff Update Hackage and Stackage 2021-02-09 01:14:23 +00:00
Hamish Mackenzie
43513e406c
Use hackage version of haskell-language-server (#1015)
Also removes the custom-tools as haskell-language-server is now in
hackage!

Removes the custom-tools as haskell-language-server is now in
hackage!

We considered also adding support for -wrapper, but decided it was better to fix emacs so that it works if just haskell-language-server is present.
2021-02-09 01:58:36 +13:00
IOHK
a9ea38deae Update Hackage and Stackage 2021-02-08 01:13:15 +00:00
Silvan Mosberger
feea345b32
Throw better error when conf files are missing (#1030)
* Throw better error when conf files are missing

Previously, if some directories were missing .conf files, an error like
this would be thrown:

  cp: missing destination file operand after '/nix/store/pnmrz06g0sa4s3yx53hgmr9k8jrh6ww0-ouroboros-network-framework-lib-ouroboros-network-framework-0.1.0.0-haddock-config/lib/ghc-8.6.5/package.conf.d'

While normally this shouldn't occur, I've seen it happen in CI anyways,
with the problem disappearing if the store path that's missing the files
was rebuilt a couple times.

With this commit, it becomes much easier to figure out which store path
is missing the files, which would be very hard to figure out from the
previous message.
2021-02-08 03:13:31 +13:00
IOHK
59a9ee7db1 Update Hackage and Stackage 2021-02-07 01:12:13 +00:00
IOHK
1843d06f78 Update Hackage and Stackage 2021-02-06 01:12:47 +00:00
IOHK
1010a92e67 Update Hackage and Stackage 2021-02-05 01:17:22 +00:00
IOHK
aad46b9a5b Update Hackage and Stackage 2021-02-04 01:13:36 +00:00
Hamish Mackenzie
40a26afa33
Patch for ghc 8.10.3 to make musl builds possible on aarch64 (#1029)
See https://github.com/input-output-hk/haskell.nix/issues/1027#issuecomment-772087166
2021-02-04 01:55:16 +13:00
Michael Peyton Jones
928bdb5449
Update and simplify version support table (#1028)
Only include stuff that is positively supported, makes it easier to
read.
2021-02-03 11:17:07 +00:00
Hamish Mackenzie
250509f23f
Add nixpkgs-unstable (#1025) 2021-02-03 22:38:33 +13:00
IOHK
9b7f24b059 Update Hackage and Stackage 2021-02-03 01:14:00 +00:00
ismaelbouyaf
4729034750
Add "branch" information for builtins.fetchGit (#1019)
The builtins.fetchGit used by haskell.nix clones only the subset of a
repository corresponding to HEAD. So if we have a workflow that has a
branch "development" as HEAD, but the stack.yaml only targets commits
from "master", then it will be unable to fetch any commit.

Fixes #592
2021-02-03 13:16:02 +13:00
IOHK
e283bba353 Update Hackage and Stackage 2021-02-02 01:14:01 +00:00
IOHK
b4e3a93678 Update Hackage and Stackage 2021-02-01 01:12:38 +00:00
IOHK
2e38dc1cd7 Update Hackage and Stackage 2021-01-31 01:12:33 +00:00
IOHK
69dcebb5fa Update Hackage and Stackage 2021-01-30 01:12:47 +00:00
IOHK
9bf5564e78 Update Hackage and Stackage 2021-01-29 01:13:11 +00:00
IOHK
a404de5f3c Update Hackage and Stackage 2021-01-28 01:15:51 +00:00
IOHK
588a1e8a04 Update Hackage and Stackage 2021-01-27 01:15:09 +00:00
IOHK
8706c33717 Update Hackage and Stackage 2021-01-26 01:13:54 +00:00
IOHK
ef4aef4ce2 Update Hackage and Stackage 2021-01-25 01:13:59 +00:00
Marek Fajkus
62bb4dfd3a
fix link to troubleshooting section (#1016) 2021-01-25 11:27:24 +13:00
Alexander Vieth
80f3a848fb
add pcap -> libpcap to the system pkgs map (#1014) 2021-01-25 00:30:16 +13:00
IOHK
034a7c2088 Update Hackage and Stackage 2021-01-24 01:12:54 +00:00
IOHK
3439d7519e Update Hackage and Stackage 2021-01-23 01:12:29 +00:00
IOHK
5c6761c33d Update Hackage and Stackage 2021-01-22 01:18:04 +00:00
IOHK
9f774325bc Update Hackage and Stackage 2021-01-21 01:16:39 +00:00
Hamish Mackenzie
e6ba58f72f
Use combinePath instead of + for data files. (#1007)
Makes sure "/" character is added when needed.
2021-01-20 18:22:49 +13:00
IOHK
38a66f75a6 Update Hackage and Stackage 2021-01-20 01:16:50 +00:00
Hamish Mackenzie
6e34587fc8
LicenseRef-OtherLicense is not free = false (#1006)
The [dependent-map](https://hackage.haskell.org/package/dependent-map)
package for instance is not clear on which free license applies to
which parts of the code, but that does not mean it is not free.

`cabal2nix` maps LicenseRef-OtherLicense to `meta.license = "unknown"`

`cabal-to-nix` and `haskell.nix` map it to a more detailed attribute
set but it includes `free = false` and that causes packages like
`dependent-map` to fail to install when `allowUnfree` has not been set.

This change removes the `free` attribute altogether, which seems more
principled than asserting that the `OtherLicense` cannot be `free`.
2021-01-20 00:27:18 +13:00
Hamish Mackenzie
505130bfda
Use the source sub directory when running tests (#1005) 2021-01-19 18:28:33 +13:00
Bill Ewanick
0c3689b028
Update Getting Started for NixOS users (#998)
* Update getting started for NixOS users

Based on the file that writes nix.conf, and visual inspection, these settings update the nix.conf on NixOS as specified.

* Better tutorial structure

responding to feedback
2021-01-19 09:39:11 +08:00
Hamish Mackenzie
06a67e6835
Fix issue where subDir was applied twice (#1004)
This was breaking cleaning of components when a parent dir was needed.

So `hs-source-dirs: x` was ok, `hs-source-dirs: x/y` would fail.
2021-01-19 09:38:10 +08:00
IOHK
016daa8c14 Update Hackage and Stackage 2021-01-19 01:17:25 +00:00
Hamish Mackenzie
22ad57c7e7
fix the way the isProject package flag is set (#1003) 2021-01-19 10:58:24 +13:00
Jakub Kopański
36a85c8b34
Add vulkan to pkgconfig-map (#1001)
* Add vulkan to pkgconfig-map

* Explain decision to map vulkan to vulkan-loader
2021-01-18 12:51:59 +00:00
Hamish Mackenzie
b20a2dd1a3
Add missing materialization for 8.10 windows cross (#1002) 2021-01-18 19:16:35 +13:00
IOHK
e3e679b376 Update Hackage and Stackage 2021-01-18 01:13:12 +00:00
IOHK
7e49dd7f12 Update Hackage and Stackage 2021-01-17 01:12:42 +00:00
IOHK
520b4f6d32 Update Hackage and Stackage 2021-01-16 01:12:07 +00:00
Michael Peyton Jones
8455f75c8c
Use configuration-nix to include freetds dependency of the odbc package (#1000)
I think this is more correct: other package that depend on the system
odbc package may not need freetds, the problem is that the Haskell odbc
package doesn't declare its dependency on freetds.
2021-01-16 13:16:00 +13:00
Alexander Shestakov
17e2b7c69f
Allowing projects with odbc or hdbc-odbc to be built (#997)
* Adding odbc alias to the unixODBC package

* Adding odbc alias to the unixODBC package

* Adding odbc alias to the unixODBC package

* Adding comments about odbc package dependencies
2021-01-15 09:10:14 +00:00
IOHK
9cbb526f1f Update Hackage and Stackage 2021-01-15 01:14:39 +00:00