Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
This predicate filters out packages that weren't created by the Cabal builder.
Doing that greatly reduces the likelihood of file collisions in the generated
environment, because Haskell packages tend to have a lot of propagated build
inputs.
For example, both zeromq 2.x and 3.x use the same names for their header files.
Users of haskell-zeromq don't need those headers, so we just don't include them
in the generated environment to avoid the collision that would otherwise occur
when haskell-zeromq 2.x and 3.x are installed into the same environment.
uses for its core libraries, so that these files integrate seamlessly into one
profile, living right next to each other. This change is eventually going to
simply our with-packages wrapper quite a bit.
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.
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>.
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
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
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
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
I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.
svn path=/nixpkgs/trunk/; revision=27751
There were two problems preventing GHC 7.0.2 from being built on MacOS. For
one, the 'configure' script automatically added the flag
-isysroot /Developer/SDKs/MacOSX10.5.sdk
to the command-line that's being passed to GCC. This setting doesn't work with
our GCC, and resulted in build errors because standard headers like <stdargs.h>
could no longer be found.
Secondly, the build depends on install_name_tool, which has been added as a
buildInput.
These changes trigger a re-build on all platforms, not just on Darwin. I
realize that this could have been avoided by adding some cruft. However, I
didn't want to add cruft, so there you are.
svn path=/nixpkgs/trunk/; revision=26513
This is supposed to become the new default version of GHC once
the new Haskell Platform is released (but only then).
svn path=/nixpkgs/trunk/; revision=26217
The wrapper script for ghc-pkg changes the command's default behavior such that
global packages -- i.e. packages that are part of GHC itself -- are no longer
found:
$ ghc-pkg describe base
ghc-pkg: cannot find package base
This patch remedies the problem.
svn path=/nixpkgs/trunk/; revision=19256
make cabal expression add etxra library paths only if they exist.
Adding myself as maintainer so that the buildfarm builds ghc.
svn path=/nixpkgs/trunk/; revision=19198
The initial MacOS X binaries have been linked to libgmp.dylib using some
mad path in /opt that's now hard-coded into the program. Consequently,
$DYLD_LIBRARY_PATH must contain the place where libgmp really is for
those binaries to run correctly. Tested on i386-apple-darwin9.7.0.
svn path=/nixpkgs/trunk/; revision=17873
Unfortunately, the same problem occurs again with 'installPackage', so as of
now, GHC cannot be installed on Red Hat.
svn path=/nixpkgs/trunk/; revision=16314
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
$out/nix-support/ghc-package.conf. This makes them visible in the
user's profile when installed with nix-env.
svn path=/nixpkgs/trunk/; revision=15135
set GHC_PACKAGE_PATH.
* Let Cabal generate a package configuration file
($out/nix-support/ghc-package.conf) instead of a registration
script.
svn path=/nixpkgs/trunk/; revision=15127
into haskell-packages.nix, which depends on an instance of GHC.
This allows a consistent set of packages to be built with the same
GHC. For instance,
$ nix-build -A haskellPackages_ghc683.xmonad
builds xmonad and all its dependencies with GHC 6.8.3, while
$ nix-build -A haskellPackages_ghc6102.xmonad
does the same with GHC 6.10.2. This is the same technique used with
kernelPackages. It also means that we don't need things like
"cabal682" and "cabal683" anymore.
* The setup hook is now in a separate wrapper package so that we don't
have to recompile all of GHC every time we want to make a small
change.
* cinelerra: this package appears to have an accidental dependency on
the "X11" Haskell package.
svn path=/nixpkgs/trunk/; revision=15125
suggestion. It's good to use an older GHC for bootstrapping because
old versions can build newer versions but not vice versa.
svn path=/nixpkgs/trunk/; revision=15120
the package).
* Removed the old ghc-wrapper, which hasn't been used for a long time.
* Renamed the "boot" GHC to "binary", which is more descriptive.
(They *can* be used for other things than bootstrapping a GHC
source build.)
* Updated the GHC 6.10.1 binary to 6.10.2.
svn path=/nixpkgs/trunk/; revision=15095
rebuild all of GHC every time the setup hook changes. Thus its
better to factor it out. (After all, the setup hook doesn't have to
be provided by the GHC package proper; it can also be provided by
some helper package.)
svn path=/nixpkgs/trunk/; revision=15094
Several binaries (except for ghc itself, for which there was a
workaround) were broken before because they were stripped
during installation. Now, all binaries should work, in particular
ghc-pkg ...
svn path=/nixpkgs/trunk/; revision=13717
New is the file containing executables (such as alex/ happy)
some new libraries
The wrapper no longer installs tags by default. You have to add it to your config
So I'm ready to start merging
svn path=/nixpkgs/trunk/; revision=11554
updated bleeding edge stuff (should now work for the bulidfarm as well because
dist files are stored on my server)
moved experimental my_env into its own file
svn path=/nixpkgs/trunk/; revision=11026
- fetchdarcs_2pre added
- flapjax added
- no longer used : annotatedDerivations
- added bleeding edge repos with a tiny nix repository manager which dowloads and
updates repostiries, then creates tar.gz dist files which are used by bleeding_edge_source
(darcs tested only by now)
- added experimental my_environment with example
svn path=/nixpkgs/trunk/; revision=10974
http://consttype.blogspot.com/2007_07_01_archive.html) around the
fact that Perl 5.10 no longer supports the $* variable, which GHC's
evil mangler requires.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10833
and /tag/ source code which to build up develop environments more easily ( TODO
make this optional for ghcWrapper )
svn path=/nixpkgs/trunk/; revision=10648
Just install ghc68_wrapper which will install the required dependencies ghc
(and libraries) itself.
The list libraries given in the wrapper attribute set can be user tuned in the future ?
An alternative would be creating something similar to the gcc/g++ include/ lib/ scheme which
is could be used by ghc to find installed packages..
svn path=/nixpkgs/trunk/; revision=9581
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
- this fixes ghc on x86_64 and hopefully doesn't break 32-bit
- ghc-6.6.1 and -6.6 are tested on 64-bit, 6.4.2 might fail
svn path=/nixpkgs/trunk/; revision=9132
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
dynamic linker directly (don't hardcode ld-linux.so.2).
svn path=/nixpkgs/trunk/; revision=6873
* Make builders unexecutable by removing the hash-bang line and
execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
`mkDerivation'. These transformations were all done automatically,
so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.
svn path=/nixpkgs/trunk/; revision=874
