diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-12 16:54:35 +0000 |
commit | eda3fd1730cdfe7302ad8891fca7bb09670e37b2 (patch) | |
tree | 7ca3e75279c237cb10ee9b365b0bc919a5f2eddc /pkgs/development/compilers | |
parent | 5de58eb38778eef03e119545b21b2ad48c125482 (diff) | |
parent | b0834a993ea0daa1a417d7d838764c828cee992c (diff) | |
download | nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.gz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.bz2 nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.lz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.xz nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.tar.zst nixpkgs-eda3fd1730cdfe7302ad8891fca7bb09670e37b2.zip |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
Diffstat (limited to 'pkgs/development/compilers')
20 files changed, 426 insertions, 162 deletions
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 02b1f0bfa93..1b772b8dc71 100644 --- a/pkgs/development/compilers/Agda-executable/default.nix +++ b/pkgs/development/compilers/Agda-executable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Agda-executable"; - version = "2.2.10"; - sha256 = "0jjlbz5vaz1pasfws1cy8wvllzdzv3sxm2lfj6bckl93kdrxlpy6"; + version = "2.3.0"; + sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p"; isLibrary = false; isExecutable = true; buildDepends = [ Agda ]; diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index b4a53df9433..377a7377a32 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.1.13"; - sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb"; + version = "0.9"; + sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 0726d277f81..0e0029f9f94 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -146,13 +146,17 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; let - libc = if cross != null then libcCross else stdenv.glibc; + libc = if libcCross != null then libcCross else stdenv.glibc; gnu_h = "gcc/config/gnu.h"; i386_gnu_h = "gcc/config/i386/gnu.h"; extraCPPDeps = @@ -174,12 +178,18 @@ stdenv.mkDerivation ({ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.gcc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -384,6 +394,13 @@ stdenv.mkDerivation ({ }; } +// optionalAttrs (cross != null || libcCross != null) { + # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of, + # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'. + # FIXME: Fix `builder.sh' directly in the next stdenv-update. + postUnpack = "unset CPP"; +} + // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh index 8e1b3c8e407..6cd64bc58f2 100644 --- a/pkgs/development/compilers/gcc-4.6/builder.sh +++ b/pkgs/development/compilers/gcc-4.6/builder.sh @@ -5,11 +5,6 @@ export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy mkdir $NIX_FIXINC_DUMMY -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" -export CXXCPP="g++ -E" - if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index c7d01330cf0..4faa531f10d 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -151,13 +151,17 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; let - libc = if cross != null then libcCross else stdenv.glibc; + libc = if libcCross != null then libcCross else stdenv.glibc; gnu_h = "gcc/config/gnu.h"; i386_gnu_h = "gcc/config/i386/gnu.h"; extraCPPDeps = @@ -179,12 +183,18 @@ stdenv.mkDerivation ({ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.gcc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -200,16 +210,17 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross crossMingw; - buildNativeInputs = [ texinfo which ] - ++ optional langJava perl; + buildNativeInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr mpc libelf gettext ] + buildInputs = [ gmp mpfr mpc libelf ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix new file mode 100644 index 00000000000..358f41dcf08 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: + +stdenv.mkDerivation rec { + version = "7.2.2"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; + }; + + buildInputs = [ghc perl gmp ncurses] ++ + (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix new file mode 100644 index 00000000000..19ce4eabf42 --- /dev/null +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -0,0 +1,89 @@ +{stdenv, ghc, packages ? [], makeWrapper}: + +stdenv.mkDerivation rec { + name = "ghc-${ghc.version}-linkdir"; + + allPackages = stdenv.lib.closePropagation packages; + buildInputs = allPackages ++ [makeWrapper]; + propagatedBuildInputs = packages; + + unpackPhase = "true"; + + installPhase = '' + originalTopDir="${ghc}/lib/ghc-${ghc.version}" + originalPkgDir="$originalTopDir/package.conf.d" + linkedTopDir="$out/lib" + linkedPkgDir="$linkedTopDir/package.conf.d" + + ensureDir $out/bin + ensureDir $linkedTopDir + ensureDir $linkedPkgDir + + echo "Linking GHC core libraries:" + + echo -n "Linking $originalTopDir " + for f in $originalTopDir/*; do + if test -f $f; then + ln -s $f $linkedTopDir + echo -n . + fi + done + echo + + echo -n "Linking $originalPkgDir " + for f in $originalPkgDir/*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo + + echo "Linking selected packages and dependencies:" + + for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do + currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}" + # Check if current path is a Cabal package for the current GHC + if test -d $currentPkgDir; then + echo -n "Linking $currentPath " + for f in $currentPath/bin/*; do + ln -s $f $out/bin + echo -n . + done + for f in $currentPkgDir/*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo + fi + done + + echo -n "Generating package cache " + ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache + echo . + + echo -n "Generating wrappers " + + for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir" + echo -n . + done + + for prg in runghc runhaskell; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" + echo -n . + done + + for prg in ghc-pkg ghc-pkg-${ghc.version}; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir" + echo -n . + done + + for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do + if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then + ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . + fi + done + echo + ''; + + meta = ghc.meta; +} diff --git a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch b/pkgs/development/compilers/llvm/clang-include-paths-svn.patch deleted file mode 100644 index 85c7a12d09b..00000000000 --- a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100 -@@ -480,6 +480,7 @@ - AddPath(*i, System, false, false, false); - return; - } - -+#if 0 - switch (os) { - case llvm::Triple::Win32: { -@@ -593,7 +593,9 @@ - } - - if ( os != llvm::Triple::RTEMS ) - AddPath("/usr/include", System, false, false, false); -+#endif -+ AddPath(C_INCLUDE_PATH, System, false, false, false); - } - - void InitHeaderSearch:: -@@ -550,6 +553,7 @@ - triple); - return; - } -+#if 0 - // FIXME: temporary hack: hard-coded paths. - - if (triple.isOSDarwin()) { -@@ -769,6 +773,10 @@ - default: - break; - } -+#endif -+ AddGnuCPlusPlusIncludePaths( -+ CPP_INCLUDE_PATH, -+ CPP_HOST, "", "", triple); - } - - void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang, diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c8f05bb1fd7..afc1a55b093 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, groff, darwinSwVersUtility }: -let version = "2.9"; in +let version = "3.0"; in stdenv.mkDerivation { name = "llvm-${version}"; src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.tgz"; - sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; + url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz"; + sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; buildInputs = [ perl groff ] ++ @@ -19,6 +19,8 @@ stdenv.mkDerivation { "CXX=clang++" ]; + enableParallelBuilding = true; + meta = { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/svn-head.nix b/pkgs/development/compilers/llvm/svn-head.nix deleted file mode 100644 index f929815f8a2..00000000000 --- a/pkgs/development/compilers/llvm/svn-head.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn -, buildClang ? false }: - -let rev = "134309"; in -stdenv.mkDerivation ({ - name = "llvm-r${rev}"; - - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/llvm/trunk"; - inherit rev; - sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6"; - }; - - buildInputs = [ gcc flex perl groff ]; - - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} -// stdenv.lib.optionalAttrs buildClang ( - # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not - # evaluate properly (in the preConfigure below) - assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let - triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" - else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" - else throw "System not supported"; - in rec { - name = "clang-r${rev}"; - - srcClang = fetchsvn { - url = http://llvm.org/svn/llvm-project/cfe/trunk; - inherit rev; - sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr"; - }; - - prePatch = '' - cp -r ${srcClang} tools/clang - chmod u+rwX -R tools/clang - ''; - - patches = [ ./clang-include-paths-svn.patch ]; - - # Set up the header file paths - preConfigure = '' - sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \ - -e 's,CPP_HOST,"${triplet}",' \ - -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - ''; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - } -)) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index dcbdb6518d3..ef11c5b3baf 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, gnum4, texinfo, texLive, automake }: let - version = "9.1"; + version = "9.1.1"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); in stdenv.mkDerivation { @@ -15,25 +15,16 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns"; + sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g"; + sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9"; + sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j"; }; - configurePhase = - '' cd src - ./configure --prefix="$out" - - cd ../doc - ./configure --prefix="$out" - cd .. - ''; - buildPhase = '' cd src ${if bootstrapFromC diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix new file mode 100644 index 00000000000..8bb201f975e --- /dev/null +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, patchelf }: + +assert stdenv ? glibc; + +stdenv.mkDerivation rec { + version = "3.0"; + + date = "February2011"; + + name = "nvidia-cg-toolkit-${version}"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; + sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; + sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam"; + } + else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}"; + + installPhase = '' + for b in cgc cgfxcat cginfo + do + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" + done + # FIXME: cgfxcat and cginfo need more patchelf + ensureDir "$out/bin/" + cp -v bin/* "$out/bin/" + ensureDir "$out/include/" + cp -v -r include/Cg/ "$out/include/" + ensureDir "$out/lib/" + [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" + [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" + for mandir in man1 man3 manCg manCgFX + do + ensureDir "$out/share/man/$mandir/" + cp -v share/man/$mandir/* "$out/share/man/$mandir/" + done + ensureDir "$out/share/doc/$name/" + cp -v -r local/Cg/* "$out/share/doc/$name/" + ''; + + meta = { + homepage = http://developer.nvidia.com/cg-toolkit; + license = [ "nonfree-redistributable" ]; + }; +} diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix new file mode 100644 index 00000000000..6df16e44c3d --- /dev/null +++ b/pkgs/development/compilers/opa/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, which, ocaml, perl, jdk +, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex +, ocamlgraph, coreutils, zlib, ncurses, makeWrapper +, gcc, binutils, gnumake } : + +stdenv.mkDerivation rec { + pname = "opa"; + version = "962"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/MLstate/opalang/tarball/v${version}"; + name = "opa-${version}.tar.gz"; + sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l"; + }; + + # Paths so the opa compiler code generation will use the same programs as were + # used to build opa. + codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin"; + + prePatch = '' + find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \; + find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; + ''; + + patches = [ ./locate.patch ./libdir.patch ]; + + preConfigure = '' + configureFlags="$configureFlags -prefix $out" + ''; + + dontAddPrefix = true; + + configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib"; + + buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex + ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ]; + + postInstall = '' + # Have compiler use same tools for code generation as used to build it. + for p in $out/bin/opa ; do + wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ; + done + + # Install emacs mode. + ensureDir $out/share/emacs/site-lisp/opa + install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa + ''; + + meta = { + description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides."; + longDescription = '' + Opa is a new generation of web development platform that lets you write distributed + web applications using a single technology. Among the the many features of Opa are these: + Opa is concise, simple, concurrent, dynamically distributed, and secure. + ''; + + homepage = http://opalang.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch new file mode 100644 index 00000000000..05c8a89afa8 --- /dev/null +++ b/pkgs/development/compilers/opa/libdir.patch @@ -0,0 +1,93 @@ +These patches have the compiler place path flags in various places so that +ocaml and c libraries are found in their Nixpkgs locations. + +diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml +--- MLstate-opalang-6b295a9//build_rules.ml 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//build_rules.ml 2011-11-27 00:34:35.845277134 -0430 +@@ -373,7 +373,11 @@ + | Some dep -> dep::list + ) (tags_of_pathname (env "%.opa_plugin")) [] + in +- let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in ++ let cryptokitdir_opt = function ++ | Some path -> path ++ | None -> "" ++ in ++ let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in + let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in + let files = List.map ((^) path) files in + build_list build files; +diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli +--- MLstate-opalang-6b295a9//config.mli 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//config.mli 2011-11-27 00:30:39.312443906 -0430 +@@ -43,6 +43,9 @@ + (** Flag for Dbm present *) + val has_dbm : bool + ++(** openssh link directory *) ++val openssl : string option ++ + (** library directories, if the libs are enabled *) + val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *) + +diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure +--- MLstate-opalang-6b295a9//configure 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//configure 2011-11-27 00:40:52.496151405 -0430 +@@ -27,6 +27,7 @@ + + NO_CAMLIDL=1 + NO_DBM=1 ++CONFIG_LIB_OPENSSL="" + + while [ $# -gt 0 ]; do + case "$1" in +@@ -51,6 +52,11 @@ + shift + OCAMLOPT=$1 + ;; ++ -openssl) ++ if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi ++ shift ++ CONFIG_LIB_OPENSSL=$1 ++ ;; + -ocamlfind) + if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi + shift +@@ -647,6 +653,8 @@ + let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")") + let has_dbm = $(camlbool "$HAS_DBM") + ++let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"') ++ + let available = [ $TAGS_LIST] + let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)] + +diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml +--- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml 2011-11-27 00:32:57.721442828 -0430 +@@ -44,6 +44,7 @@ + + let options_linker = + ["-w a"] ++ @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> []) + @ (if Base.is_windows then + ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)] + else []) +@@ -51,11 +52,13 @@ + (** + Absolute path for include directory, will be passed with the option -I to the ocaml compiler. + *) ++ let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p ++ + let server_include_dir = [ +- "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; +- "+ssl" ; "+site-lib/ssl" ; +- "+cryptokit"; "+site-lib/cryptokit" ; +- "+ulex" ; "+site-lib/ulex" ; ++ uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; ++ uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ; ++ uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ; ++ uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ; + ] @ ( + if Config.has_dbm then [ + "+dbm" ; "+site-lib/dbm" ; diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch new file mode 100644 index 00000000000..e67e6bab260 --- /dev/null +++ b/pkgs/development/compilers/opa/locate.patch @@ -0,0 +1,14 @@ +Needed to have ocamlfind discover ocamlgraph with Nixpkgs. + +diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure +--- MLstate-opalang-ee92891/configure 2011-09-30 05:41:18.000000000 -0430 ++++ MLstate-opalang-ee92891-new//configure 2011-11-24 13:47:01.332558705 -0430 +@@ -567,7 +567,7 @@ + fi + + # - checking ocamlgraph +-if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph") ++if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph") + then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev" + fi + diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 364fbd621d7..bcdd3002fd6 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.51"; - name="sbcl-1.0.51"; - hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; + version="1.0.54"; + name="sbcl-1.0.54"; + hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; } diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix index 4bc8516d4b9..597aded1792 100644 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-info-for-default.nix @@ -1,8 +1,7 @@ { baseName = "sbcl"; - downloadPage = "http://sourceforge.net/projects/sbcl/files/"; - choiceCommand = "head -n 2| tail -n 1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; - sourceRegexp = "source[.-].*tar"; + downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/"; + choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'"; + sourceRegexp = "[/][0-9.]+/\$"; versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/"; - blacklistRegexp = "1[.]0[.]3[012]|1[.]0[.]29[.]54[.]rc1"; } diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 898923b48ac..edb3c2691c6 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -41,11 +41,11 @@ rec { strategoxt = stdenv.mkDerivation rec { - name = "strategoxt-1.8pre21839"; + name = "strategoxt-1.8pre23644"; src = fetchurl { - url = http://hydra.nixos.org/build/1030762/download/1/strategoxt-1.8pre21839.tar.gz; - sha256 = "b84012ac75dfd031e5356f07ea9202b9e660de48e07de0b8e1c93ac39c073b24"; + url = http://hydra.nixos.org/build/1569309/download/1/strategoxt-1.8pre23644.tar.gz; + sha256 = "9c900d132e7a8790e914aa78598c376f8ed05947c62b9d05df617ba2eae29381"; }; buildInputs = [pkgconfig aterm sdf getopt]; diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/uhc/default.nix index 27a0c431f67..0baba9c603e 100644 --- a/pkgs/development/compilers/ehc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -3,28 +3,29 @@ }: let - revision = "2293"; + revision = "2375"; in stdenv.mkDerivation { - name = "ehc-svn-${revision}"; + name = "uhc-svn-${revision}"; src = fetchsvn { - url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; + url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; rev = revision; - sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6"; + sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; }; propagatedBuildInputs = [mtl network binary fgl syb]; buildInputs = [coreutils m4 ghc libtool uulib uuagc]; + # Can we rename this flag to "--with-cpp-uhc-options"? configureFlags = "--with-cpp-ehc-options=-I${glibc}/include"; - # EHC builds packages during compilation; these are by default + # UHC builds packages during compilation; these are by default # installed in the user-specific package config file. We do not # want that, and hack the build process to use a temporary package # configuration file instead. preConfigure = '' - p=`pwd`/ehc-local-packages + p=`pwd`/uhc-local-packages echo '[]' > $p sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in @@ -32,8 +33,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome"; - description = "Essential Haskell Compiler"; + homepage = "http://www.cs.uu.nl/wiki/UHC"; + description = "Utrecht Haskell Compiler"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.andres diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 44067e4207d..2c197a1be57 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20110917"; + version = "20111127"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73"; + sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure - sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml ''; preConfigure = '' + export CC="${stdenv.gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; |