Permalink
Browse files

Merge stdenv-updates into master

This is a re-merge, in fact. Now the first parent is master
as of right before the "first merge" (ac6761c).
A few commits pushed in-between into master now look like coming
from stdenv-updates, but otherwise this seems to fix the situation.

Cf. 320209a#commitcomment-5125991
  • Loading branch information...
2 parents 8088837 + 28d51a3 commit 668310a2b578d57a59dad7481db651ab3a258256 @vcunat vcunat committed Jan 21, 2014
Showing with 2,782 additions and 2,706 deletions.
  1. +5 −0 pkgs/applications/audio/sonic-visualiser/default.nix
  2. +2 −2 pkgs/applications/editors/ed/default.nix
  3. +2 −2 pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
  4. +4 −0 pkgs/applications/graphics/inkscape/default.nix
  5. +0 −47 pkgs/applications/graphics/inkscape/libpng-1.5.patch
  6. +11 −0 pkgs/applications/graphics/inkscape/spuriouscomma.patch
  7. +1 −1 pkgs/applications/graphics/k3d/default.nix
  8. +1 −1 pkgs/applications/misc/goldendict/default.nix
  9. +40 −0 pkgs/applications/misc/goldendict/gcc47.patch
  10. +1 −0 pkgs/applications/misc/krusader/default.nix
  11. +7 −8 pkgs/applications/networking/esniper/default.nix
  12. +2 −0 pkgs/applications/science/astronomy/celestia/default.nix
  13. +2 −1 pkgs/applications/version-management/git-and-tools/git/default.nix
  14. +2 −0 pkgs/applications/version-management/gource/default.nix
  15. +19 −2 pkgs/build-support/gcc-wrapper/builder.sh
  16. +1 −0 pkgs/build-support/gcc-wrapper/default.nix
  17. +40 −0 pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
  18. +1 −1 pkgs/build-support/gcc-wrapper/setup-hook.sh
  19. +4 −2 pkgs/desktops/gnome-2/default.nix
  20. +3 −3 pkgs/development/compilers/gcc/4.2/default.nix
  21. +15 −0 pkgs/development/compilers/gcc/4.2/siginfo_t.patch
  22. +8 −8 pkgs/development/compilers/gcc/4.3/default.nix
  23. +1 −1 pkgs/development/compilers/gcc/4.4/default.nix
  24. +7 −7 pkgs/development/compilers/gcc/4.4/sources.nix
  25. +2 −2 pkgs/development/compilers/gcc/4.4/update-gcc.sh
  26. +1 −1 pkgs/development/compilers/gcc/4.5/default.nix
  27. +1 −1 pkgs/development/compilers/gcc/4.6/default.nix
  28. +0 −11 pkgs/development/compilers/gcc/4.7/build-race.patch
  29. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/arm-eabi.patch
  30. +9 −6 pkgs/development/compilers/gcc/{4.7 → 4.8}/builder.sh
  31. +72 −52 pkgs/development/compilers/gcc/{4.7 → 4.8}/default.nix
  32. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/gfortran-driving.patch
  33. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/gnat-cflags.patch
  34. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/java-jvgenmain-link.patch
  35. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/libstdc++-target.patch
  36. 0 pkgs/development/compilers/gcc/{4.7 → 4.8}/no-sys-dirs.patch
  37. +32 −0 pkgs/development/compilers/gcc/4.8/parallel-bconfig.patch
  38. +1 −1 pkgs/development/compilers/ghc/7.6.3.nix
  39. +0 −21 pkgs/development/compilers/ghc/ghc-get-packages.sh
  40. +41 −0 pkgs/development/compilers/llvm/3.3/llvm.nix
  41. 0 pkgs/development/compilers/llvm/{ → 3.3}/more-memory-for-bugpoint.patch
  42. +8 −0 pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
  43. +8 −0 pkgs/development/compilers/llvm/3.4/clang-separate-build.patch
  44. +41 −0 pkgs/development/compilers/llvm/3.4/clang.nix
  45. +25 −0 pkgs/development/compilers/llvm/3.4/default.nix
  46. +3 −7 pkgs/development/compilers/llvm/{ → 3.4}/dragonegg.nix
  47. +31 −0 pkgs/development/compilers/llvm/3.4/lld.nix
  48. +44 −0 pkgs/development/compilers/llvm/3.4/lldb.nix
  49. +12 −0 pkgs/development/compilers/llvm/3.4/llvm-separate-build.patch
  50. +55 −0 pkgs/development/compilers/llvm/3.4/llvm.nix
  51. +12 −0 pkgs/development/compilers/llvm/3.4/polly-separate-build.patch
  52. +27 −0 pkgs/development/compilers/llvm/3.4/polly.nix
  53. +0 −47 pkgs/development/compilers/llvm/default.nix
  54. +0 −89 pkgs/development/compilers/llvm/full.nix
  55. +10 −7 pkgs/development/compilers/mlton/default.nix
  56. +1 −0 pkgs/development/compilers/openjdk/default.nix
  57. +2 −1 pkgs/development/interpreters/perl/5.14/default.nix
  58. +11 −0 pkgs/development/interpreters/perl/5.14/ld-shared.patch
  59. +31 −4 pkgs/development/interpreters/perl/5.16/default.nix
  60. +11 −0 pkgs/development/interpreters/perl/5.16/ld-shared.patch
  61. +93 −20 pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
  62. +1 −1 pkgs/development/interpreters/python/2.6/default.nix
  63. +1 −1 pkgs/development/interpreters/python/2.7/default.nix
  64. +2 −2 pkgs/development/libraries/acl/default.nix
  65. +2 −2 pkgs/development/libraries/attr/default.nix
  66. +2 −2 pkgs/development/libraries/cloog/default.nix
  67. +9 −0 pkgs/development/libraries/coin3d/default.nix
  68. +38 −0 pkgs/development/libraries/coin3d/gcc-4.8.patch
  69. +4 −4 pkgs/development/libraries/ctl/default.nix
  70. +15 −0 pkgs/development/libraries/ctl/gcc47.patch
  71. +6 −0 pkgs/development/libraries/dbus-cplusplus/default.nix
  72. +10 −12 pkgs/development/libraries/gettext/default.nix
  73. +0 −42 pkgs/development/libraries/gettext/no-gets.patch
  74. +4 −1 pkgs/development/libraries/glib/default.nix
  75. +9 −3 pkgs/development/libraries/glibc/2.18/common.nix
  76. +6 −0 pkgs/development/libraries/glibc/2.18/fix_path_attribute_in_getconf.patch
  77. +3 −1 pkgs/development/libraries/gmp/4.3.2.nix
  78. +3 −2 pkgs/development/libraries/gmp/{5.1.3.nix → 5.1.x.nix}
  79. +5 −5 pkgs/development/libraries/gnu-efi/default.nix
  80. +4 −0 pkgs/development/libraries/gsl/default.nix
  81. +32 −0 pkgs/development/libraries/gsl/disable-fma.patch
  82. +3 −5 pkgs/development/libraries/icu/default.nix
  83. +4 −6 pkgs/development/libraries/isl/default.nix
  84. +12 −0 pkgs/development/libraries/isl/fix-gcc-build.diff
  85. +5 −3 pkgs/development/libraries/kerberos/krb5.nix
  86. +4 −4 pkgs/development/libraries/libarchive/default.nix
  87. +2 −2 pkgs/development/libraries/libc++/default.nix
  88. +1 −1 pkgs/development/libraries/libgcrypt/default.nix
  89. +1 −0 pkgs/development/libraries/libmsn/default.nix
  90. +16 −0 pkgs/development/libraries/libmsn/fix-ftbfs-gcc4.7.diff
  91. +0 −13 pkgs/development/libraries/libofa/curl-types.patch
  92. +12 −5 pkgs/development/libraries/libofa/default.nix
  93. +0 −12 pkgs/development/libraries/libofa/gcc-4.x.patch
  94. +0 −36 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
  95. +0 −39 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch
  96. +6 −2 pkgs/development/libraries/libproxy/default.nix
  97. +1 −1 pkgs/development/libraries/libxml2/default.nix
  98. +13 −13 pkgs/development/libraries/libxslt/default.nix
  99. +69 −0 pkgs/development/libraries/libxslt/patch-ah.patch
  100. +2 −2 pkgs/development/libraries/mpc/default.nix
  101. +0 −51 pkgs/development/libraries/mpfr/3.1.2.nix
  102. +13 −15 pkgs/development/libraries/mpfr/default.nix
  103. +19 −2 pkgs/development/libraries/ncurses/default.nix
  104. +40 −0 pkgs/development/libraries/ncurses/patch-ac
  105. +10 −3 pkgs/development/libraries/ois/default.nix
  106. +5 −3 pkgs/development/libraries/openssl/default.nix
  107. +6 −3 pkgs/development/libraries/pcre/default.nix
  108. +5 −3 pkgs/development/libraries/ppl/default.nix
  109. +42 −0 pkgs/development/libraries/ppl/upstream-based.patch
  110. +2 −0 pkgs/development/libraries/qca2/default.nix
  111. +12 −0 pkgs/development/libraries/qca2/gcc47.patch
  112. +2 −0 pkgs/development/libraries/strigi/default.nix
  113. +12 −0 pkgs/development/libraries/strigi/export_bufferedstream.patch
  114. +1 −1 pkgs/development/libraries/sword/default.nix
  115. +35 −0 pkgs/development/libraries/sword/gcc47.patch
  116. +4 −1 pkgs/development/libraries/v8/default.nix
  117. +2 −2 pkgs/development/libraries/vigra/default.nix
  118. +7 −1 pkgs/development/libraries/xbase/default.nix
  119. +3 −3 pkgs/development/libraries/zlib/default.nix
  120. +4 −4 pkgs/development/lisp-modules/stumpwm/default.nix
  121. +17 −0 pkgs/development/tools/build-managers/cmake/762-13887.patch
  122. +10 −4 pkgs/development/tools/build-managers/cmake/default.nix
  123. +37 −35 pkgs/development/tools/build-managers/cmake/search-path.patch
  124. +17 −0 pkgs/development/tools/build-managers/cmake/setup-hook.sh
  125. +20 −14 pkgs/development/tools/misc/binutils/default.nix
  126. +6 −6 pkgs/development/tools/misc/elfutils/default.nix
  127. +5 −5 pkgs/development/tools/misc/gnum4/default.nix
  128. +0 −18 pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch
  129. +4 −2 pkgs/development/tools/misc/patchelf/default.nix
  130. +0 −16 pkgs/development/tools/misc/patchelf/unstable.nix
  131. +0 −10 pkgs/development/tools/misc/texinfo/4.9.nix
  132. +4 −4 pkgs/development/tools/misc/texinfo/{5.1.nix → 5.2.nix}
  133. +1 −0 pkgs/development/tools/parsing/alex/2.3.1.nix
  134. +1 −0 pkgs/development/tools/parsing/alex/2.3.2.nix
  135. +1 −0 pkgs/development/tools/parsing/alex/2.3.3.nix
  136. +1 −0 pkgs/development/tools/parsing/alex/2.3.5.nix
  137. +12 −0 pkgs/development/tools/parsing/alex/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
  138. +3 −3 pkgs/development/tools/parsing/bison/2.x.nix
  139. +2 −4 pkgs/development/tools/parsing/bison/3.x.nix
  140. +7 −7 pkgs/development/tools/parsing/flex/{flex-2.5.35.nix → default.nix}
  141. +0 −20 pkgs/development/tools/parsing/flex/flex-2.5.33.nix
  142. +0 −19 pkgs/development/tools/parsing/flex/flex-2.5.34.nix
  143. +0 −12 pkgs/development/tools/parsing/flex/flex-2.5.4a.nix
  144. +1 −0 pkgs/development/tools/parsing/happy/1.18.4.nix
  145. +1 −0 pkgs/development/tools/parsing/happy/1.18.5.nix
  146. +1 −0 pkgs/development/tools/parsing/happy/1.18.6.nix
  147. +1 −0 pkgs/development/tools/parsing/happy/1.18.8.nix
  148. +12 −0 pkgs/development/tools/parsing/happy/adapt-crazy-perl-regex-for-cpp-4.8.0.patch
  149. +4 −0 pkgs/games/asc/default.nix
  150. +11 −18 pkgs/misc/emulators/zsnes/default.nix
  151. +12 −0 pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
  152. +80 −0 pkgs/misc/emulators/zsnes/zsnes.patch
  153. +3 −0 pkgs/os-specific/linux/ipsec-tools/default.nix
  154. +2 −2 pkgs/servers/monitoring/net-snmp/default.nix
  155. +13 −0 pkgs/servers/x11/xorg/overrides.nix
  156. +3 −0 pkgs/shells/bash/bash-4.2-patches.nix
  157. +1 −0 pkgs/stdenv/default.nix
  158. +4 −2 pkgs/stdenv/generic/default.nix
  159. +0 −876 pkgs/stdenv/generic/setup-repeatable.sh
  160. +71 −16 pkgs/stdenv/generic/setup.sh
  161. +62 −7 pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
  162. +3 −7 pkgs/stdenv/linux/bootstrap/armv6l/default.nix
  163. +63 −7 pkgs/stdenv/linux/bootstrap/i686/default.nix
  164. +63 −7 pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
  165. +58 −6 pkgs/stdenv/linux/bootstrap/powerpc/default.nix
  166. +30 −20 pkgs/stdenv/linux/default.nix
  167. +1 −1 pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
  168. +2 −1 pkgs/stdenv/native/default.nix
  169. +1 −0 pkgs/stdenv/nix/default.nix
  170. +5 −12 pkgs/tools/archivers/cpio/default.nix
  171. +4 −6 pkgs/{development/tools/misc/gnum4 → tools/archivers/cpio}/no-gets.patch
  172. +5 −6 pkgs/tools/archivers/gnutar/default.nix
  173. +0 −26 pkgs/tools/archivers/gnutar/gets-undeclared.patch
  174. +8 −5 pkgs/tools/compression/gzip/default.nix
  175. +2 −2 pkgs/tools/compression/xz/default.nix
  176. +0 −2 pkgs/tools/filesystems/e2fsprogs/default.nix
  177. +3 −3 pkgs/tools/graphics/asymptote/default.nix
  178. +6 −1 pkgs/tools/misc/coreutils/default.nix
  179. +40 −0 pkgs/tools/misc/coreutils/help2man.patch
  180. +2 −2 pkgs/tools/misc/file/default.nix
  181. +16 −7 pkgs/tools/misc/less/default.nix
  182. +7 −4 pkgs/tools/networking/curl/default.nix
  183. +6 −4 pkgs/tools/networking/p2p/amule/default.nix
  184. +21 −0 pkgs/tools/networking/p2p/amule/gcc47.patch
  185. +3 −3 pkgs/tools/package-management/nix/unstable.nix
  186. +4 −6 pkgs/tools/text/diffutils/default.nix
  187. +0 −71 pkgs/tools/text/diffutils/gets-undeclared.patch
  188. +2 −2 pkgs/tools/text/gawk/default.nix
  189. +2 −0 pkgs/tools/text/gnugrep/default.nix
  190. +18 −0 pkgs/tools/text/gnugrep/test-localeconv.patch
  191. +67 −0 pkgs/tools/text/gnupatch/bashishms.patch
  192. +3 −2 pkgs/tools/text/gnupatch/default.nix
  193. +3 −3 pkgs/tools/text/gnused/default.nix
  194. +2 −2 pkgs/tools/text/sgml/opensp/compat.nix
  195. +97 −275 pkgs/top-level/all-packages.nix
  196. +496 −426 pkgs/top-level/node-packages-generated.nix
  197. +1 −1 pkgs/top-level/node-packages.json
  198. +0 −1 pkgs/top-level/release-python.nix
  199. +12 −13 pkgs/top-level/release-small.nix
  200. +2 −2 pkgs/top-level/release.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
};
+ patches = [(fetchurl {
+ url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch;
+ sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay";
+ name = "gcc47.patch";
+ })];
buildInputs =
[ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "ed-1.7";
+ name = "ed-1.9";
src = fetchurl {
url = "mirror://gnu/ed/${name}.tar.gz";
- sha256 = "0c908wb5pm48rjrrfbm5dhrqzys8f1dbvi90dn0vgwjzk80l2hl9";
+ sha256 = "122syihsx2hwzj75mkf5a9ssiky2xby748kp4cc00wzhmp7p5cym";
};
/* FIXME: Tests currently fail on Darwin:
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchgit, llvmFull }:
+{ clangStdenv, fetchgit, llvm, clang }:
clangStdenv.mkDerivation {
name = "emacs-clang-complete-async-20130218";
@@ -8,7 +8,7 @@ clangStdenv.mkDerivation {
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
};
- buildInputs = [ llvmFull ];
+ buildInputs = [ llvm clang.clang ];
installPhase = ''
mkdir -p $out/bin
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
patches = [ ./configure-python-libs.patch ];
+ postPatch = ''
+ patch -p0 < ${./spuriouscomma.patch}
+ '';
+
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
# the "Effects" menu.
@@ -1,47 +0,0 @@
-Source: upstream revisions 10061 and 10707
-
---- a/src/sp-image.cpp 2011-02-21 07:59:34 +0000
-+++ b/src/sp-image.cpp 2011-02-21 08:57:28 +0000
-@@ -387,9 +387,13 @@
-
- #if defined(PNG_iCCP_SUPPORTED)
- {
-- char* name = 0;
-+ png_charp name = 0;
- int compression_type = 0;
-- char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+ png_charp profile = 0;
-+#else
-+ png_bytep profile = 0;
-+#endif
- png_uint_32 proflen = 0;
- if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
-
---- a/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000
-@@ -1481,7 +1481,7 @@
- return NULL;
- }
- // Set error handler
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return NULL;
- }
-
---- a/src/helper/png-write.cpp 2011-08-07 10:53:12 +0000
-+++ b/src/helper/png-write.cpp 2011-10-29 20:34:00 +0000
-@@ -166,8 +166,8 @@
- /* Set error handling. REQUIRED if you aren't supplying your own
- * error hadnling functions in the png_create_write_struct() call.
- */
-- if (setjmp(png_ptr->jmpbuf)) {
-- /* If we get here, we had a problem reading the file */
-+ if (setjmp(png_jmpbuf(png_ptr))) {
-+ // If we get here, we had a problem reading the file
- fclose(fp);
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return false;
-
@@ -0,0 +1,11 @@
+--- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500
++++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600
+@@ -239,7 +239,7 @@
+ private:
+ GtkWidget *tool_toolbox;
+ GtkWidget *aux_toolbox;
+- GtkWidget *commands_toolbox,;
++ GtkWidget *commands_toolbox;
+ GtkWidget *snap_toolbox;
+
+ static void init(SPDesktopWidget *widget);
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
'';
buildInputs = [
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
cd ${name}-src
tar xf ${src}
'';
- patches = [ ./goldendict-paths.diff ];
+ patches = [ ./goldendict-paths.diff ./gcc47.patch ];
patchFlags = "-p 0";
configurePhase = ''
qmake
@@ -0,0 +1,40 @@
+From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 20 Jul 2012 03:27:38 +1000
+Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
+
+---
+ processwrapper.cc | 4 ++++
+ qtsingleapplication/src/qtlocalpeer.cpp | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git processwrapper.cc processwrapper.cc
+index f7f3f19..86b985d 100644
+--- processwrapper.cc
++++ processwrapper.cc
+@@ -2,6 +2,10 @@
+
+ #include <QtCore>
+
++#if defined(Q_OS_UNIX)
++#include <unistd.h>
++#endif
++
+ #ifdef Q_OS_WIN32
+
+ #include <windows.h>
+diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp
+index 382d182..506c142 100644
+--- qtsingleapplication/src/qtlocalpeer.cpp
++++ qtsingleapplication/src/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ namespace QtLP_Private {
+--
+1.7.11.1
+
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
};
buildInputs = [ gettext kdelibs kde_baseapps ];
+ NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
@@ -4,11 +4,11 @@ stdenv.mkDerivation {
name = "esniper-2.28.0";
src = fetchurl {
- url = "mirror://sourceforge/esniper/esniper-2-28-0.tgz";
+ url = "mirror://sourceforge/esniper/esniper-2-28-0.tgz";
sha256 = "c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b";
};
- buildInputs = [openssl curl];
+ buildInputs = [ openssl curl ];
# Add support for CURL_CA_BUNDLE variable.
patches = [ ./find-ca-bundle.patch ];
@@ -19,12 +19,11 @@ stdenv.mkDerivation {
chmod 555 "$out/bin/snipe"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Simple, lightweight tool for sniping eBay auctions";
- homepage = "http://esnipe.rsourceforge.net";
- license = "GPLv2";
-
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.simons ];
+ homepage = http://esnipe.rsourceforge.net;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lovek323 simons ];
+ platforms = platforms.all;
};
}
@@ -65,6 +65,8 @@ stdenv.mkDerivation {
)
'';
+ installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
+
enableParallelBuilding = true;
meta = {
@@ -35,7 +35,8 @@ stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
- + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");
+ + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+ + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "");
# FIXME: "make check" requires Sparse; the Makefile must be tweaked
# so that `SPARSE_FLAGS' corresponds to the current architecture...
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
configureFlags = "--with-boost-libdir=${boost}/lib";
+ NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
+
meta = {
homepage = "http://code.google.com/p/gource/";
description = "software version control visualization tool";
@@ -66,13 +66,23 @@ else
echo "$gccCFlags" > $out/nix-support/gcc-cflags
gccPath="$gcc/bin"
- ldPath="$binutils/bin"
+ # On Illumos/Solaris we might prefer native ld
+ if test -n "$nativePrefix"; then
+ ldPath="$nativePrefix/bin"
+ else
+ ldPath="$binutils/bin"
+ fi;
fi
doSubstitute() {
local src=$1
local dst=$2
+ local ld="$ldPath/ld"
+ if $ld -V 2>&1 |grep Solaris; then
+ # Use Solaris specific linker wrapper
+ ld="$out/bin/ld-solaris"
+ fi
# Can't use substitute() here, because replace may not have been
# built yet (in the bootstrap).
sed \
@@ -85,7 +95,7 @@ doSubstitute() {
-e "s^@binutils@^$binutils^g" \
-e "s^@coreutils@^$coreutils^g" \
-e "s^@libc@^$libc^g" \
- -e "s^@ld@^$ldPath/ld^g" \
+ -e "s^@ld@^$ld^g" \
< "$src" > "$dst"
}
@@ -174,6 +184,13 @@ ln -s $ldPath/as $out/bin/as
doSubstitute "$ldWrapper" "$out/bin/ld"
chmod +x "$out/bin/ld"
+# Copy solaris ld wrapper if needed
+if $ldPath/ld -V 2>&1 |grep Solaris; then
+ # Use Solaris specific linker wrapper
+ sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris"
+ chmod +x "$out/bin/ld-solaris"
+fi
+
# Emit a setup hook. Also store the path to the original GCC and
# Glibc.
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
gnatWrapper = ./gnat-wrapper.sh;
gnatlinkWrapper = ./gnatlink-wrapper.sh;
ldWrapper = ./ld-wrapper.sh;
+ ldSolarisWrapper = ./ld-solaris-wrapper.sh;
utils = ./utils.sh;
addFlags = ./add-flags;
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+set -u
+
+# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
+# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
+# but still no success.
+cmd="@ld@ -z ignore"
+
+args=("$@");
+
+# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library.
+# GNU binutils does not have this problem:
+# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter
+i=0;
+while [[ $i -lt $# ]]; do
+ case "${args[$i]}" in
+ -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;;
+ -L*) cmd="$cmd ${args[$i]}" ;;
+ *) ;;
+ esac
+ i=($i+1);
+done
+
+i=0;
+while [[ $i -lt $# ]]; do
+ case "${args[$i]}" in
+ -L) i=($i+1); ;;
+ -L*) ;;
+ *) cmd="$cmd ${args[$i]}" ;;
+ esac
+ i=($i+1);
+done
+
+# Trace:
+set -x
+exec $cmd
+
+exit 0
@@ -1,6 +1,6 @@
addCVars () {
if test -d $1/include; then
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"
fi
if test -d $1/lib64; then
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, overrides ? {} }:
let overridden = set // overrides; set = with overridden; {
# Backward compatibility.
gtkdoc = self.gtk_doc;
@@ -19,7 +19,9 @@ let overridden = set // overrides; set = with overridden; {
libglade = callPackage ./platform/libglade { };
- libgnomeprint = callPackage ./platform/libgnomeprint { };
+ libgnomeprint = callPackage ./platform/libgnomeprint {
+ bison = bison2;
+ };
libgnomeprintui = callPackage ./platform/libgnomeprintui { };
@@ -30,11 +30,11 @@ stdenv.mkDerivation {
url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg";
});
-
+
patches =
- [./pass-cxxcpp.patch]
+ [./pass-cxxcpp.patch ./siginfo_t.patch]
++ optional noSysDirs [./no-sys-dirs.patch];
-
+
inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [gmp mpfr texinfo];
@@ -0,0 +1,15 @@
+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.
Oops, something went wrong.

0 comments on commit 668310a

Please sign in to comment.