diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
commit | 6295a3ca36cc746e11c7b01fd47562fde3a703ec (patch) | |
tree | 18d9289564e8893a9d7e4df671e5226bcd2b0f0c /pkgs/development/compilers | |
parent | 91b53aaebc0ca2e80d073459324515879e300f34 (diff) | |
parent | fb565f1a4ea2a71debe48e206ef6c2d032bba0a3 (diff) | |
download | nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.gz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.bz2 nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.lz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.xz nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.tar.zst nixpkgs-6295a3ca36cc746e11c7b01fd47562fde3a703ec.zip |
Merge recent master into x-updates
Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/development/compilers')
42 files changed, 161 insertions, 787 deletions
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index fc4511d896e..69557019f15 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/compilers/agda/2.4.0.1.nix b/pkgs/development/compilers/agda/2.4.0.2.nix index e472eb1c276..6705419add9 100644 --- a/pkgs/development/compilers/agda/2.4.0.1.nix +++ b/pkgs/development/compilers/agda/2.4.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence , filepath, geniplate, happy, hashable, hashtables, haskeline , haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.0.1"; - sha256 = "11my5k606zvra3w3m1wllc4dy5mfv4lr32fqd579vqcks6wpirjq"; + version = "2.4.0.2"; + sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 1f6a8b6c6e0..8c71138ab78 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.0.7"; + version = "0.1.0"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1cv7caaf9fj6z3kln02ikkbmcy42324v39lzx3cf6qcsywwpm8fx"; + sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b7dcb806b01..16dfa580a19 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/compilers/gcc/4.2/builder.sh b/pkgs/development/compilers/gcc/4.2/builder.sh deleted file mode 100644 index d749fc08d2a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/builder.sh +++ /dev/null @@ -1,96 +0,0 @@ -source $stdenv/setup - - -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" - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraCFlags="-g0 $extraCFlags" - extraLDFlags="--strip-debug $extraLDFlags" - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - LIMITS_H_TEST=true \ - X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - ) -fi - - -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done -} - - -if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" -else - buildFlags="profiledbootstrap $buildFlags" -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix deleted file mode 100644 index 69cac159d4a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, profiledCompiler ? false -, staticCompiler ? false -, gmp ? null -, mpfr ? null -, texinfo ? null -, name ? "gcc" -}: - -with stdenv.lib; - -let version = "4.2.4"; in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - builder = ./builder.sh; - - src = - optional /*langC*/ true (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0cm5yzhqhgdfk03aayakmdj793sya42xkkqhslj7s2b697hygjfg"; - }) ++ - optional langCC (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0gq8ikci0qqgck71qqlhfld6zkwn9179x6z15vdd9blkdig55nxg"; - }) ++ - optional langFortran (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg"; - }); - - patches = - [./pass-cxxcpp.patch ./siginfo_t.patch] - ++ optional noSysDirs [./no-sys-dirs.patch]; - - inherit noSysDirs profiledCompiler staticCompiler; - - buildInputs = [gmp mpfr texinfo]; - - configureFlags = " - --disable-multilib - --disable-libstdcxx-pch - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ) - ) - } - ${if stdenv.isi686 then "--with-arch=i686" else ""} - "; - - NIX_EXTRA_LDFLAGS = if staticCompiler then "-static" else ""; - - passthru = { inherit langC langCC langFortran; }; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 4.2.x"; - }; -} diff --git a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch deleted file mode 100644 index f1d429e274a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -rc gcc-4.2.0-orig/Makefile.in gcc-4.2.0/Makefile.in -*** gcc-4.2.0-orig/Makefile.in 2006-12-29 18:47:06.000000000 +0100 ---- gcc-4.2.0/Makefile.in 2007-05-20 21:06:42.000000000 +0200 -*************** -*** 364,369 **** ---- 364,377 ---- - @host_makefile_frag@ - ### - -+ CFLAGS += $(NIX_EXTRA_CFLAGS) -+ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS) -+ CXXFLAGS += $(NIX_EXTRA_CFLAGS) -+ LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS) -+ BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS) -+ BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ - # This is the list of directories that may be needed in RPATH_ENVVAR - # so that prorgams built for the target machine work. - TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc) -diff -rc gcc-4.2.0-orig/gcc/Makefile.in gcc-4.2.0/gcc/Makefile.in -*** gcc-4.2.0-orig/gcc/Makefile.in 2007-03-12 05:40:09.000000000 +0100 ---- gcc-4.2.0/gcc/Makefile.in 2007-05-20 19:35:13.000000000 +0200 -*************** -*** 396,402 **** - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! NATIVE_SYSTEM_HEADER_DIR = /usr/include - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - ---- 396,406 ---- - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -! # `fixinc' from fixing header files in /usr/include. However, -! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -! # it to some dummy directory. -! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -*************** -*** 3066,3072 **** - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ ---- 3070,3076 ---- - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ -diff -rc gcc-4.2.0-orig/gcc/cppdefault.c gcc-4.2.0/gcc/cppdefault.c -*** gcc-4.2.0-orig/gcc/cppdefault.c 2006-01-20 22:00:03.000000000 +0100 ---- gcc-4.2.0/gcc/cppdefault.c 2007-05-20 17:16:44.000000000 +0200 -*************** -*** 41,46 **** ---- 41,50 ---- - # undef CROSS_INCLUDE_DIR - #endif - -+ #undef LOCAL_INCLUDE_DIR -+ #undef SYSTEM_INCLUDE_DIR -+ #undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c -*** gcc-4.2.0-orig/gcc/gcc.c 2007-03-05 21:37:05.000000000 +0100 ---- gcc-4.2.0/gcc/gcc.c 2007-05-20 17:49:48.000000000 +0200 -*************** -*** 1449,1458 **** - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "/lib/" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ ---- 1449,1458 ---- - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ -*************** -*** 1473,1480 **** - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/"; -! static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; ---- 1473,1480 ---- - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/no-such-path/"; -! static const char *const standard_exec_prefix_2 = "/no-such-path/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; -diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig -*** gcc-4.2.0-orig/ltconfig 2007-02-14 18:08:35.000000000 +0100 ---- gcc-4.2.0/ltconfig 2007-05-20 22:16:24.000000000 +0200 -*************** -*** 2322,2327 **** ---- 2322,2332 ---- - # A language-specific compiler. - CC=$CC - -+ # Ugly hack to get libmudflap (and possibly other libraries) to build. -+ # Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag -+ # to Glibc gets lost. Here we forcibly add it to any invocation. -+ CC="\$CC $NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" -+ - # Is the compiler the GNU C compiler? - with_gcc=$with_gcc - diff --git a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch deleted file mode 100644 index 9b0676d4fdc..00000000000 --- a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc gcc-orig/Makefile.in gcc-4.1.1/Makefile.in -*** gcc-orig/Makefile.in Wed Jun 21 13:40:23 2006 ---- gcc-4.1.1/Makefile.in Wed Jun 21 14:19:44 2006 -*************** -*** 213,219 **** - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ ---- 213,220 ---- - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \ -! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch b/pkgs/development/compilers/gcc/4.2/siginfo_t.patch deleted file mode 100644 index bfb9f975372..00000000000 --- a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bbs.archlinux.org/viewtopic.php?id=144949 ---- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000 -+++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100 -@@ -133,9 +133,9 @@ - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4446876ab1f..45040c2f375 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 99c342da780..be2f323fde1 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}"; longDescription = '' @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9713164711f..fbeea0768ad 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ef75cf71f58..8528be07729 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -438,7 +438,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 58732f1a0be..62dbad74758 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -500,7 +500,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f00c42e421a..8b185d00bcc 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -52,7 +52,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.9.0"; +let version = "4.9.1"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0mqjxpw2klskls00lwx1k24pnyzm3whqxg3hk74c3sddgfllgc5r"; + sha256 = "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k"; }; inherit patches; @@ -495,7 +495,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index cd33d3d79a7..8b14dbc5cbf 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Free VHDL simulator, mcode flavour"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1de0c88a6bc..3cab8379720 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://gentoo.org; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index c2b6b0ac5ac..f0b07f9d0fa 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14"; - sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; + version = "0.9.14.1"; + sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; + jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 4c3845f9ee5..070f29e16f6 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Ikarus - a Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch deleted file mode 100644 index 5e7370718ab..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 -@@ -2146,9 +2146,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2264,6 +2261,7 @@ - return; - - // Check if libc++ has been enabled and provide its include paths if so. -+ // !!! Will need to modify this if/when nixpkgs uses libc++ - if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { - // libc++ is always installed at a fixed path on Linux currently. - addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch deleted file mode 100644 index ffa67b464ec..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 -@@ -2077,16 +2077,6 @@ - addPathIfExists(LibPath + "/../" + Multilib, Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2100,8 +2090,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 -@@ -5210,24 +5210,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) -- CmdArgs.push_back("/lib64/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix deleted file mode 100644 index c152d2215d8..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake }: - -let - version = "3.1"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake ]; - - patches = stdenv.lib.optionals (stdenv.gcc.libc != null) - [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix deleted file mode 100644 index 60837d58b29..00000000000 --- a/pkgs/development/compilers/llvm/3.1/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, binutils }: - -let version = "3.1"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; - }; - - buildInputs = [ perl groff cmake python ]; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.2/clang-purity.patch b/pkgs/development/compilers/llvm/3.2/clang-purity.patch deleted file mode 100644 index 18c70b56c54..00000000000 --- a/pkgs/development/compilers/llvm/3.2/clang-purity.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp ---- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 -+++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500 -@@ -2153,16 +2153,6 @@ - addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2176,8 +2166,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -@@ -2228,9 +2216,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2295,24 +2280,6 @@ - "/usr/include/powerpc64-linux-gnu" - }; - ArrayRef<StringRef> MultiarchIncludeDirs; -- if (getTriple().getArch() == llvm::Triple::x86_64) { -- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::x86) { -- MultiarchIncludeDirs = X86MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::arm) { -- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; -- else -- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mips) { -- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mipsel) { -- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc) { -- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc64) { -- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; -- } - for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(), - E = MultiarchIncludeDirs.end(); - I != E; ++I) { -@@ -2324,13 +2291,6 @@ - - if (getTriple().getOS() == llvm::Triple::RTEMS) - return; -- -- // Add an include of '/include' directly. This isn't provided by default by -- // system GCCs, but is often used with cross-compiling GCCs, and harmless to -- // add even when Clang is acting as-if it were a system compiler. -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include"); -- -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); - } - - /// \brief Helper to add the thre variant paths for a libstdc++ installation. -diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp ---- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 -+++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500 -@@ -5972,34 +5972,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (isAndroid) -- CmdArgs.push_back("/system/bin/linker"); -- else if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -- else -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- } -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) { -- if (hasMipsN32ABIArg(Args)) -- CmdArgs.push_back("/lib32/ld.so.1"); -- else -- CmdArgs.push_back("/lib64/ld.so.1"); -- } -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp ---- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400 -+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500 -@@ -221,8 +221,6 @@ - case llvm::Triple::Bitrig: - break; - default: -- // FIXME: temporary hack: hard-coded paths. -- AddPath("/usr/local/include", System, true, false, false); - break; - } - } -@@ -330,8 +328,6 @@ - break; - } - -- if ( os != llvm::Triple::RTEMS ) -- AddPath("/usr/include", System, false, false, false); - } - - void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix deleted file mode 100644 index b8e9f946773..00000000000 --- a/pkgs/development/compilers/llvm/3.2/clang.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: - -let - version = "3.2"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake libxml2 ]; - - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - 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; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix deleted file mode 100644 index c373f1c1a4a..00000000000 --- a/pkgs/development/compilers/llvm/3.2/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: - -let version = "3.2"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; - }; - - patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 - patchFlags = "-p0"; - - preConfigure = "patchShebangs ."; - - propagatedBuildInputs = [ libffi ]; - buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? - - # created binaries need to be run before installation... I coudn't find a better way - preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - #doCheck = true; # tests are broken, don't know why - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/set_soname.patch b/pkgs/development/compilers/llvm/3.2/set_soname.patch deleted file mode 100644 index 69ba74dddad..00000000000 --- a/pkgs/development/compilers/llvm/3.2/set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 577533c2e52..a34fa965f06 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dragonegg.llvm.org/; description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; 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 29950aa9e3d..f6a52b52e1d 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/compilers/opencxx/default.nix b/pkgs/development/compilers/opencxx/default.nix deleted file mode 100644 index 54eda51353f..00000000000 --- a/pkgs/development/compilers/opencxx/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, libtool, gcc, patches ? []}: - -stdenv.mkDerivation { - name = "opencxx-2.8"; - src = fetchurl { - url = mirror://sourceforge/opencxx/opencxx-2.8.tar.gz; - md5 = "0f71df82751fe8aba5122d6e0541c98a"; - }; - - buildInputs = [libtool]; - NIX_GCC = gcc; - - inherit patches; -} diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index bab8e66799b..19f8eab482c 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b1ee1d000c4..e4bdcf7889b 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6fd7ad9d65b..6a07c7af69e 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://openjdk.java.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 90a64ecd521..657d18070e9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -180,6 +180,6 @@ let result = stdenv.mkDerivation rec { passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305..9b384c5ae46 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -80,5 +80,5 @@ stdenv.mkDerivation { mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rustc/0.11.nix index 2c27cf778a1..1c3b09b0985 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -14,23 +14,25 @@ */ -with if stdenv.system == "i686-linux" then { - platform = "linux-i386"; - snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea"; - target = "i686-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-linux" then { - platform = "linux-x86_64"; - snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae"; - target = "x86_64-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-darwin" then { - platform = "macos-x86_64"; - snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d"; -} else {}; -let snapshotDate = "2014-06-21"; +with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "84339ea0f796ae468ef86797ef4587274bec19ea" + else if stdenv.system == "x86_64-linux" + then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "i686-darwin" + then "3f25b2680efbab16ad074477a19d49dcce475977" + else if stdenv.system == "x86_64-darwin" + then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-06-21"; snapshotRev = "db9af1d"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in -stdenv.mkDerivation { - name = "rust-0.11.0"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; src = fetchurl { url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; @@ -67,14 +69,4 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; } - diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix new file mode 100644 index 00000000000..7af19a40c79 --- /dev/null +++ b/pkgs/development/compilers/rustc/common.nix @@ -0,0 +1,36 @@ +{stdenv, version}: + +{ + inherit version; + + platform = if stdenv.system == "i686-linux" + then "linux-i386" + else if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else if stdenv.system == "i686-darwin" + then "macos-i386" + else if stdenv.system == "x86_64-darwin" + then "macos-x86_64" + else abort "no snapshot to boostrap for this platform (missing platform url suffix)"; + + target = if stdenv.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.system == "i686-darwin" + then "i686-apple-darwin" + else if stdenv.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else abort "no snapshot to boostrap for this platform (missing target triple"; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan ]; + license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + + name = "rustc-${version}"; +} diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index 77e4c3f3788..77e4c3f3788 100644 --- a/pkgs/development/compilers/rust/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix new file mode 100644 index 00000000000..ad33906ae6e --- /dev/null +++ b/pkgs/development/compilers/rustc/head.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "a5e1bb723020ac35173d49600e76b0935e257a6a" + else if stdenv.system == "x86_64-linux" + then "1a2407df17442d93d1c34c916269a345658045d7" + else if stdenv.system == "i686-darwin" + then "6648fa88e41ad7c0991a085366e36d56005873ca" + else if stdenv.system == "x86_64-darwin" + then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-07-17"; + snapshotRev = "9fc8394"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = fetchgit { + url = https://github.com/rust-lang/rust; + rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; + sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshot; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 1261b2d458d..1261b2d458d 100644 --- a/pkgs/development/compilers/rust/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b488308f5c4..faa281efc7a 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.purdue.edu/~qobi/software.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; maintainers = [ ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ad7348925b..1e82e03f16c 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; |