Commit graph

328 commits

Author SHA1 Message Date
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Nikolay Amiantov
3098547ebc haskell.packages.ghc801: 8.0.0.20160421 -> 8.0.1 2016-05-12 19:47:51 +03:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Peter Simons
bdaf650336 ghc: update 8.0.x version to rc4 2016-04-28 19:16:39 +02:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Peter Simons
2422ae0838 ghc: update 8.0.x pre-release from rc2 to rc3 2016-04-14 09:17:55 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Peter Simons
070b123d4b ghc: version 6.12.3 is broken after updating to gcc 5.x
http://hydra.nixos.org/build/33627548
2016-03-30 10:58:23 +02:00
Vladimír Čunát
c643ccaa8c Merge #13950: move ncurses utilities to $out 2016-03-16 08:39:37 +01:00
Thomas Tuegel
42b1e8ee58 ghc-6.10.2-binary: fix evaluation error on Darwin 2016-03-11 10:30:45 -06:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
John Ericson
114cd6765d haskell: Expose the package set used to build each GHC, where possible
Tested to not change hashes
2016-02-21 10:16:13 -08:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Ollie Charles
37d67b0cdf haskell.packages.ghc801: Update to RC 2 2016-02-08 14:11:49 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen
8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
df8495fb18 treewide: Mass replace 'gmp}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Peter Simons
623664daaa ghc-8.0.1: drop unused docbooc-related build inputs
The documentation is now built via Sphinx (todo).
2016-01-15 20:47:58 +01:00
Jude Taylor
552207f5ef package GHC-8.0.1-rc1 2016-01-13 12:04:18 -08:00
Vladimír Čunát
c0518e6777 ghc: fixup recent changes with multiple outputs 2016-01-12 23:57:47 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Peter Simons
1f108490f1 ghc-HEAD: update build instructions and bump version to current Git master
Closes https://github.com/NixOS/nixpkgs/issues/10752.
2015-12-16 21:33:56 +01:00
Peter Simons
878692e645 ghc-7.10.3: remove the obsolete build.mk file
New versions of GHC allow us to specify those things on the
command-line, so the build.mk file is no longer necessary.
2015-12-16 21:33:56 +01:00
Peter Simons
a421e7bd4a ghc-7.10.3: don't pass compiler or linker flags through a response file
The new GHC version contains a patch [1] that passes linker and compiler flags
to GCC via response files rather than directly on the command-line. This is
supposed to be beneficial on Windows and other platforms that have trouble
dealing with long argument lists. On NixOS, however, this feature breaks the
flag handling provided by gcc-wrapper [2] and therefore causes the entire GHC
build to fail.

This issue has been reported upstream at [3]. It's not clear yet how to remedy
this problem, but until we've figured that out we just don't pass compiler flags
in response files on NixOS to fix https://github.com/NixOS/nixpkgs/issues/10752.

[1] 296bc70b5f
[2] https://github.com/NixOS/nixpkgs/issues/11762
[3] https://ghc.haskell.org/trac/ghc/ticket/11147
2015-12-16 21:33:56 +01:00
Peter Simons
eae27e7798 ghc: update version 7.10.3 to 7.10.3a
Apply upstream patches that fix minor cosmetic issues in the documentation.
2015-12-16 21:33:56 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Peter Simons
4cca974eb6 ghc: add version 7.10.3 2015-12-09 16:03:20 +01:00
Vladimír Čunát
148e03b2f1 gmp: split into multiple outputs 2015-10-28 10:15:49 +01:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Peter Simons
73d79ed945 ghc: re-add version 7.8.3, which is required for LTS support 2015-09-15 16:23:46 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Peter Simons
dea5d87e42 ghc-7.10.2: enable documentation builds by passing the required XML/XSLT toolchain
Closes https://github.com/NixOS/nixpkgs/issues/9265.

Also, pass a hscolour binary to get source code links in the generated Haddock
documentation: closes https://github.com/NixOS/nixpkgs/issues/2985.
2015-08-31 16:49:37 +02:00
Peter Simons
de2c043d5f ghc: install bash completion shipped in version 7.10.x and later
Addresses one half of https://github.com/NixOS/nixpkgs/issues/9265.
2015-08-31 16:49:00 +02:00
Peter Simons
d7055b15b7 ghc: drop obsolete version 7.10.1
The new 7.10.2 version works fine.
2015-08-31 16:46:39 +02:00
Peter Simons
d34f7ded49 ghc-head: update to current HEAD 2015-08-28 22:28:06 +02:00
Kosyrev Serge
18926d981c ghcNokinds: 2015-07-18 -> 2015-08-26 2015-08-28 19:50:18 +03:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Kosyrev Serge
301bf5018d ghcNokinds: add myself as maintainer 2015-08-24 22:55:04 +03:00
Vladimír Čunát
a64cee8c78 ghc-7.4.2-binary: fix on i686 after 6c4364041
I'm not sure what was the compatibility problem before that commit,
but ghc at least builds now on both x86 Linux platforms
(and this commit doesn't cause a rebuild on x86_64-linux).
2015-08-17 10:36:36 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Peter Simons
f741d426da ghc-nokinds: remove "nokinds" tag from derivation name
The name of the GHC derivation must match the name and version tuple GHC
uses to identify itself, because the withPackages wrapper uses that name
to construct installation library paths etc., and those paths must match
those constructed by the compiler. If we add another tag to the name
that GHC itself doesn't use, then the paths assumed to exist by the
wrapper are wrong.
2015-08-13 12:26:41 +02:00
Peter Simons
5a0f0bc0ca ghc: make sure the nokinds version is built with a deterministic version number 2015-08-12 13:16:27 +02:00
William A. Kennington III
6c43640410 ghc: Fix compatability with new versions of ncurses 2015-08-11 12:17:35 -07:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00