Commit graph

31813 commits

Author SHA1 Message Date
Tuomas Tynkkynen c46869f13b neko: Use dev outputs when building an include path 2016-08-30 23:16:34 +03:00
Tuomas Tynkkynen d45d243749 libbb2: Use "--enable-fat=yes" to avoid build nondeterminism
Otherwise it would pick various -march flags based on the CPU of the
compiling system, using beautiful code like this:

````
 63 AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
 64  [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
 65      int op = $1, eax, ebx, ecx, edx;
 66      FILE *f;
 67       __asm__("cpuid"
 68         : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
 69         : "a" (op));
 70      f = fopen("conftest_cpuid", "w"); if (!f) return 1;
 71      fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
 72      fclose(f);
 73      return 0;
 74 ])],

...

121       AC_CACHE_CHECK([whether avx is supported], [ax_cv_have_avx_ext],
122       [
123         ax_cv_have_avx_ext=no
124         if test "$((0x$ecx>>28&0x01))" = 1; then
125           ax_cv_have_avx_ext=yes
126         fi
127       ])
````
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen 0cfb79afac gcc6: Unify some differences with gcc5
In particular, fixes build with the new shuffled outputs.
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen 4223e83a68 tcltls: Fix reference to openssl dev output 2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen f97ba3070a gdal: Fix reference to mysql dev output 2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen e08599567a frame: Fix 'lib.optional' use
Produces a list-of-lists in buildInputs
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen d2ef0577c5 grail: Fix 'lib.optional' use
Produces a list-of-lists as buildInputs.
2016-08-30 23:00:13 +03:00
Graham Christensen 5ede656a18 Merge pull request #18114 from l2dy/patch-1
ffmpeg: 3.1.2 -> 3.1.3
2016-08-30 14:07:28 -04:00
Frederik Rietdijk 0478682f09 libsndfile: 1.0.26 -> 1.0.27 2016-08-30 18:53:31 +02:00
Julien Dehos b72dfa7b7b cxxtest: init at 4.4 2016-08-30 16:18:07 +02:00
Tuomas Tynkkynen 7259f80577 libre: Use 'dev' output of libc 2016-08-30 16:30:24 +03:00
Robin Gloster 94201919d2 Merge pull request #18121 from lancelotsix/update_gsl_2.2
gsl: 2.1 -> 2.2
2016-08-30 15:16:41 +02:00
tomberek e47a7424c9 libtelnet: init at 20160426 (#17936) 2016-08-30 14:41:17 +02:00
Tuomas Tynkkynen 73f1ade407 glibc_multi: Reference dev outputs of glibc 2016-08-30 15:18:51 +03:00
Lancelot SIX 750c1b1302
gsl: 2.1 -> 2.2
See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00015.html
for announcement and news.
2016-08-30 13:53:14 +02:00
Lancelot SIX 186f5a10f0
lush2: add missing libSM dependency 2016-08-30 13:52:59 +02:00
Daiderd Jordan a03c84538c Merge pull request #18110 from holidaycheck/nodejs-6.4.0
nodejs-6_x: 6.3.1 -> 6.4.0
2016-08-30 13:27:51 +02:00
Moritz Ulrich 70f55f9930 rust{Beta,Unstable}: Remove outdated comment. 2016-08-30 12:05:45 +02:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Zero King e35bbf108a ffmpeg: 3.1.2 -> 3.1.3 2016-08-30 09:06:18 +00:00
Lluís Batlle i Rossell 2f182cebcc Updating OCE to 0.17.2 2016-08-30 11:03:02 +02:00
Tobias Pflug 86c8a63603 nodejs-6_x: 6.3.1 -> 6.4.0 2016-08-30 08:45:35 +02:00
Tuomas Tynkkynen d75596995e swt: Fix LFLAGS
Passing '-I${foo}/lib' to GCC doesn't seem sane.
2016-08-30 03:47:50 +03:00
Tuomas Tynkkynen aef35c52f0 treewide: Fix output references to libX11 2016-08-30 03:40:23 +03:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen 01f857409f haskellPackages.hcwiid: Fix output references to bluez 2016-08-30 03:02:33 +03:00
Tuomas Tynkkynen 0836f5d3b0 erlangR14: Use dev output of openssl 2016-08-30 02:41:13 +03:00
Stewart Mackenzie 33d6e5acd5 Cargo has incorrect hash 2016-08-30 05:53:03 +08:00
aszlig 86d1953ed4
build-rebar3: Append postPatch to original hook
The postPatch attribute is already in the function argument but is
unused elsewhere in the code, so setting postPatch with buildRebar3 is
going to end up in a no-op.

This now allows to use postPatch within buildRebar3 by simply appending
to the existing postPatch hook that removes the rebar and rebar3
escripts.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ericbmerritt
2016-08-29 23:31:50 +02:00
zimbatm a7cf555e2a buildRubyGem: handle build-time ruby dependencies
For some reason `gem install` unsets the GEM_PATH environment variable
internally unless the install dir is provided. This in turn means that
if it invokes extconf.rb and extconf.rb depends on a gem available on
the GEM_PATH (like pkg-config for nokogiri) then it's not available in
that context.

Proof: d8293c4729/lib/rubygems/commands/install_command.rb (L151)
Blame: 9ea600c9c2

This is a hack that sets the :install_dir to where we would install
anyways (the GEM_HOME is the default installation destination).
2016-08-29 22:17:59 +01:00
Vladimír Čunát 4f73633f26 treewide: stop using fontbhttf 2016-08-29 22:28:50 +02:00
zimbatm b046ebbb7c rubygems: 2.6.2 -> 2.6.6 2016-08-29 19:52:40 +01:00
Vladimír Čunát f85053a021 ilmbase: fix linkage
The library was missing -pthread symbols. It wasn't failing by itself,
but e.g. blender was failing to link against is fixed now.
2016-08-29 19:40:12 +02:00
Robin Gloster 6541dfe554
wxGTK: disable format hardening 2016-08-29 17:00:34 +00:00
Ram Kromberg 3bfb354145 libsoup's vala: 0.23 -> 0.26
Close #17904.
2016-08-29 18:45:55 +02:00
Franz Pletz 04ab7cee02 Merge pull request #18088 from groxxda/fix/libcommuni
libcommuni: 2016-03-23 -> 2016-08-17, communi 2016-01-03 -> 2016-08-19
2016-08-29 18:32:16 +02:00
zimbatm 6ae57b1b63 bundler: fix usage on nested call
The combination of bundler 1.12.5 and rubygems 1.6.2 doesn't play well
at all when trying to run gems such as foreman where bundler is used to
run bundler.

Just upgrading to the latest bundler rc doesn't fix it and changing rubygems causes a massive rebuild.

Issues:

- https://github.com/bundler/bundler/issues/4402
- https://github.com/bundler/bundler/issues/4576
- https://github.com/bundler/bundler/issues/4602
- https://github.com/docker-library/ruby/issues/73

This PR patches bundler to work around the issue as highlighted here and
unbreaks everything for me:

https://github.com/bundler/bundler/issues/4602#issuecomment-233619696
2016-08-29 17:03:12 +01:00
Peter Simons 67c57a9ce5 Merge pull request #18016 from Profpatsch/spy-patch
haskellPackages.spy: fix for new fsnotify version
2016-08-29 16:55:06 +02:00
Peter Simons 486c204859 Merge pull request #18087 from YPares/stack-getlib
Haskell stack nix shell: using lib.getLib/Dev now
2016-08-29 16:54:36 +02:00
YPares 9ddcd5d456 Haskell stack nix shell: using lib.getLib/Dev now 2016-08-29 16:15:09 +02:00
Alexander Ried 07ed06f8da libcommuni: 2016-03-23 -> 2016-08-17
add missing build input (fixes build)
2016-08-29 15:37:41 +02:00
Robin Gloster 6f21201f93
rtags: git-2016-04-29 -> 2.3
should fix the darwin build
2016-08-29 13:33:36 +00:00
Vladimír Čunát f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
Tuomas Tynkkynen 69e51ebf55 kde-frameworks: Use chooseDevOutputs 2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen 89833c0c72 binutils: Shuffle outputs 2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen 2f50cfe25f qt5: Shuffle outputs
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen 040fadf345 glibc_multi: Fix unnoticed output shuffle 2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen 55fa3b52a3 php: Fix mysql reference
TODO: Fix the mysql expression so this isn't needed.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen 7c1607ae65 webkitgtk: Few last missing 'dev' references 2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen fd4b3dcccb gmp{4,5}: Split into multiple outputs
Keep all versions consistent so that e.g. 'gmp.dev' is always available,
regardless of version.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen 8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen ba6d94e6a5 ruby: dev -> devEnv
Otherwise conflicts with the convention of `dev` output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen e065baafba glibc: Make one exception for output order
Usages like '${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2' are much more
common than the bin output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Robin Gloster f3c994ca11
rhino: disable format/fortify hardening 2016-08-29 09:08:03 +00:00
Frederik Rietdijk 5da0b34591 liborc: init at 0.4.16 2016-08-29 10:35:21 +02:00
Robin Gloster f81b2da3d4
go_1_4: rename to go_bootstrap and remove refs
This has cgo disabled, so only use this for bootstrapping.
2016-08-29 01:48:55 +00:00
Robin Gloster df935b01e7
go_1_5: remove 2016-08-29 01:44:55 +00:00
Robin Gloster beff32f61e
ucommon: disable flaky networking test 2016-08-29 01:31:47 +00:00
Robin Gloster 306cd03cdb
indent: disable format hardening 2016-08-29 01:29:00 +00:00
Robin Gloster a2dd51e6a2
ocamlPackages.menhir: remove unnecessary substitution 2016-08-29 01:28:15 +00:00
Robin Gloster 4076f4d376 Merge pull request #18074 from womfoo/bump/facter-and-deps
facter: 3.1.8 -> 3.4.1 and add/update related dependencies
2016-08-29 01:22:28 +00:00
Franz Pletz 675848419e
go_1_5: set CGO_ENABLED=0 to cope with binutils 2.27 version bump
See 6eb4014874 and
https://github.com/golang/go/issues/16906.

cc @obadz @cstrahan @edolstra @lancelotsix @globin
2016-08-29 03:01:49 +02:00
Kranium Gikos Mendoza 4eb021baff leatherman: 0.7.5 -> 0.9.0 2016-08-29 08:56:06 +08:00
Kranium Gikos Mendoza 1bac115b05 cpp-hocon: init at 0.1.2 2016-08-29 08:55:40 +08:00
Robin Gloster e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Lancelot SIX bbf1fdf4e7 gnuapl: 1.5 -> 1.6 (#18060)
Release announcement:
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00014.html
2016-08-28 23:49:30 +00:00
Joachim Fasting f16d3800e1
io: disable i686 build
io uses SIMD instructions even on i686, causing the build to fail:

> /nix/store/[...]-gcc-5.4.0/lib/gcc/i686-pc-linux-gnu/5.4.0/include/xmmintrin.h:181:1:
error: inlining failed in call to always_inline '_mm_add_ps': target
specific option mismatch
 _mm_add_ps (__m128 __A, __m128 __B)

(from https://hydra.nixos.org/build/37879114/log/raw)

The simplest solution is to disable the build on this platform.
2016-08-29 01:10:37 +02:00
Domen Kožar 5793a14c36 release.nix: tiny improvements on top of #18059 2016-08-28 18:18:44 +02:00
Tuomas Tynkkynen d1c7eb8098 glibc: Uncomment 'meta.platforms' 2016-08-28 18:04:09 +03:00
Franz Pletz ed0eb59cb5
go: remove unused expressions for 1.1, 1.2, 1.3 2016-08-28 16:08:03 +02:00
Robin Gloster f86c5bc6fa ghcHEAD: remove included patch 2016-08-28 14:03:12 +00:00
obadz 92d929c884 Merge branch 'master' into staging 2016-08-28 14:48:02 +01:00
Thomas Tuegel 43bf5d2c30 Merge pull request #18052 from loskutov/master
Qt5: Enable Wayland support
2016-08-28 07:38:23 -05:00
Thomas Tuegel b8a83d901f qt5: use absolute paths to plugins in CMake
This reverts commit 17f9b21c09.

This is a partial unrevert. Qt 5.6 and Qt 5.7 remain building and
working. Qt 5.5 stays building but broken.
2016-08-28 07:33:42 -05:00
obadz 6eb4014874 go_1_4: set CGO_ENABLED=0 to cope with binutils 2.27 version bump
See also https://github.com/golang/go/issues/16906
cc @cstrahan @edolstra @lancelotsix @globin @fpletz
2016-08-28 13:29:44 +01:00
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Moritz Ulrich 17f9b21c09 Revert "qt5: use absolute paths to plugins in CMake"
This reverts commit 7a9e04943d.

The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
2016-08-28 12:29:20 +02:00
David Guibert dfb3707dab h5py: 2.5.0 -> 2.6.0
Tests are broken in 2.5.0 (errors when executing "cythonize()"), not in
version 2.6.0.
2016-08-28 11:42:21 +02:00
Gabriel Ebner 497b3cabcc libqalculate, qalculate-gtk: 0.9.8 -> 0.9.9 2016-08-28 10:40:33 +02:00
Ignat Loskutov cc83045026 Qt5: Enable Wayland support 2016-08-28 00:57:43 -04:00
obadz ed01e0ca4f openssl: fix merge conflict between b6dabe3 and 6e7ca92 2016-08-28 03:53:13 +01:00
Shea Levy f168030af1 haskellPackages.unbound: 0.5.0 -> 0.5.1 2016-08-27 19:35:47 -04:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Nikolay Amiantov 9fa012dee5 SDL_ttf: don't link itself to /include 2016-08-28 01:04:18 +03:00
Robin Gloster 193a57fa48
noweb: remove obsolete substituteInPlace 2016-08-27 21:54:55 +00:00
Thomas Tuegel 7a9e04943d
qt5: use absolute paths to plugins in CMake
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Rok Garbas 1102352a79 Merge pull request #17906 from garbas/neovim-0.1.5-update
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
2016-08-27 17:44:34 +02:00
Vladimír Čunát 069120110d Merge #18013: gnumeric: 1.12.26 -> 1.12.32
It seems fine on Linux, except for gtk3 theming problems but that looks
the same as before the update.
2016-08-27 17:18:05 +02:00
Michael Raskin f3a86cf599 loadcaffe: init at 0.0pre2016.08.01 2016-08-27 15:41:58 +02:00
Michael Raskin 2e0c1c3758 torch: find libjpeg and libpng, use compatible openblas 2016-08-27 15:41:58 +02:00
Peter Simons 44289f81e9 Merge pull request #18022 from mboes/ghcHEAD
haskell.compiler.ghcHEAD: update to latest upstream (20160826).
2016-08-27 12:34:14 +02:00
Robin Gloster e646d2c07c
gnome3.gtk: fix build on darwin
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
Moritz Ulrich 8cd3e1e2ba rustc: 1.10.0 -> 1.11.0 and beta/unstable updates.
Give cargo the right name.

Fix versioning.

rustBeta: -> 2016-08-17

Looks like rustUnstable.rustc needs *exactly* this version.
2016-08-27 08:24:16 +02:00
Mathieu Boespflug 5f8891153b haskell.compiler.ghcHEAD: update to latest upstream (20160826). 2016-08-26 21:15:04 +02:00
Thomas Tuegel 3a98be5e19
poppler: 0.46.0 -> 0.47.0 2016-08-26 12:43:22 -05:00
Robin Gloster fee9b3410e Merge pull request #18014 from zimbatm/buildGoPackage-1.7
Build go package 1.7
2016-08-26 15:41:08 +00:00
Eelco Dolstra c8a7e0b540 Merge pull request #18006 from lancelotsix/update_binutils_2_27
binutils: 2.26.1 -> 2.27
2016-08-26 17:27:04 +02:00
Robin Gloster e0deed0110
ghc: add comment to relocation patch 2016-08-26 15:19:37 +00:00