There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
Sourcery CodeBench manpages are installed under
share/doc/<target-triplet>/man/. Add symlinks so that the manpages
become available to "man".
NOTE: I use symlinks instead of moving the manpages, because I think
it is best to do as little as possible to prebuilt packages.
Sourcery CodeBench toolchains are prebuilt GCC toolchains from Mentor
Graphics.
Start out by adding ARM EABI and ARM GNU/Linux toolchains. Sourcery
CodeBench is also available for MIPS, Power, SuperH, ColdFire (and
more), so it should be easy to add later, if needed.
AFAIK, the EABI toolchains use newlib and the GNU/Linux ones use glibc.
This reverts commit a0716f28af.
Starting with r6706, externals now have a fixed revision, so we no longer need
to ignore them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Conflicts:
pkgs/development/compilers/haxe/default.nix
So, finally, Haxe 3 is stable :-)
An overview of the new features can be found here:
http://haxe.org/manual/haxe3/features
This version now has a new build target "tools", so let's use it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
See #490 discussion.
This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
It appears to loop saying:
ERROR: load_files/2: No permission to load source `/tmp/nix-build-pakcs-1.10.0.drv-1/pakcs/lib/.curry/pakcs/Prelude.pl' (Non-module file already loaded into module prologbasics; trying to load into user)
http://hydra.nixos.org/build/4760096
The wrapper script accumulated some cruft over the last couple of months
because we did changes in freaky ways to avoid triggering re-builds of all
Haskell packages. Most of these kludges have been thrown out now.
This patch doesn't change the behavior of the wrapper except for one thing: the
internal helper scripts "ghc-get-packages.sh" and "ghc-packages.sh" are no
longer installed in the bin directory of the generated derivation.
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.
See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
