John Ericson
ebd1dd54e5
Merge remote-tracking branch 'upstream/master' into haskell-bash-completion-2
2018-11-08 11:28:53 -05:00
Robert Hensing
2a1c0dde8f
haskellPackages: Add shell completions + improve docs
...
This adds the remaining parts of #42657 on top of #49477 , renames the
function to a better name, and improves the docs
2018-11-08 11:28:11 -05:00
John Ericson
26fa9d2b51
Merge pull request #49477 from obsidiansystems/haskell-shell-completions
...
haskell-lib: Factor out shell completion scripts helper
2018-10-30 15:25:03 -04:00
John Ericson
c34f5176f1
haskell-lib: Factor out shell completion scripts helper
2018-10-30 14:49:58 -04:00
Will Fancher
bc56701020
haskell.lib.buildFromSdist: Allow overrideCabal [ Fixes #45018 ]
2018-10-19 04:49:56 -04:00
Silvan Mosberger
7c5c3fceff
haskell.lib.getBuildInputs: Use generic builder passthru to implement
2018-10-03 18:00:29 +02:00
Peter Simons
b35b8baddd
Merge pull request #45348 from shlevy/shellFor-all-build-inputs
...
haskellPackages.shellFor: fix after recent getHaskellBuildInputs fix.
2018-09-02 16:11:43 +02:00
Bas van Dijk
97a4d29545
haskell: disable library profiling for static executables
...
Haskell packages overridden with justStaticExecutables
(like cabal-install, stack, pandoc, darcs, etc.) don't provide
libraries in the end result so it's futile to build them with library
profiling enabled because it will just take extra time.
2018-08-27 14:31:34 +02:00
John Ericson
60fc04c34b
haskell lib: Add appendConfigureFlags
...
For consistency and completeness; other helpers have these "plural"
variants too.
2018-08-20 17:50:23 -04:00
Shea Levy
b00b2363b3
haskellPackages.shellFor: fix after recent getHaskellBuildInputs fix.
...
Fixes #45318
2018-08-19 15:17:35 -04:00
Shea Levy
7372d3bf31
haskell.lib.getHaskellBuildInputs: Actually get the haskell build inputs.
...
5523ec8f3c
accidentally dropped the attribute lookup.
2018-08-14 17:05:36 -04:00
Gabriel Gonzalez
05ca67107a
Fix type signature
2018-07-07 15:23:03 -07:00
Robert Hensing
637fcd4c5b
pkgs.haskell.lib.packagesFromDirectory: forward compatibility
...
Add `...` for less painful downgrades in the future
2018-07-06 13:03:56 +02:00
Gabriel Gonzalez
2c55c157bd
Rename readDirectory
to packagesFromDirectory
...
... as suggested by @roberth
2018-07-04 08:22:20 -07:00
Gabriel Gonzalez
8dae83157b
Change readDirectory
to accept an attribute set
...
... as suggested by @roberth
2018-07-03 17:44:19 -07:00
Gabriel Gonzalez
e57fd11bb4
Add pkgs.haskell.lib.readDirectory
utility
...
This adds a `readDirectory` utility that can be used to "slurp" a directory
full of `cabal2nix`-generated files and transform them into a Haskell package
override set. The main use of this is so that users don't have to write:
```
{ overrides = self: super: {
foo = self.callPackage ./path/to/foo.nix { };
bar = self.callPackage ./path/to/bar.nix { };
...
};
}
```
Instead, they can write:
```
{ overrides = pkgs.haskell.lib.readDirectory ./path/to;
}
```
This is a an alternative to `packageSourceOverrides` which primarily addresses
the following use cases:
* The desired package is not yet available in `all-cabal-hashes` (perhaps the
user is pinned to an older revision of `nixpkgs`)
* The default `cabal2nix` invocation used by `packageSourceOverrides`
does not use the desired `cabal2nix` flags
* The user wants to avoid the use of import-from-derivation
2018-07-03 09:25:15 -07:00
Moritz Angermann
87afa66a63
haskell infra: Adds buildFlags logic
2018-05-23 10:27:42 -04:00
Peter Simons
5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master"
2018-05-23 09:36:16 +02:00
Peter Simons
0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master
...
ghc, haskell infra: #40642 direct to master
2018-05-22 20:37:45 +02:00
Moritz Angermann
82a847a04b
haskell infra: Adds buildFlags logic
2018-05-21 15:11:11 -04:00
Will Fancher
5523ec8f3c
Make getHaskellBuildInputs / shellFor work with overrideCabal
2018-05-17 20:35:53 -04:00
Ben Gamari
d79fd43c9d
haskell.lib: Add {en,dis}ableExecutableProfiling transformer
...
We already have {en,dis}ableLibraryProfiling and the builder already
accepts the executable profiling attribute; let's make it easy to use.
2018-03-29 13:33:48 -04:00
Matthew Bauer
970f2b5063
Revert "justStaticExecutables: enable -dead_strip on mac to shrink closure"
...
This reverts commit 24d313e203
.
Fixes #37750
2018-03-26 20:57:32 -05:00
Peter Simons
a8d9a94574
haskell.lib.markBroken: explicitly disable Hydra builds
...
Recent changes [1] allow Hydra to build packages that are marked broken. To
avoid plenty of evaluation errors on Hydra, explicitly disable Hydra builds of
broken packages.
[1] https://github.com/NixOS/nixpkgs/issues/7541#issuecomment-357541243
2018-01-20 21:40:38 +01:00
Will Fancher
9047a7dd33
Move packageSourceOverrides to haskellLib
2018-01-18 16:42:56 -05:00
Robert Hensing
f40ecb29aa
Add documentation for haskell-modules/lib.nix
2018-01-12 10:48:03 +01:00
Shea Levy
3a763b9196
haskellLib: Add shellAware function
2018-01-10 12:08:36 -05:00
Shea Levy
1ee61d8f23
Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
...
Trying again, without changing the generic builder.
This reverts commit 65138e8a41
.
2017-12-29 14:37:24 -05:00
Peter Simons
65138e8a41
Revert "hslib: Function to extract the haskell build inputs of a package."
...
This reverts commit d545ef3fa1
. Please don't
commit substantial changes to the generic Haskell builder without giving me a
chance to review them.
2017-12-28 19:23:41 +01:00
Shea Levy
d545ef3fa1
hslib: Function to extract the haskell build inputs of a package.
...
This works by extracting out some logic from generic-builder.nix to
make it possible to get at the relevant information by overriding
mkDerivation for the haskell package.
2017-12-23 11:44:18 -05:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages."
2017-12-05 09:36:08 +01:00
Nicholas Clarke
d90165c7db
Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
...
This reverts commit 89f5d52cf4
.
2017-11-27 16:05:22 +00: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
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
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
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
676362494d
Enable multiple outputs for Haskell packages.
2017-09-04 12:35:57 +01: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
Bas van Dijk
e410a191a1
haskell: add the checkUnusedPackages function including docs
2017-08-30 14:40:54 +02:00
Moritz Kiefer
291da85ed9
haskell: remove any extraneous outputs from sdistTarball
2017-08-10 08:48:59 +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
47e3245691
haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functions
2017-07-29 12:39:26 +02:00
michael bishop
be63b1994d
enable split-output builds for all haskellPackages
2017-07-27 09:12:06 +02:00
michael bishop
24d313e203
justStaticExecutables: enable -dead_strip on mac to shrink closure
2017-06-14 14:23:53 -03:00
Benno Fünfstück
5f33eb493f
haskell-packages: factor package set construction in new file
...
Closes https://github.com/NixOS/nixpkgs/pull/24850 .
2017-04-21 16:25:53 +02:00
Shea Levy
a6c39ed207
haskell-lib: Add overrideSrc helper
2017-04-08 16:21:57 -04:00
Bas van Dijk
c865b8e35e
haskell: add the linkWithGold function to link packages with ld.gold
...
Also support linking the double-conversion package with ld.gold.
2017-04-07 09:44:11 +02:00
Leon Isenberg
2553ceb982
haskell: use GHCJS to build Setup.hs for GHCJS packages
...
Closes https://github.com/NixOS/nixpkgs/pull/23614 .
2017-03-29 20:30:28 +02:00
Domen Kožar
db23fe1581
haskell: add justStaticExecutables combinator
2017-03-07 18:13:59 +01:00