public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-12-30 17:04:54 +01:00
parent d2b02d662e 9d4de1eac8
commit 2d0bead714
73 changed files with 1947 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
pkgs/development/compilers/ghc/7.8.3.nix
View File

@@ -1,59 +0,0 @@
{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
# If enabled GHC will be build with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
, enableIntegerSimple ? false, gmp
}:
stdenv.mkDerivation rec {
version = "7.8.3";
name = "ghc-${version}";
src = fetchurl {
url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz";
sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh";
};
patches = [ ./relocation.patch ];
buildInputs = [ ghc perl ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp;
enableParallelBuilding = true;
buildMK = ''
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
DYNAMIC_BY_DEFAULT = NO
${stdenv.lib.optionalString stdenv.isDarwin ''
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
''}
'' + (if enableIntegerSimple then ''
INTEGER_LIBRARY=integer-simple
'' else ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
'');
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'';
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
meta = {
homepage = http://haskell.org/ghc;
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license platforms;
};
}

7
pkgs/development/compilers/mit-scheme/default.nix
View File

@@ -1,4 +1,5 @@
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake,
enableX11 ? false, xlibsWrapper ? null }:
let
version = "9.2";
@@ -9,7 +10,7 @@ let
else "";
in
stdenv.mkDerivation {
name = "mit-scheme-${version}";
name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
# MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
# the platform-specific tarballs, which contain pre-built binaries. It
@@ -29,6 +30,8 @@ stdenv.mkDerivation {
sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg";
};
buildInputs = if enableX11 then [xlibsWrapper] else [];
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)

1
pkgs/development/compilers/uhc/default.nix
View File

@@ -49,5 +49,6 @@ in stdenv.mkDerivation rec {
# On Darwin, the GNU libtool is used, which does not
# support the -static flag and thus breaks the build.
platforms = ["x86_64-linux"];
broken = true;
};
}