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
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
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