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
Franz Pletz
1585e0f09b
sqlite: 3.13.0 -> 3.14.1
2016-08-26 17:08:04 +02:00
Frederik Rietdijk
3de68a3979
pythonPackages.dbus: missing test dependency
2016-08-26 16:59:27 +02:00
Robin Gloster
77473cda6b
ghc: add relocation patch for all versions
2016-08-26 14:57:46 +00:00
Profpatsch
70ed0fd3de
haskellPackages.spy: fix for new fsnotify version
...
Temporary fix, until it is merged upstream.
2016-08-26 16:21:30 +02:00
zimbatm
db3de7a900
leaps: mark as broken
...
The package sha256 is wrong. After fixing it the build has dependency
issues like:
go/src/github.com/jeffail/leaps/cmd/leaps/bindata_assetfs.go:203:2:
cannot find package "github.com/elazarl/go-bindata-assetfs" in any
of:
/cc @qknight
2016-08-26 13:46:05 +01:00
Graham Christensen
40ddf70666
Merge pull request #18009 from matthiasbeyer/update-rustfmt
...
rustfmt: 0.4 -> 0.6
2016-08-26 08:29:17 -04:00
Matthias Beyer
ae428c6411
rustfmt: 0.4 -> 0.6
2016-08-26 14:17:14 +02:00
Vincent Laporte
3a710c068f
gnumeric: 1.12.26 -> 1.12.32
...
goffice: 0.10.26 -> 0.10.32
2016-08-26 13:36:58 +02:00
Zero King
f7823dde4f
ffmpeg: 3.1.1 -> 3.1.2
2016-08-26 09:05:43 +00:00
Robin Gloster
b6dabe3df0
openssl_1_1_0: init at 1.1.0
2016-08-26 07:39:18 +00:00
Michael Stone
b9a4da47c0
go: fix on darwin, make go-1.7 build with clang-3.8. ( #18001 )
...
The darwin stdenv currently provides clang-3.7; however,
a) go-1.7 currently expects a compiler that supports "-fdebug-prefix-map"
arguments (which clang-3.8 supports but clang-3.7 does not) and
b) even with clang-3.8, go-1.7 misinterprets the result of its runtime probes
for support for the "-no-pie" flag, thereby failing to build runtime/cgo.
This patch resolves (a) by building go-1.7 with clang-3.8 and resolves (b) by
teaching go how to correctly probe "-no-pie" error messages from clang.
2016-08-26 07:36:06 +00:00
Markus Hauck
df343d4824
scalafmt: 0.2.11 -> 0.3.1 ( #18004 )
2016-08-26 07:03:41 +00:00
Lancelot SIX
0c12ae5615
binutils: 2.26.1 -> 2.27
...
Release announcement at
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00012.html
2016-08-26 08:51:09 +02:00
Robin Gloster
29649b93b8
arcanist: 20160516 -> 20160825
2016-08-25 23:27:56 +00:00
Robin Gloster
5bbe7881a4
hhvm: 3.12.1 -> 3.14.5
2016-08-25 23:27:55 +00:00
Graham Christensen
355cc31229
Merge pull request #17962 from vbgl/inkscape-darwin
...
inkscape: fix on darwin (fixes #15768 )
2016-08-25 18:14:42 -04:00
Moritz Ulrich
78305bc5a1
Merge pull request #17944 from steveeJ/racerd-bump
...
rust: bump registry and racerd
2016-08-26 00:03:34 +02:00
Vladimír Čunát
801692c3dd
Merge #17928 : openssl: fix CVE-2016-2177
2016-08-25 22:22:00 +02:00
Robin Gloster
eabef9420a
re2c: 0.14.3 -> 0.16
2016-08-25 16:07:40 +00:00
Bjørn Forsman
fbf9162cbb
treewide: cups_filters -> cups-filters
2016-08-25 17:48:35 +02:00
Thomas Tuegel
f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions
2016-08-25 10:07:03 -05:00
Vincent Laporte
b4b244de2a
cairomm: fix on darwin
2016-08-25 15:39:52 +02:00
Robin Gloster
eddc0a5549
treewide: fix darwin builds by using getOutput
...
This fixes eval for pkgs referring to optional static output
2016-08-25 08:44:20 +00:00
Franz Pletz
113fbe910e
spidermonkey_1_8_0rc1: disable pic hardening on i686
2016-08-25 05:01:41 +02:00
Franz Pletz
df275f5b85
treewide: fix darwin builds by referring to stdenv's libc
2016-08-25 02:56:25 +02:00
Robin Gloster
bb2824c68e
webkitgtk: 2.12.3 -> 2.12.4
...
Security fixes: CVE-2016-4622, CVE-2016-4624, CVE-2016-4591,
CVE-2016-4590.
2016-08-25 00:11:33 +00:00
Robin Gloster
9ed7196eac
php70: 7.0.9 -> 7.0.10
2016-08-25 00:02:48 +00:00
Robin Gloster
765e1e30ba
php56: 5.6.24 -> 5.6.25
2016-08-25 00:00:48 +00:00
Robin Gloster
07b8f53612
php55: remove unmaintained version
...
Does not receive security updates from upstream
2016-08-25 00:00:48 +00:00
Robin Gloster
ddcf70482c
gcc6: 6.1.0 -> 6.2.0
2016-08-25 00:00:48 +00:00
Franz Pletz
9de5d8ff0f
libseccomp: 2.3.0 -> 2.3.1
2016-08-25 01:55:42 +02:00
Franz Pletz
bd739d1fae
pypy: disable pic hardening on i686
2016-08-25 01:54:55 +02:00
Nikolay Amiantov
0859b1e119
folly: fix license
...
Fixes #17977 .
2016-08-25 02:30:28 +03:00
Robin Gloster
f0b53ac245
ctpp2: use default gcc
2016-08-24 22:41:41 +00:00
Jaka Hudoklin
052a913bcd
Merge pull request #17951 from juliendehos/cppcms
...
cppcms: init at 1.0.5
2016-08-24 23:35:54 +02:00
Jaka Hudoklin
d919184fad
Merge pull request #17953 from juliendehos/cppdb
...
cppdb: init at 0.3.1
2016-08-24 23:35:24 +02:00
Robin Gloster
423e67b299
automake110x: remove unused package
2016-08-24 21:07:59 +00:00
Franz Pletz
1bb15303ca
prelink: fix glibc static linking
2016-08-24 21:31:02 +02:00
Franz Pletz
237320190e
haskellPackages.git-annex: fix hash
2016-08-24 21:31:02 +02:00
Robin Gloster
210b94da49
belle-sip: 1.4.1 -> 1.4.2 and fix with new glibc
2016-08-24 18:31:30 +00:00
Robin Gloster
2b4438c294
maude: disable pic and fortify hardening on i686
2016-08-24 18:29:36 +00:00
Franz Pletz
e8d9e31a08
valum: 0.2.0 -> 0.2.16, fixes hardened build
2016-08-24 20:18:46 +02:00
Franz Pletz
647b2ce168
lua5_0: disable stackprotector hardening on i686
2016-08-24 19:25:19 +02:00
Franz Pletz
bd0b68f59a
go_1_7: disable all hardening
2016-08-24 16:52:56 +02:00
Peter Simons
e9f62d890c
hackage-packages.nix: fix syntax error
2016-08-24 16:01:06 +02:00
Peter Simons
4b343f84f7
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-23-ga0c4861 using the following inputs:
- Hackage: cfc500652f
- LTS Haskell: 8678a3c7f3
- Stackage Nightly: a0f3555d1f
2016-08-24 15:57:57 +02:00
Peter Simons
72133e05f4
configuration-hackage2nix.yaml: enable builds of language-puppet
...
Fixes https://github.com/NixOS/nixpkgs/issues/14929 .
2016-08-24 15:46:39 +02:00
Peter Simons
0bdea44537
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:
- Hackage: 729f27336e
- LTS Haskell: a23e74ee23
- Stackage Nightly: 4a0b9e146a
2016-08-24 15:46:32 +02:00
Shea Levy
8b9b9fad31
Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
...
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.
Next time I'll do this right after the revert instead of so far down the line...
This reverts commit 9adad8612b
.
2016-08-24 07:35:30 -04:00
obadz
78b7529ee3
Merge branch 'master' into staging
2016-08-24 11:57:44 +01:00
zimbatm
4d4980d9f8
Merge pull request #17805 from avnik/update/golang-1.7
...
go: add 1.7 compiler
2016-08-24 11:28:25 +01:00
Daniel Peebles
3f337a2b23
Merge pull request #17685 from matthewbauer/darwin-misc2
...
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Julien Dehos
c35ce47143
cppdb: init at 0.3.1
2016-08-24 10:47:56 +02:00
Julien Dehos
eac69059fc
cppcms: init at 1.0.5
2016-08-24 09:36:17 +02:00
Stefan Junker
9acd218a9e
rust racerd: 0.1.1 -> 2016-08-23
2016-08-23 21:25:48 +02:00
Franz Pletz
6303b6eb1c
czmq: fix bad merge
...
9db5362270
vs. 9e211203da
2016-08-23 20:02:38 +02:00
obadz
8da8aa7ddb
Merge branch 'hardened-stdenv' into staging
2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Franz Pletz
17234ca073
ccl: fix hash
2016-08-23 18:28:38 +02:00
Robin Gloster
9e211203da
czmq: fix build
...
Uses -Werror, failing with additionally enabled warnings from hardening.
2016-08-23 15:51:26 +00:00
Nikolay Amiantov
13c04c837d
wrapPython: fix replace of env invokations
2016-08-23 17:55:12 +03:00
Joachim F
56bfc0240e
Merge pull request #17766 from NeQuissimus/gradle30
...
gradle: 2.14.1 -> 3.0, keep 2.14.1
2016-08-23 16:22:05 +02:00
Moritz Ulrich
08933f8a07
leiningen: Simplify build.
2016-08-23 12:38:24 +02:00
zimbatm
a1460473cb
buildRubyGem: don't set the GEM_HOME
...
bundler for example needs to have the GEM_HOME being passed trough to
function properly.
For gems that are loading content dynamically, or can use plugins, use
buildRubyGem.
For executables that are wrapped in their own sealed thing use
bundlerEnv.
2016-08-23 09:30:49 +01:00
Tuomas Tynkkynen
07491d68c3
treewide: Fix output references to ncurses
2016-08-23 04:53:24 +03:00
Tuomas Tynkkynen
cfd18c85a4
geant: Clean up a bit
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen
a18ee4acb7
treewide: Make explicit that 'dev' output of boost is used
...
Also fix one incorrect output in geant.
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen
dcbd607682
opa: Use makeBinPath
2016-08-23 03:54:23 +03:00
Tuomas Tynkkynen
984e04d733
treewide: Make explicit that 'dev' output of mpfr is used
2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen
1c761150f7
treewide: Make explicit that 'dev' output of libmysql is used
2016-08-23 03:52:06 +03:00
Tuomas Tynkkynen
526aee8340
treewide: Make explicit that 'dev' output of gst_all_1.gstreamer is used
2016-08-23 03:52:06 +03:00
Tuomas Tynkkynen
c08364b887
treewide: Make explicit that 'dev' output of gmp is used
2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen
4452ef42ac
treewide: Make explicit that 'dev' output of cairo is used
2016-08-23 03:52:04 +03:00
Alexey Shmalko
6e7ca9272e
openssl: fix CVE-2016-2177
2016-08-23 03:41:03 +03:00
Tuomas Tynkkynen
cc7c9f5676
treewide: Make explicit that 'dev' output of SDL is used
2016-08-23 03:26:46 +03:00
Tuomas Tynkkynen
501da21acc
julia: Reference correct output of curl
2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen
9765f40a39
opendylan: Use correct output of boehmgc
2016-08-23 03:20:21 +03:00