JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,458 Commits 2 Branches 0 Tags 13 GiB
b33ad366a1
Commit Graph

152 Commits

Author SHA1 Message Date
Andres Loeh
d068aa9861 Patch ghc-paths to interact better with ghcWithPackages. 
When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).

But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.

As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.

This should at least partially solve issue #213.
 2012-12-16 14:25:15 +01:00
Andres Loeh
8c4f5d02aa Updating ghc HEAD snapshot. 2012-11-07 14:45:32 +01:00
Peter Simons
b1169e5509 ghc-*-binary: remove redundant assertion 
Any attempt to instantiate these expressions on an unsupported platform is
going to 'throw' an error. The call to 'assert' doesn't add any value to
that (and generates less readable error messages, too). Further details are
available at <https://github.com/NixOS/nix/issues/56>.
 2012-10-12 15:23:05 +02:00
Peter Simons
3a34ac175f pkgs/development/compilers/ghc/with-packages.nix: include bash completion files in the generated environment 2012-09-25 15:05:49 +02:00
Peter Simons
33e67e8394 ghc-head: update to version 7.7.20120912 2012-09-13 15:50:15 +02:00
Peter Simons
52454d7593 ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x 2012-09-13 15:49:42 +02:00
Peter Simons
eb288cf12e ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped 2012-09-13 15:13:00 +02:00
Peter Simons
13be1ff86e ghc-wrapper.nix: cosmetic 2012-09-13 15:12:43 +02:00
Peter Simons
15df3d131a ghc-7.6.1: parallel builds of this package fail 
I got the following error in 4 consecutive attempts:

  building rts/dist/build/AutoApply.debug_o
  building rts/dist/build/AutoApply.thr_o
    rts_dist_HC rts/dist/build/AutoApply.debug_o
  /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
  collect2: ld returned 1 exit status
  make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
 2012-09-10 12:28:25 +02:00
Peter Simons
64c0d7a490 ghc: bump 7.6.1-rc1 to version 7.6.1 2012-09-10 11:30:12 +02:00
Andres Loeh
e093d7ea38 ghc-7.6.1-rc1: Add release candidate. 2012-08-13 16:29:01 +02:00
Andres Loeh
83505f15b2 ghc-head: bump snapshot version 2012-07-18 11:02:00 +02:00
Andres Loeh
945a3480d4 ghc-HEAD: update to a new snapshot 2012-07-11 20:04:15 +02:00
Peter Simons
09321105f1 ghc: added version 7.4.2 
svn path=/nixpkgs/trunk/; revision=34460
 2012-06-11 16:25:45 +00:00
Andres Löh
789df7619e Updated GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=34379
 2012-06-08 08:25:30 +00:00
Andres Löh
e5e2432277 Upgrade ghc stable snapshot to 7.4.2rc1. 
svn path=/nixpkgs/trunk/; revision=34137
 2012-05-16 12:00:05 +00:00
Ludovic Courtès
d44d30b0ba GHC 7.4.2: Remove `darwinInstallNameToolUtility'. 
svn path=/nixpkgs/trunk/; revision=33897
 2012-04-23 16:28:10 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Andres Löh
1a355ca2ea Updated the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=33879
 2012-04-22 16:31:21 +00:00
Peter Simons
f412a1fbe7 development/compilers/ghc/head.nix: fixed sha256 hash 
svn path=/nixpkgs/trunk/; revision=33863
 2012-04-20 20:17:07 +00:00
Andres Löh
8915da0a6b New GHC snapshots. 
svn path=/nixpkgs/trunk/; revision=33858
 2012-04-20 12:22:23 +00:00
Peter Simons
3fbeca3ebc pkgs/development/compilers/ghc/wrapper.nix: removed extraneous closing bracket that broke the script 
svn path=/nixpkgs/trunk/; revision=33371
 2012-03-23 11:26:28 +00:00
Shea Levy
6aa06a6699 ghc-packages: Darwin's native readlink doesn't support -f 
svn path=/nixpkgs/trunk/; revision=33366
 2012-03-23 03:01:58 +00:00
Peter Simons
115b3d943a pkgs/development/compilers/ghc/with-packages.nix: renamed this expression from "ghc-${ghc.version}-linkdir" to "haskell-env-${ghc.name}" 
This change allows use of the with-packages wrapper in user profiles that are
being updated with "nix-env -u \*". The previous name this expression generated
was considered by Nix to be an older version of "ghc-7.0.4-wrapper", because
that name has a higher priority.

svn path=/nixpkgs/trunk/; revision=33325
 2012-03-21 11:46:15 +00:00
Peter Simons
d8e65ee71d pkgs/development/compilers/ghc/with-packages.nix: trivial changes to fix syntax highlighting in Emacs 
svn path=/nixpkgs/trunk/; revision=33324
 2012-03-21 11:46:12 +00:00
Andres Löh
ec99325d80 Explicitly set platforms for 7.4.1 rather than inheriting them. 
I hope this will enable darwin builds for 7.4.1 on Hydra.

svn path=/nixpkgs/trunk/; revision=32903
 2012-03-08 16:22:01 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Andres Löh
b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series. 
svn path=/nixpkgs/trunk/; revision=31989
 2012-02-02 21:08:30 +00:00
Andres Löh
a819ccf030 Updated GHC snapshot to ghc-7.4.1-rc2. 
svn path=/nixpkgs/trunk/; revision=31910
 2012-01-28 15:34:53 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Andres Löh
8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1. 
svn path=/nixpkgs/trunk/; revision=31066
 2011-12-25 00:12:52 +00:00
Andres Löh
c11749dcd6 Updated the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=30937
 2011-12-16 18:11:23 +00:00
Andres Löh
64c0b00bbd Linking the complete topdir of GHC in ghc-with-packages. 
svn path=/nixpkgs/trunk/; revision=30826
 2011-12-11 17:19:36 +00:00
Andres Löh
de5d98eff8 Prevent link collisions by linking only Haskell packages. 
svn path=/nixpkgs/trunk/; revision=30727
 2011-12-04 17:45:12 +00:00
Andres Löh
f237a3a418 Extended ghcWithPackages to link binaries. 
svn path=/nixpkgs/trunk/; revision=30726
 2011-12-04 16:07:39 +00:00
Andres Löh
ecf037f2f7 Added a wrapper function to produce a GHC with a predefined set of packages. 
svn path=/nixpkgs/trunk/; revision=30716
 2011-12-03 16:19:43 +00:00
Peter Simons
66bd9580f0 Added GHC 7.2.2. 
svn path=/nixpkgs/trunk/; revision=30398
 2011-11-12 22:19:03 +00:00
Andres Löh
829a5e3209 Bump GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=29164
 2011-09-11 09:14:22 +00:00
Andres Löh
51124b08b5 Bumping the GHC HEAD snapshot. 
svn path=/nixpkgs/trunk/; revision=29026
 2011-09-05 13:29:33 +00:00
Peter Simons
feff68214e pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms 
I assumed that Hydra would arrive at that result anyway, but apparently
it doesn't: no x86_64-darwin builds have occurred despite the fact that
we can bootstrap on that architecture now.

svn path=/nixpkgs/trunk/; revision=28882
 2011-08-29 20:09:57 +00:00
Shea Levy
3fe371b856 ghc/7.0.4-binary.nix: Remove comments about wrapper scripts 
svn path=/nixpkgs/trunk/; revision=28869
 2011-08-29 08:09:27 +00:00
Shea Levy
9381f1a419 ghc-7.0.4-binary.nix: don't wrap the binaries on darwin 
ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries.

svn path=/nixpkgs/trunk/; revision=28868
 2011-08-29 08:00:55 +00:00
Peter Simons
f990dd30f7 pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for i686-darwin 
svn path=/nixpkgs/trunk/; revision=28866
 2011-08-29 07:49:35 +00:00
Peter Simons
8286d30453 pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=28863
 2011-08-29 07:39:29 +00:00
Peter Simons
33597eee35 pkgs/development/compilers/ghc/7.0.4-binary.nix: pass "$@" in double quotes to avoid issues with arguments that contain whitespace 
svn path=/nixpkgs/trunk/; revision=28861
 2011-08-29 07:32:37 +00:00
Peter Simons
e9c8a9307b pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too 
svn path=/nixpkgs/trunk/; revision=28860
 2011-08-29 07:25:56 +00:00
Shea Levy
346481f483 Add GHC 7.0.4 binary for x86_64-darwin 
svn path=/nixpkgs/trunk/; revision=28859
 2011-08-29 01:20:12 +00:00
Peter Simons
c6f12a23e6 pkgs/development/compilers/ghc/wrapper.nix: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=28609
 2011-08-16 13:03:38 +00:00
Peter Simons
611501c349 pkgs/development/compilers/ghc/7.2.1.nix: updated to the final release version 
svn path=/nixpkgs/trunk/; revision=28463
 2011-08-10 16:55:54 +00:00
Peter Simons
9502aedde3 pkgs/development/compilers/ghc/6.10.2-binary.nix: we have no binary for Darwin 
svn path=/nixpkgs/trunk/; revision=28414
 2011-08-09 08:17:39 +00:00