summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/generic-builder.nix
Commit message (Collapse)AuthorAge
* ghc, haskell-modules: ARM cross build fixes.Drew Hess2018-01-11
| | | | As requested in #33405.
* haskell-modules: split-objs is not supported on ARM.Drew Hess2018-01-03
|
* haskell generic-builder: Don't use absolute path to tools, and also track stripJohn Ericson2018-01-02
|
* haskell infra: Fix cross as much as possible without changing hashesJohn Ericson2018-01-02
|
* Merge remote-tracking branch 'upstream/staging' into HEADFrederik Rietdijk2018-01-02
|\
| * Merge pull request #26805 from obsidiansystems/cross-elegantJohn Ericson2017-12-30
| |\ | | | | | | Make cross compilation elegant
| | * treewide: Don't use `nativePkgs` or `crossPkgs` anymoreJohn Ericson2017-12-30
| | |
* | | haskell: Fix depending on libs with internal libs on darwin.Shea Levy2018-01-02
|/ / | | | | | | | | | | Thanks to @hamishmack for the pointer. Fixes #33149.
* | haskell: extend generic builder to recognize mis-configured Cabal 2.x buildsPeter Simons2017-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cabal 1.x says: | Warning: This package indirectly depends on multiple versions of the same | package. This is highly likely to cause a compile failure. But in version 2.x, that warning is split into two lines differently: | Warning: | This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure. This commit modifies the call to "egrep" to recognize both versions by virtue of the "-z" flag, which essentially interprets the whole configure-time output as one long line.
* | Merge pull request #33158 from shlevy/hslib-haskell-build-inputs-againPeter Simons2017-12-29
|\ \ | | | | | | Revert "Revert "hslib: Function to extract the haskell build inputs of a package.""
| * | Revert "Revert "hslib: Function to extract the haskell build inputs of a ↵Shea Levy2017-12-29
| | | | | | | | | | | | | | | | | | | | | | | | package."" Trying again, without changing the generic builder. This reverts commit 65138e8a411244c81aefa21be280323d30010b96.
| * | Revert "hslib: Function to extract the haskell build inputs of a package."Peter Simons2017-12-28
| | | | | | | | | | | | | | | | | | This reverts commit d545ef3fa11198f12e525b641aeb33887694f97f. Please don't commit substantial changes to the generic Haskell builder without giving me a chance to review them.
| * | hslib: Function to extract the haskell build inputs of a package.Shea Levy2017-12-23
| | | | | | | | | | | | | | | | | | 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.
* | | haskell generic-builder: Support installing internal libs.Shea Levy2017-12-22
|/ / | | | | | | Fixes #32980.
* / haskell: set buildInputs in nix-shell envThomas Tuegel2017-12-18
|/ | | | | systemBuildInputs goes in buildInputs (instead of nativeBuildInputs) so that NIX_CFLAGS_* is set correctly and gcc works.
* Revert "Revive multiple outputs for Haskell packages."Peter Simons2017-12-05
|
* Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""Nicholas Clarke2017-11-27
| | | | This reverts commit 89f5d52cf44baec14a7f542a605243777b16e7a5.
* fix ghcjs socket.ioJude Taylor2017-11-01
|
* haskell generic-builder: Fix pkg-config dependencyJohn Ericson2017-09-21
| | | | It should be a nativeBuidInput
* haskell-generic-builder: rename withBenchmarkDepends argument to doBenchmarkPeter Simons2017-09-19
| | | | | | This partially undoes the change from 8788bfe762ab30952b67e09be2c001a9c022e1e3. The 'doBenchmark' name is more consistent with the naming scheme used for other phases, like 'doCheck', 'doHaddock', etc.
* Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"Peter Simons2017-09-06
| | | | | | | | | | This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. 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)
* Fix broken rebase.Nicholas Clarke2017-09-04
|
* Provide hscolour, happy, alex bin to buildInputs.Nicholas Clarke2017-09-04
| | | | Use stdenv.lib.getBin instead of `.bin`
* Enable multiple outputs for Haskell packages.Nicholas Clarke2017-09-04
|
* Merge pull request #27991 from Profpatsch/hoogleLocal-fixPeter Simons2017-08-19
|\ | | | | Fix the `ghcWithHoogle` function to cope with the presence of separate `doc` outputs.
| * pkgs/haskell-modules: expose haddockDir as passthru variableProfpatsch2017-08-06
| | | | | | | | | | | | | | | | | | | | | | 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`?
| * pkgs/haskell-modules: two small vanity fixesProfpatsch2017-08-06
| |
* | replace "Mac OS X" and "OS X" with "macOS"davidak2017-08-07
|/ | | | | | | | | | 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 [...]"
* Merge branch 'master' into stagingFranz Pletz2017-07-28
|\
| * enable split-output builds for all haskellPackagesmichael bishop2017-07-27
| |
* | Merge remote-tracking branch 'upstream/master' into staging-baseJohn Ericson2017-07-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * haskell-generic-builder: fix syntax high-lightning in EmacsPeter Simons2017-07-26
| |
| * haskell-generic-builder: include setupHaskellDepends in the generated "env" ↵Peter Simons2017-07-26
| | | | | | | | | | | | | | | | 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.
| * Revert "stdenv: Store one package per line in nix-support/propagated-*"John Ericson2017-07-24
| | | | | | | | | | | | | | | | | | | | 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 3cb745d5a69018829ac15f7d5a508135f6bda123. [1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
* | stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shellJohn Ericson2017-07-26
| | | | | | | | This is a temporary measure until this impurity is removed from Nix.
* | stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* filesJohn Ericson2017-07-26
| | | | | | | | | | We cannot switch to line-delimited yet, because certain Nix commands do not read in the entire file, but just the first line.
* | stdenv-setup: Make the package accumulators associative arrays instead of ↵John Ericson2017-07-12
|/ | | | | | | | strings This is generally cleaner: less eval, less worrying about separators, and probably also faster. I got the idea from that python wrapper script.
* stdenv: Store one package per line in nix-support/propagated-*John Ericson2017-07-10
| | | | | | | | | | | | | | | | | 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.
* haskell: fix logic error in generic builder introduced in ↵Peter Simons2017-06-23
| | | | | | 00892b7e4ed2e8eb52227db8e8312a06bd1d6699 Closes https://github.com/NixOS/nixpkgs/issues/26760.
* generic-builder: use buildInputs for Haskell dependenciesJohn Ericson2017-06-16
| | | | | | | | | | | | | | 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.
* generic-builder.nix: Update doHaddockDavid Johnson2017-06-09
| | | | | 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.
* GHCJS packages: avoid inode explosionCharles Strahan2017-05-28
| | | | | | | | | | As noted in #25595, a change introduced in 4b77d425aa597 causes an explosion of inodes due to the constructions of many, many `ghcEnv` symlink forests. This commit undoes that change. To discuss reworking the support for GHCJS plugins, please see: #26192 Fixes #25595
* Remove unused `local` command.Judah Jacobson2017-05-07
|
* Fix use of `isDarwin` conditionals.Judah Jacobson2017-05-05
|
* haskell: work around linker limits on Mac OS X Sierra.Judah Jacobson2017-05-05
| | | | | | | | | | | | | | | | | | | | The Sierra linker added a limit on the number of paths that any one dynamic library (`*.dylib`) can reference. This causes problems when a Haskell library has many immediate dependencies (#22810). We follow a similar fix as GHC/Cabal/Stack: for each derivation, create a new directory with symlinks to all the dylibs of its immediate dependencies, and patch its package DB to reference that directory using the new `dynamic-library-dirs` field. Note that this change is a no-op for older versions of GHC, i.e., they will continue to fail on some packages as before. Also note that this change causes the bootstrapped versions of GHC to be recompiled, since they depend on `hscolour` which is built by `generic-builder.nix`. Tested by building the `stack` binary as described in #22810.
* haskell: set LD_LIBRARY_PATH in shellHookLeon Isenberg2017-05-03
| | | | | | LD_LIBRARY_PATH is considered by GHCI. Previously e.g. `cabal repl` failed on packages with system library dependencies.
* Merge pull request #24922 from phunehehe/haskell-shell-hookJörg Thalheim2017-04-15
|\ | | | | haskell-modules: fix shell hook
| * haskell-modules: fix shell hookHoang Xuan Phu2017-04-15
| | | | | | | | 26623240e93f8454ac69f66a3a025d98a7e94b71 lacks a newline
* | Add hardening, bump hash to HaLVMDavid Johnson2017-04-14
|/
* haskell generic builder: Use ghcjs's hsc2hs.Shea Levy2017-04-06
| | | | | | This is required when using ghcjs to compile Setup.hs, which we do since #23614. See comments on https://github.com/ghcjs/ghcjs/commit/c35350a212f20bd4cb7486bf49044f7a1329fc93
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-25 17:47:35 +0000