Domen Kožar
e4c05ae25a
ghc binaries: fix eval
2017-12-25 18:16:23 +00:00
Domen Kožar
398061dfc5
prebuilt ghcs: correctly handle rpaths
2017-12-25 17:19:43 +00:00
John Ericson
ed93d2d645
ghc-{7.8.4, 7.10.3, 8.2.1}-binary: Init
2017-12-25 16:36:47 +00:00
John Ericson
b6867f71f4
ghc prebuilt: Simplify and harden Darwin fixup
...
- Patch all executables and libraries, while skipping scripts. Base at
least uses libiconv, so should need this too---I suspect it wasn't a
problem before as we got away with the immpurity.
- Rather than hardcoding the symlinks to add, do one per mach-o as
needed
TEMP no -L no script
2017-12-25 16:36:47 +00:00
John Ericson
150255e318
ghc binary: Fix interpreter than patch RPATH
...
The newer to-be-added binaries have relative RPATHs that we'll break if
we try to `patchelf` before installation. We instead us LD_LOAD_LIBRARY
during the installation, which avoids needing to change the RPATH
temporarily.
2017-12-25 16:36:46 +00:00
John Ericson
26a46295eb
ghc prebuilt: Clean up derivations ever so slightly
...
These changes do break hashes, but are good to have everywhere for
consistency. Plus, changing the bootstrap causes a Haskell mass rebuild
anyways.
2017-12-25 16:36:43 +00:00
Peter Simons
dbc55c11f0
ghc: drop 8.2.1 version; we have 8.2.2 already
2017-12-20 09:17:46 +01:00
Matthew Pickering
e7a327da5c
ghcHEAD: 8.3.20170808 -> 8.5.20171208
2017-12-09 11:04:31 +00:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages."
2017-12-05 09:36:08 +01:00
Peter Simons
7993e8790f
Merge pull request #32112 from nc6/hask-split-out
...
Revive multiple outputs for Haskell packages.
2017-12-04 12:36:45 +01:00
Peter Simons
b58cb3fa28
ghc-8.2.2: drop obsolete gold linker patch
...
Pointed out by @basvandijk in b1a0f91afe
.
2017-11-29 10:47: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
Vaibhav Sagar
b1a0f91afe
ghc: 8.2.2-rc2 -> 8.2.2
2017-11-22 14:38:54 +08:00
Peter Simons
e876aa4db9
ghc: bump 8.2.2 pre-release to rc3
2017-11-11 17:38:26 +01:00
John Ericson
0101856765
Merge pull request #30549 from obsidiansystems/bintools
...
treewide: Introduce stdenv.cc.bintools
2017-11-08 14:20:48 -05:00
John Ericson
4d4f94cde4
treewide: Depend on targetPackages.stdenv.cc.bintools instead of binutils directly
...
One should do this when needed executables at run time. It is more
honest and cross-friendly than refering to binutils directly, if one
neeeds the default binary tools for the target platform, rather than
binutils in particular.
2017-11-05 17:10:53 -05:00
Peter Simons
a09460b827
ghc: add 8.2.2-rc2
2017-11-04 20:02:31 +01:00
John Ericson
2d52156793
ghc prebuilt: Fix indentation
...
Doing this separately so the other commits are more readable
2017-09-23 12:58:07 -04:00
John Ericson
a8ef3f6742
ghc prebuilt: Clean up syntax, without changes hashes
...
If I'm going to make a bunch more of these, I think it's a good idea to
make them more uniform first.
2017-09-23 12:58:07 -04:00
John Ericson
17de435533
ghc prebuilt: Don't hardcode the version in a few more places
...
This removes noise in the diff, making creating new versions easier. No
hashes should be changed.
2017-09-22 19:53:29 -04:00
John Ericson
d72647bc05
ghc-6.10.2-binary: Remove dead Darwin code
...
This looks like a WIP attempt from 2008
2017-09-22 19:53:28 -04:00
Peter Simons
76519f9299
ghc-7.2.2: record the commit that broke it
...
git-bisect says the problem is 51cf42ad0d
.
2017-09-15 20:52:24 +02:00
Peter Simons
3510197dcc
Revert "haskell infra, ghc: Slight cleanup"
2017-09-15 18:45:15 +02:00
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
63bf7d002c
ghc: Clean up, and add passthru.prefix
, in preparation for cross
...
No hashes should be changed.
2017-09-15 11:37:39 -04:00
Peter Simons
33b09c0f0e
ghc-7.2.2 is broken
2017-09-15 13:55:23 +02:00
John Ericson
e916917acf
ghc-8.2.1: Get rid of preReleaseName
binding now that it is released
...
No hashes should be changed
2017-09-10 17:35:25 -04:00
Peter Simons
398b36431d
ghc: remove obsolete 8.0.1 version
2017-09-10 09:47: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
8c642d5937
Provide hscolour, happy, alex bin to buildInputs.
...
Use stdenv.lib.getBin instead of `.bin`
2017-09-04 12:35:57 +01:00
Peter Simons
8c3cc7c7c4
pkgs/development/compilers/ghc: drop un-referenced patch files
2017-08-26 13:49:18 +02:00
Peter Simons
c0944b9db0
ghc-6.10.4: mark build as broken
...
The build calls ar(1) in a way the tool doesn't like:
ar q cru .libs/libffi.a src/debug.o src/prep_cif.o src/types.o src/raw_api.o src/java_raw_api.o src/closures.o src/x86/ffi64.o src/x86/unix64.o src/x86/ffi.o src/x86/sysv.o
ar: creating cru
ar: .libs/libffi.a: No such file or directory
make[4]: *** [Makefile:717: libffi.la] Error 1
This may have become an issue after some recent binutils update; I'm not sure.
2017-08-23 19:53:12 +02:00
Tuomas Tynkkynen
1ff422aa23
treewide: Add man & info outputs where necessary (instead of doc)
...
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Matthew Pickering
770743bd91
Bump ghc HEAD version ghc-8.3.20170808
2017-08-08 17:32:32 +00:00
Matthew Pickering
4021d4d5ee
Make version a parameter in GHC HEAD derivation
...
If you want to override the source but the major version changes (ie 8.1
-> 8.3) then you also have to modify the version. Otherwise the build
will fail with difficult to understand errors, making version a
parameter makes it easy to override.
2017-08-08 17:19:02 +00:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Domen Kožar
aafe3d29c1
ghc: apply a patch to fix common gold linker problem
...
It would otherwise result into undefined referenecs for some functions
in the base when using the gold linker:
error: undefined reference to 'sqrt'
Fixes https://github.com/bos/double-conversion/pull/17
Previously ghc option -optl=-lm was used for packages depending on
such functions, but that could result into
fatal error: cannot mix -r with dynamic object /nix/store/7crrmih8c52r8fbnqb933dxrsp44md93-glibc-2.25/lib/libm.so.6
in some situations like profiling builds.
Patch was prepared by Michael Bishop and Niklas Hambüchen.
Closes https://github.com/NixOS/nixpkgs/pull/27584 .
2017-07-26 10:19:57 +02:00
Domen Kožar
407acb80fc
ghc821: 8.2.1-rc3 -> 8.2.1
...
(cherry picked from commit 0901dd50a2ed0d12b2bee8fdb147fdce5c1c5d69)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-07-23 16:36:37 +02:00
Peter Simons
1f779011e9
ghc-8.2.1: update snapshot to release candidate 3
2017-07-06 15:28:19 +02:00
John Ericson
12795a7068
misc: Remove almost all uses of stdenv.{ccCross,binutils}
2017-06-22 17:53:52 -04:00
John Ericson
594d264205
cross stdenv adaptor: Support --host --build --target across the board
...
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.
rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
John Ericson
8f970d09fe
ghcHEAD: Actually split docs into their own output
...
I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.
2017-06-22 16:56:58 -04:00
John Ericson
dd99d1f8d0
ghcHEAD: Split docs into their own output
...
This ghc was forgetten from 2089dd4ab6
2017-06-17 15:13:43 -04: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
Lukasz Czyzykowski
d45aff5327
Adds ghc version to the patch file
2017-06-11 21:52:41 +02:00
Lukasz Czyzykowski
2ae46bc163
ghc: 8.0.2 without link warnings
...
Fixes NixOS/nixpkgs#25139 by backporting patch applied in ghc trunk:
https://phabricator.haskell.org/D2823
2017-05-22 20:06:52 +02:00
Peter Simons
a1b6c5f5d6
Revert "Use consistent package naming for HEAD.nix files" for GHC and GHCjs.
...
This reverts commit 31b0e34d1d
. The version
numbers used in that commit were no improvement.
2017-05-09 17:59:28 +02:00
rht
31b0e34d1d
Use consistent package naming for HEAD.nix files
2017-05-09 10:31:15 +07:00
John Ericson
295315cc87
binutilsCross: Remove and use binutils
instead always
...
See previous commit for what was done to `binutils` to make this
possible.
There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:
"Move along, nothing to see here!"
No hashes should be changed with this commit
2017-04-25 21:36:19 -04:00
David Johnson
26623240e9
Init HaLVM at 2.4.0
2017-03-10 19:31:12 -06:00
3noch
4b77d425aa
Fix GHCJS HEAD patch; support GHCJS libdir link; use full ghcEnv for GHCJS
...
Original:
f3110651c8
(With some tweaks from @cstrahan)
closes #23199
2017-03-02 11:35:11 -05:00
3noch
7d356ff696
Disable large address space in GHC iOS X compiler
...
Original:
17cea33d1a
2017-03-02 11:34:15 -05:00
Bas van Dijk
dfcc9e2994
ghc: support building with integer-simple and provide package sets for it
...
If the flag enableIntegerSimple is true GHC will be build with the GPL-free but
slower integer-simple library instead of the faster but GPLed integer-gmp
library.
The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a
GHC compiler build with `integer-simple`.
Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"`
provides a package set supporting `integer-simple`.
Closes https://github.com/NixOS/nixpkgs/pull/22121 .
Closes https://github.com/NixOS/nixpkgs/issues/5493 .
2017-02-02 10:57:00 +01:00
Bas van Dijk
a96b6e64fb
ghc-8.0.2: remove unused fetchFilteredPatch function
2017-01-24 23:34:40 +01:00
John Ericson
a1a798f017
top-level: crossSystem
is no longer exposed to packages. Use *Platform
.
2017-01-24 11:37:56 -05:00
Shea Levy
46bec22f66
Revert "Add function to build a ghc standalone archive (OSX/iOS only)"
...
Partial revert of accidental changes.
This reverts commit 4f9f00fcc9
.
2017-01-23 18:37:15 -05:00
Shea Levy
4f9f00fcc9
Add function to build a ghc standalone archive (OSX/iOS only)
2017-01-23 18:35:03 -05:00
Domen Kožar
133ba5f08a
GHC: 8.0.2-rc2 -> 8.0.2
2017-01-07 16:17:54 +01:00
Shea Levy
845dd121f8
ghc-head: Put ./boot into commonPreConfigure
2017-01-06 22:10:29 -05:00
Shea Levy
3c2cbd3259
ghc-head: bump
2017-01-06 08:39:12 -05:00
Peter Simons
494d695b97
Merge pull request #21393 from mpickering/master
...
Small improvements to development GHC derivations
2017-01-03 14:40:18 +01:00
Laverne Schrock
527468209c
ghc-8.0.2: add sphinx to inputs for documentation
...
Closes https://github.com/NixOS/nixpkgs/pull/21434 .
2016-12-28 17:30:16 +01:00
Laverne Schrock
1a78981b2f
ghc-8.0.1: switch to sphinx for documentation
...
Fixes #20281
"Since GHC 8.0, the User’s Guide is authored in ReStructuredText (or ReST
or RST, for short) a rich but light-weight mark-up language aimed at
producing documentation. The Sphinx tool is used to produce the final
PDF and HTML documentation."
- http://ghc.readthedocs.io/en/8.0.1/editing-guide.html
2016-12-28 17:30:16 +01:00
Laverne Schrock
ca41610e8a
ghc-8.0.1: enable documentation builds by passing the required XML/XSLT toolchain
2016-12-28 17:30:16 +01:00
Matthew Pickering
9f7c7405fb
Remove nokinds GHC build
...
This work has since been merged into GHC master branch and is enabled
with the TypeInType extension.
2016-12-26 13:30:07 +00:00
Matthew Pickering
4541b10904
Refactor ghcHEAD postPatch / preConfigure phases
...
This is for GHC developers using NixOS where patchShebangs is
inconvenient as it dirties the tree but unnecessary for compilation.
2016-12-26 13:27:34 +00:00
Matthew Pickering
d906fb2c9a
Bump ghcHEAD to latest commit
2016-12-26 13:27:33 +00:00
Matthew Pickering
0cd5ebb48f
Configure checkPhase for ghcHEAD
...
The testsuite requires python3 so we have to add it as a dependency.
2016-12-26 13:27:33 +00:00
Peter Simons
53bc16ad30
Merge pull request #21369 from mpickering/master
...
Update GHC 8.0.2 to RC 2
2016-12-23 10:27:49 +01:00
Matthew Pickering
d8a8e1cd0a
Update GHC 8.0.2 to RC 2
2016-12-23 01:44:30 +00:00
Will Dietz
387066357d
ghc-8.x: paxmark ghc and haddock
2016-12-19 10:55:29 +01:00
Will Dietz
708070d232
7.4.2-binary: paxmark ghc binary
2016-12-19 10:55:29 +01:00
Peter Simons
2605149d15
ghc-8.0.2: cosmetic
2016-11-30 09:47:37 +01:00
Peter Simons
fb9f9926cd
ghc-8.0.2: drop use of the obsolete response file patch
...
Our gcc wrapper has been fixed to deal with those files properly.
2016-11-30 09:46:44 +01:00
Tuomas Tynkkynen
8a4d6516ee
Merge remote-tracking branch 'upstream/staging' into master
2016-11-30 00:34:23 +02:00
Peter Simons
c272c66276
ghc: add release candidate 1 for 8.0.2
2016-11-26 21:24:40 +01:00
Franz Pletz
f01dd648f5
Merge branch 'master' into staging
2016-11-23 02:06:26 +01:00
Peter Simons
02668d6c6a
ghc: drop patch that disables use of response files
...
https://github.com/NixOS/nixpkgs/issues/11762 has been fixed by
1ad1edbb32
.
2016-11-19 20:21:32 -04:00
Shea Levy
64ec4dd87b
Add haskell packages set for cross ghc
2016-11-18 10:44:53 -05:00
Shea Levy
da547f7961
ghcHEAD: Add back response files patch
2016-11-17 01:05:21 -05:00
Shea Levy
d9e63424b7
ghc-HEAD: Run boot after patches.
...
This allows for patches affecting configure.ac to take effect
2016-11-15 19:44:21 -05:00
Shea Levy
6f7593fddc
ghc-head: fix hash.
...
Apparently fetchgit lies...
2016-11-15 18:30:32 -05:00
Shea Levy
845b56d25a
Initial support for cross-compiling ghc
2016-11-15 16:59:09 -05:00
Daniel Haraj
bac1189399
haskell.compiler.ghcHEAD: fix patchPhase #10752
2016-11-09 14:26:43 -05:00
Ollie Charles
a4f2d339fe
haskell.compiler.ghcHEAD: Update to latest upstream
2016-11-08 10:03:05 +00:00
Mathieu Boespflug
4b34e4a7cb
haskell.compiler.ghcHEAD: update to latest upstream (20160930).
...
Includes several fixes necessary for inline-java full functionality.
2016-10-04 17:51:37 +02:00
Peter Simons
d1b34967fe
ghc-8.0.1: Revert "cosmetic fix to the Nix expression to unbreak syntax highlighting"
...
This reverts commit 29a53017a4
, which broke filterdiff according to
https://github.com/NixOS/nixpkgs/issues/18665#issuecomment-247626588 .
2016-09-16 20:45:09 +02:00
Thomas Tuegel
54125b4af4
ghc801: disable MADV_FREE
2016-09-01 12:07:36 -05:00
Peter Simons
29a53017a4
ghc-8.0.1: cosmetic fix to the Nix expression to unbreak syntax highlighting
2016-09-01 15:05:01 +02:00
Robin Gloster
f86c5bc6fa
ghcHEAD: remove included patch
2016-08-28 14:03:12 +00:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Mathieu Boespflug
5f8891153b
haskell.compiler.ghcHEAD: update to latest upstream (20160826).
2016-08-26 21:15:04 +02:00
Robin Gloster
e0deed0110
ghc: add comment to relocation patch
2016-08-26 15:19:37 +00:00
Robin Gloster
77473cda6b
ghc: add relocation patch for all versions
2016-08-26 14:57:46 +00:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
51ad423716
treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls
2016-08-23 00:04:39 +03:00
obadz
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
537b746bbd
ghc8: apply patches to fix https://ghc.haskell.org/trac/ghc/ticket/12130
...
Namely:
https://git.haskell.org/ghc.git/commitdiff/4d71cc89b4e9648f3fbb29c8fcd25d725616e265
https://git.haskell.org/ghc.git/commitdiff/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd
2016-08-14 13:43:01 +01:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Tuomas Tynkkynen
8ee0e105c9
ghc: Make various binary GHCs use ncurses5
...
Fixes #17008 : GHC bootstrapping broken by ncurses update.
2016-07-16 23:47:28 +03:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
John Ericson
7cbf4a56f7
Remove dead pkgs/development/compilers/ghc/with-packages.nix
...
Superseded by `/pkgs/development/haskell-modules/with-packages-wrapper.nix`
2016-06-20 23:53:09 -07:00
Alexey Shmalko
2089dd4ab6
GHC: Split docs
2016-06-12 14:03:43 +03:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Peter Simons
94b6127f8e
ghc-8.0.1.nix: cosmetic
2016-05-25 16:26:26 +02:00
Vladimír Čunát
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Vladimír Čunát
99e68e7c83
ghc-*: fix evaluation when using single-output gmp
2016-05-19 10:04:42 +02:00
Tuomas Tynkkynen
99acb412ab
treewide: Make explicit that 'dev' output of ncurses is used
2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen
47c45e2041
treewide: Make explicit that 'dev' output of gmp is used
2016-05-19 10:00:36 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Nikolay Amiantov
c366ab933d
haskell.packages.ghc801.ghc: upstream tarball updated
2016-05-18 13:25:48 +03:00
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
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00: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
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00: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
Robin Gloster
a4e65c3639
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-30 09:01:20 +00: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
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
da9352ee73
haskell.compilers.ghc6104: turn off format hardening
2016-02-25 10:22:10 +00: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
Peter Simons
bfa187de68
ghc-head: bump version to current git HEAD
2015-08-09 20:16:19 +02:00
Peter Simons
eb5f4d3d36
ghc: make sure the HEAD version is built with a deterministic version number
2015-08-09 20:16:19 +02:00
Peter Simons
d3ac5c534d
ghc: patch start scripts to add 'readelf' and 'cat' into $PATH
...
Fixes https://github.com/NixOS/nixpkgs/issues/8192 .
2015-08-09 15:17:58 +02:00
Peter Simons
ebe412e8f7
ghc: update 7.10.2 to release version
2015-08-05 21:15:46 +02:00
Kosyrev Serge
103613f766
ghcNokinds: 20150703 -> 20150718
2015-07-28 02:02:33 +03:00
William A. Kennington III
ae28ff8b91
Merge branch 'master.upstream' into staging.upstream
2015-07-06 17:15:11 -07:00
Kosyrev Serge
5fee7af3ba
ghc: add haskell.compiler.ghcNokinds, for Richard Eisenberg's 'nokinds' branch
2015-07-06 11:09:28 +03:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
Mateusz Kowalczyk
2b833d5297
haskell-ghc: update head to 20150705
2015-07-05 21:01:37 +01:00
Peter Simons
df4fb819be
ghc: add release candidate 2 for compiler version 7.10.2
2015-07-05 20:56:29 +02:00
Peter Simons
85ae0cb070
ghc: move gcc-clang-wrapper.sh script into the ghc directory tree since it's the only user of that script
2015-06-12 10:54:02 +02:00
Jude Taylor
b9de32de5b
update GHC HEAD and configuration
2015-06-08 00:48:34 -07:00
Peter Simons
2e24bef56f
ghc-6.x: enable builds again now that 5a89a87cc5
is in master
...
Resolves https://github.com/NixOS/nixpkgs/issues/7810 .
2015-05-30 19:54:42 +02:00
Joel Taylor
24be3cfcff
ghc: add Darwin patch for #10322
2015-05-19 09:56:15 -07:00
Peter Simons
54db9d427d
ghc-6.x: mark broken because of https://github.com/NixOS/nixpkgs/issues/7810
...
6.10.4 and 6.12.3 are broken because they need 6.10.2-binary for bootstrapping.
2015-05-18 18:04:37 +02:00
Joel Taylor
c714842d9f
patch GHC 7.8.4 on darwin to fix template haskell + hpc
2015-05-17 14:31:24 -07:00
Charles Strahan
9a658d340f
ghc-7.10.1: fix user pkg db location for GHCJS
...
This cherry picks the commit referenced on the associated trac ticket:
https://ghc.haskell.org/trac/ghc/ticket/10232
2015-05-05 20:48:27 -04:00
Peter Simons
acb628a07f
Drop obsolete pkgs/development/compilers/ghc/wrapper.nix.
...
Resolves https://github.com/NixOS/nixpkgs/issues/6575 .
2015-05-04 12:27:03 +02:00
Peter Simons
fc36141267
ghc-head: update to current git HEAD
2015-04-03 00:50:44 +02:00
Charles Strahan
981dbc35d1
ghc-7.10.1: cherry-pick Cabal bugfix for GHCJS
2015-03-29 12:20:02 -04:00
Charles Strahan
d590a0f4b6
ghcjs: support for Haskell-NG
...
closes #5828
closes #6786
2015-03-29 03:34:04 +02:00
Peter Simons
64a4fab42b
ghc: bump version to 7.10.1 release
2015-03-27 15:33:53 +01:00
Peter Simons
eb4f75a868
ghc: remove obsolete "i686-darwin" from meta.platforms
2015-03-26 11:29:05 +01:00
Peter Simons
6bd48cbfef
Enable Darwin builds of Haskell packages again.
...
Hopefully, issues like https://github.com/NixOS/nixpkgs/issues/2689 are
all remedied by now.
2015-03-26 11:29:05 +01:00
Peter Simons
93bd02a6aa
ghc: versions prior to 7.4.x currently don't work on Darwin
...
db4cb021c0 (commitcomment-10320216)
2015-03-26 11:29:05 +01:00
Mateusz Kowalczyk
d56831a9af
ghc: update link and version of 7.10 RC3
2015-03-19 12:33:11 +00:00
Peter Simons
04611ab692
ghc: update 7.10.1 to rc3
2015-03-17 11:40:51 +01:00
Peter Simons
3f712f8448
ghc-6.10.4: cosmetic clean up
2015-03-15 11:00:11 +01:00
Peter Simons
26223831dc
ghc-6.12.3: cosmetic clean up
2015-03-15 11:00:11 +01:00
Peter Simons
e2b033cad9
ghc: re-instate code that configures statically linked builds by default
...
The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.
Fixes https://github.com/NixOS/nixpkgs/issues/6399 .
2015-03-09 15:55:24 +01:00
Joel Taylor
4b6d83199a
Fix temp directory paths for GHC 7.0.4 on Darwin
...
This is a remnant of https://github.com/NixOS/nixpkgs/pull/6268
2015-02-16 23:42:59 -08:00
Peter Simons
155e926274
ghc: disable parallel building for older versions again
...
This change accidentally crept in with the recent Darwin changes.
2015-02-14 19:41:49 +01:00