Commit Graph

28115 Commits

Author SHA1 Message Date
Charles Strahan
cb6beb1eb3 ghcjs: build haddock documentation
From building reflex-dom (which has quite a few dependencies), it would
appear that building the documentation no longer fails.
2016-01-25 20:16:12 -05:00
Tobias Geerinckx-Rice
0c25292648 vorbis-tools: rename from old-style vorbisTools 2016-01-26 01:35:55 +01:00
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vincent Laporte
c0691a0659 compcert: 2.5 -> 2.6 2016-01-25 11:48:47 +01:00
Vladimír Čunát
1f2b819783 binutils: extend meta.platforms to unix to fix #12606
Also refactor meta.
Maybe we could have platforms.all in there, but I leave it here.
2016-01-25 11:18:10 +01:00
Jude Taylor
c473bea69a Merge pull request #12603 from zimbatm/ruby-fixes
Ruby fixes
2016-01-24 22:48:14 -08:00
Tobias Geerinckx-Rice
c5bb4f503b libconfuse: init at 2.8 2016-01-25 02:48:27 +01:00
zimbatm
e9eda43928 buildRubyGem: fix missing libobjc in darwin
This was preventing any ruby gem with a c extension to build.

mkmf would fail with a misleading error:

    /nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
    You have to install development tools first.
2016-01-24 23:15:40 +00:00
zimbatm
9a55295c49 buildRubyGem: fix NoMethodError
generate_stub doesn't exist and the output is not used in the code so I just
removed the line.

This was preventing the binstubs from generating properly.
2016-01-24 23:14:00 +00:00
Charles Strahan
95d892ec26 ghcjs: update and fix ghcjs/reflex libs
Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
2016-01-24 17:13:45 -05:00
Arseniy Seroka
d6d22151fa Merge pull request #12588 from dezgeg/pr-binutils-platforms
binutils: Add platforms
2016-01-24 23:12:14 +03:00
Peter Simons
afba955d21 Merge pull request #12598 from cstrahan/haskell-post-patch
haskell-packages: properly set postPatch
2016-01-24 21:06:52 +01:00
Tobias Geerinckx-Rice
76b2ffbb08 Merge pull request #12587 from timbertson/gup
gup: 0.5.1 -> 0.5.3
2016-01-24 20:48:38 +01:00
Eric Seidel
dd6d4ca8cc racket: change meta.platorms to unix 2016-01-24 11:33:34 -08:00
Tobias Geerinckx-Rice
d39f16fee6 pythonPackages.pelican: fix tests with Pygments 2.1
Broken in 38c83e2916.
I'll open an upstream PR with this patch as well.
2016-01-24 19:43:54 +01:00
Charles Strahan
4fd985b9ae haskell-packages: properly set postPatch
The existing code overrode the postPatch, instead of combining the
jailbreak commands with the user supplied postPatch.
2016-01-24 13:32:56 -05:00
Charles Strahan
700e4aebdc ghcjs: fix the build 2016-01-24 13:28:24 -05:00
Frederik Rietdijk
9441311e93 pythonPackages.pylint: 1.4.1 -> 1.5.4 2016-01-24 14:34:06 +01:00
Frederik Rietdijk
e0d0f8dbd2 pythonPackages.setuptools and bootstrapped-pip: 18.2 -> 19.4
Update to latest setuptools. Latest setuptools will always try to run tests.
This can cause some very vague errors. We now need to fix all packages where we do not
invoke the correct test runner.
2016-01-24 14:34:01 +01:00
Edward Tjörnhammar
e8cc9204a8 Merge pull request #12568 from gebner/idea-openjdk8
idea: fix problems with openjdk8
2016-01-24 10:29:54 +01:00
Tuomas Tynkkynen
f62dbc0121 binutils: Add platforms
There are some variants of binutils in all-packages.nix that aren't
getting built by Hydra currently.
2016-01-24 08:47:46 +02:00
Tim Cuthbertson
b82d5ef857 gup: 0.5.1 -> 0.5.3 2016-01-24 16:34:07 +11:00
Patrick Mahoney
9790094f23 libgdiplus: build on darwin 2016-01-23 21:49:50 -06:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Gabriel Ebner
b47d2f8029 openjdk8: do not symlink icc profiles 2016-01-23 13:22:48 +01:00
Eric Seidel
2e62f785d4 racket: fix on darwin 2016-01-22 17:38:11 -08:00
Peter Simons
ecc48af0ce hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: a28e076b47
  - Hackage: c63083af59
  - LTS Haskell: cf055c2754
  - Stackage Nightly: 8f10b44c12
2016-01-22 22:23:00 +01:00
Franz Pletz
0d13b93047 Merge pull request #12496 from exi/id3lib-patch
add id3lib easytag patch for proper unicode handling.
2016-01-22 17:34:48 +01:00
Vladimír Čunát
0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
Domen Kožar
542bf5bf41 elm: recurseIntroAtrs and use GHC 7.10.3 2016-01-22 13:39:18 +01:00
zimbatm
c38fae0a2c packer: 0.7.5 -> 0.8.6 2016-01-21 23:17:54 +00:00
Lluís Batlle i Rossell
082f2e6938 go builder: respect enableParallelBuilding
It was parallelizing for $NIX_BUILD_CORES regardless of
enableParallelBuilding.
2016-01-21 17:11:28 +01:00
aszlig
c92d7481a5
multipath_tools: Rename to multipath-tools
See http://nixos.org/nixpkgs/manual/#sec-package-naming

I've added an alias for multipath_tools to make sure that we don't break
existing configurations referencing the old name.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 16:18:38 +01:00
Tobias Geerinckx-Rice
1bd1aea84e Merge pull request #12113 from bnikolic/wcslib
wcslib: init at 4.25
2016-01-21 15:59:08 +01:00
Luca Bruno
439b56d5f0 Merge pull request #12506 from gilligan/update-nodejs-v5
nodejs: 5.1.1 -> 5.4.1
2016-01-21 12:48:39 +01:00
Vladimír Čunát
3317eef084 Merge #12414: qutebrowser: fix various things 2016-01-21 11:56:50 +01:00
Tobias Pflug
a265c8a05d nodejs: 5.1.1 -> 5.4.1 2016-01-21 10:31:18 +01:00
Robin Gloster
abdd8a81eb Merge pull request #12513 from nckx/master
Update & fix Sphinx [PR for Travis testing]
2016-01-21 05:30:02 +01:00
Tobias Geerinckx-Rice
9f6ca0fe15 pythonPackages.sphinx: fix tests with Pygments 2.1
Close #12511.
2016-01-21 04:11:57 +01:00
Tobias Geerinckx-Rice
67c487f243 pythonPackages.sphinx: 1.3.1 -> 1.3.4
Mainly bugfixes. Far too many to summarise here:
http://www.sphinx-doc.org/en/stable/changes.html#release-1-3-4-released-jan-12-2016
2016-01-21 04:11:05 +01:00
aszlig
39a07cabe8
gpgme: Use fixed path for GnuPG binaries
By default, GPGME tries to search in $PATH for the gpg and gpgconf
binaries. This has the downside, that the library won't work by its own
and needs to have GnuPG in systemPackages or the user environment.

I've stumbled on this while working on one of the dependencies of
nixos-assimilate and nixpart (volume_key), where the testing environment
didn't come with GnuPG in $PATH and thus the tests have failed.

After testing this with a few programs using GPGME, I haven't found any
weird behavior in conjunction with the GnuPG agent.

However one possible implication could be that if the GnuPG used in
$PATH (and the config files in the user's home directory) should be
vastly incompatible, it could lead to failures.

In practice however, the GnuPG1/2 versions pretty much seem to stay
compatible within their major releases so it shouldn't pose a problem.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 01:39:18 +01:00
Bojan Nikolic
6271300819 wcslib: init at 5.12 2016-01-20 21:35:58 +00:00
Arseniy Seroka
cd6fc0ded2 Merge pull request #12503 from kamilchm/nim-update
nim: 0.11.2 -> 0.13.0
2016-01-20 22:37:31 +03:00
Matthijs Steen
7f58e162bc guake: init at 0.8.3 (close #11027)
There's a catch noted at the top of the expression.
(vcunat moved it there from the commit message)
2016-01-20 19:33:48 +01:00
Kamil Chmielewski
c46625f98e nim: 0.11.2 -> 0.13.0 2016-01-20 17:48:45 +01:00
Rok Garbas
b19d702b65 oraclejdk: 8u65, 8u66 -> 8u71, 8u72, fixes #12498 2016-01-20 16:10:36 +01:00
Peter Simons
23c5fbf7cb Use latest version of async when compiling with GHC 8.0.x. 2016-01-20 14:33:37 +01:00
Peter Simons
18916022e4 haskell-hspec: update overrides for LTS 4.2 2016-01-20 14:33:37 +01:00
Peter Simons
4e75d74aaf hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 4f74881496
  - Hackage: b70bc194ef
  - LTS Haskell: cf055c2754
  - Stackage Nightly: 3184791ff4
2016-01-20 14:33:18 +01:00
Reno Reckling
b5c2587698 add id3lib easytag patch for proper unicode handling.
This patch is directly taken from easytag. id3lib is not maintained any longer
and the last release is 13 years old.
This patch fixes some unicode issues.
2016-01-20 13:08:28 +01:00
Tobias Geerinckx-Rice
72cd96a0e1 libpsl: list 2016-01-09 -> 2016-01-15 2016-01-20 09:21:44 +01:00
Rok Garbas
4f40a45426 oraclejdk8: 8u65 -> 8u72 2016-01-20 04:42:30 +01:00
Dan Peebles
48513dfb22 nodejs: remove unreferenced patchfile 2016-01-19 22:29:02 -05:00
Dan Peebles
5cb1e43fd6 nodejs-5: fix on darwin
Turns out the darwin-flavored patches aren't needed anymore.

Fixes #12305
2016-01-19 22:28:42 -05:00
Rok Garbas
dd9bad4aa4 rubygems: 2.4.1 -> 2.4.8, fixes #8492 2016-01-20 03:36:36 +01:00
Peter Simons
82b464820e Merge pull request #12473 from gleber/update-erlang-hex-packages
Erlang: update tooling and hex packages
2016-01-19 22:18:32 +01:00
Vladimír Čunát
a7ca9c2105 Revert "glib: fix compilation on SmartOS/Illumos (close #12477)"
This reverts commit 3f9ff30f6d.
Let's go without changing hash instead: e67717bc8d
2016-01-19 17:39:35 +01:00
Danny Wilson
e67717bc8d glib: fix compilation on SmartOS/Illumos (close #12479)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 17:38:44 +01:00
Danny Wilson
3f9ff30f6d glib: fix compilation on SmartOS/Illumos (close #12477)
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
2016-01-19 16:06:49 +01:00
Arseniy Seroka
5f767b2580 Merge pull request #12462 from wizeman/u/add-fstar
fstar: init at 2016-01-12
2016-01-19 16:41:44 +03:00
Gleb Peregud
73c8aa49e4 Update hex-packages.nix with hermetic rebar3.
This made some packages not build, because rebar3 tries to download
`rebar3_hex` for them.
2016-01-19 12:58:43 +01:00
Gleb Peregud
6dc5dc1068 rebar3-nix-bootstrap: 0.0.2 -> 0.0.3 2016-01-19 12:58:33 +01:00
Gleb Peregud
28fc526f16 Update Erlang hex.pm packages at 2016-01-19.
This is a first fully automatic build.
2016-01-19 12:36:52 +01:00
Peter Simons
cdd07d166b uhc: the build is broken (and will be for the foreseeable future) 2016-01-19 11:10:29 +01:00
Vladimír Čunát
315745094c Merge #11535: protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2 2016-01-19 08:25:44 +01:00
Vladimír Čunát
37598195e5 protobuf-3.0: enableParallelBuilding = true
Otherwise it takes quite a long time to build.
2016-01-19 08:24:55 +01:00
Ricardo M. Correia
097c82f6c5 fstar: init at 2016-01-12 2016-01-19 01:46:30 +01:00
Gleb Peregud
8d6dd873a9 rebar3-nix-bootstrap: 0.0.1 -> 0.0.2 2016-01-18 23:13:40 +01:00
Gleb Peregud
a7f7698e04 hex2nix: 0.0.2 -> 0.0.3 2016-01-18 23:13:40 +01:00
Damien Cassou
61d7fde27c Merge pull request #12425 from DamienCassou/pharo-vm-no-conflict-v3
Refactor Pharo to allow co-installation of VMs
2016-01-18 20:40:30 +01:00
Damien Cassou
d422861055 Refactor Pharo to allow co-installation of VMs 2016-01-18 20:14:19 +01:00
Vladimír Čunát
4c1e9ffd12 gmock: refactor source 2016-01-18 18:45:03 +01:00
Eric Merritt
8021b5241c rebar3: refactor to make hermetic
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
2016-01-18 08:19:15 -08:00
Franz Pletz
55fc3acfcb Merge pull request #12159 from rasendubi/ycmd
ycmd: Init at 2016-01-12
2016-01-18 14:11:22 +01:00
Vladimír Čunát
9fc8766eaf telepathy-qt: fixup build with qt5
I only tested building with qt4, which turned out to be a mistake.
2016-01-18 12:25:27 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
vbgl
c23b0856fd Merge pull request #12064 from FlorentBecker/eliom42
Eliom42
2016-01-18 09:32:48 +01:00
Eduard Bachmakov
352ff0be29 protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2
Also split out gmock's source so that it can be copied into protobuf's
source. Hopefull this hack can be removed again once gmock is replaced
by gtest.

This does not include python bindings.
2016-01-18 00:43:21 -05:00
Tobias Geerinckx-Rice
48fad440f1 Merge pull request #12448 from jb55/terra-patch
terra: init at git-2016-01-06
2016-01-18 03:48:36 +01:00
Tobias Geerinckx-Rice
5db2412159 Merge pull request #12447 from gpyh/fix-android-build-tools
Renamed subdirectories in Android SKD's build-tools
2016-01-18 02:35:59 +01:00
William Casarin
e66965fdee terra: init at git-2016-01-06 2016-01-17 17:30:01 -08:00
Tobias Geerinckx-Rice
f0cc8f9ec5 4suite: remove dead package
Project abandoned in 2006. Broken since June 2014.
2016-01-18 01:41:57 +01:00
Tobias Geerinckx-Rice
837594fe6b Merge pull request #12363 from expipiplus1/llvm-enable-shared
llvm: Add enableSharedLibraries option to 3.5 and 3.6
2016-01-18 01:41:25 +01:00
Yacine Hmito
1d8313042d Renamed subdirectories in Android SKD's build-tools
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
2016-01-18 00:42:54 +01:00
Robin Gloster
ba4b4752f2 racerRust: 1.0.0 -> 1.1.0 2016-01-17 22:05:25 +00:00
Peter Simons
1ab1c7166b Merge pull request #12444 from erlang-nix/propagate-build-plugins
Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
2016-01-17 22:36:11 +01:00
Gleb Peregud
ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap.
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
2016-01-17 21:59:27 +01:00
Mateusz Kowalczyk
2be0338ec3 Merge pull request #12329 from luke-clifton/gsasl-krb5
Bring in krb5 for darwin builds seeing as we use
2016-01-17 17:38:50 +00:00
Arseniy Seroka
a69192df2b Merge pull request #12431 from henrytill/racket-6.3
racket: 6.2.1 -> 6.3, add parameter to enable building docs
2016-01-17 18:36:44 +03:00
Nikolay Amiantov
8bc95895e1 openmpi: remove enableStatic while it's still hot
Eelco showed alternative way of building static libraries via
stdenv adapter in a conversation several days ago and expressed
concern about adding new enableStatic flags.
2016-01-17 15:07:51 +03:00
Domen Kožar
e16ed8c579 Merge pull request #12287 from abbradar/openmpi
openmpi: 1.6.5 -> 1.10.1
2016-01-17 12:59:05 +01:00
Peter Simons
f62bcff14d configuration-hackage2nix.yaml: update list of broken packages 2016-01-17 12:29:03 +01:00
Peter Simons
9815d92d91 haskell-generic-builder: GHC 8.0.x wants --disable-profiling instead of --disable-executable-profiling 2016-01-17 12:29:03 +01:00
Peter Simons
1c74ad9f04 haskell-transformers-compat: use latest version when building with GHC 8.0.x. 2016-01-17 12:29:02 +01:00
Peter Simons
d3d0978abf darcs: remove obsolete overrides 2016-01-17 12:29:02 +01:00
Peter Simons
1c4666409c hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: 3a04b0b2d4
  - Hackage: e505b113f6
  - LTS Haskell: e72964a553
  - Stackage Nightly: 14a3a2d00e
2016-01-17 12:27:33 +01:00
Vladimír Čunát
4a097fdc3f ffmpeg-2.2: remove this vulnerable branch
Upstream doesn't maintain it anymore and it's unused in nixpkgs.
/cc #12437.
2016-01-17 11:45:10 +01:00
Vladimír Čunát
85628148de ffmpeg(-2.8): security update to fix #12437
2.8.5 is claimed to fix CVE-2016-{1897,1898}.
2016-01-17 09:56:32 +01:00
Henry Till
00f394e2a9 racket: 6.2.1 -> 6.3 2016-01-16 15:57:23 -05:00
Henry Till
6fc61a173e racket: add parameter to enable building docs 2016-01-16 15:57:02 -05:00
Peter Simons
fc32bc1963 Merge pull request #12429 from erlang-nix/fix-rebar3-nix-bootstrap-shebang
Make rebar3-nix-bootstrap depend on erlang.
2016-01-16 19:47:40 +01:00
Gleb Peregud
0692c6a96d Make rebar3-nix-bootstrap depend on erlang.
This fixes patchShebangs ability to properly fix up path to escript
binary.
2016-01-16 18:53:48 +01:00
Damien Cassou
351ae1bd24 Merge pull request #12427 from DamienCassou/launcher-0.2.9
pharo-launcher: 0.2.8 -> 0.2.9
2016-01-16 18:31:13 +01:00
Damien Cassou
6c6bf8790d pharo-launcher: 0.2.8 -> 0.2.9 2016-01-16 18:30:11 +01:00
Arseniy Seroka
5042e323be Merge pull request #12412 from eduarrrd/qtcreator
qtcreator: 3.5.1 -> 3.6.0
2016-01-16 19:52:55 +03:00
Peter Simons
3ec7fa20fb Improve GHC 8.0.x package set configuration. 2016-01-16 17:42:18 +01:00
Peter Simons
7824b8c330 Merge pull request #12409 from erlang-nix/master
Improvements for Erlang support in Nix
2016-01-16 15:25:06 +01:00
Gabriel Ebner
c7e48a3eb8 libsoup: 2.50.0 -> 2.52.2 2016-01-16 08:51:38 +01:00
Gabriel Ebner
e8980608c6 glib-networking: 2.44.0 -> 2.46.1 2016-01-16 08:40:44 +01:00
aszlig
8f793ce6bb
elfutils: Fix header compatibility with glibc 2.21
Regression introduced by df2b9b48cb.

This breaks the build for ltrace and other programs using libelf,
because the header file relies on features from glibc >= 2.22.

Here is an excerpt from the log output of the configure script from
ltrace:

In file included from ...elfutils-0.165/include/gelf.h:32:0,
                 from conftest.c:57:
...elfutils-0.165/include/libelf.h:280:8: error: unknown type name 'Elf32_Chdr'
 extern Elf32_Chdr *elf32_getchdr (Elf_Scn *__scn);
        ^
...elfutils-0.165/include/libelf.h:281:8: error: unknown type name 'Elf64_Chdr'
 extern Elf64_Chdr *elf64_getchdr (Elf_Scn *__scn);
        ^
In file included from conftest.c:57:0:
...elfutils-0.165/include/gelf.h:89:9: error: unknown type name 'Elf64_Chdr'
 typedef Elf64_Chdr GElf_Chdr;
         ^

The issue has been reported in the Debian bug tracker at
https://bugs.debian.org/810885 and I'm using the patch from Mark
Wielaard that has been posted there which adds compatibility for older
glibc versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-16 01:37:37 +01:00
Eduard Bachmakov
7a0dbbbe43 qtcreator: 3.5.1 -> 3.6.0 2016-01-15 19:19:42 -05:00
Peter Simons
623664daaa ghc-8.0.1: drop unused docbooc-related build inputs
The documentation is now built via Sphinx (todo).
2016-01-15 20:47:58 +01:00
Peter Simons
19e5ecfb49 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:

  - Nixpkgs: 65d4f18f9e
  - Hackage: 03c5ce2cbc
  - LTS Haskell: e72964a553
  - Stackage Nightly: 23478137ac
2016-01-15 20:47:58 +01:00
Vladimír Čunát
340d3088aa telepathy-qt: finish the of fix parallel build
Recommended by upstream
https://bugs.freedesktop.org/show_bug.cgi?id=93707#c5
2016-01-15 19:55:06 +01:00
Robin Gloster
00b2e1f704 Merge pull request #11809 from mayflower/fix/libvirtd_service
libvirtd service: Move mutable configs to /var
2016-01-15 18:58:40 +01:00
Eric Merritt
24a9dcd12f rebar3: refactor
Move registrySnapshot to the erlang-nix github organization
2016-01-15 09:07:06 -08:00
Vladimír Čunát
dbfb717f55 telepathy-qt: tiny update 0.9.6 -> 0.9.6.1 2016-01-15 18:06:01 +01:00
Vladimír Čunát
cdb0db3f31 telepathy-qt: fix parallel build by upstream patch 2016-01-15 18:06:00 +01:00
Frederik Rietdijk
e99005382e Merge pull request #12214 from FRidh/numpy
pythonPackages.numpy: 1.10.2 -> 1.10.4
2016-01-15 17:23:03 +01:00
Eric Merritt
e8933f6a4e webdriver: init at 0.0.0+build.18.7ceaf1f 2016-01-15 08:17:33 -08:00
Eric Merritt
acf4bfd585 erlang support: overridable allow installPhase
This commit allows the installPhase of buildRebar3 to be overridden by
the user.
2016-01-15 08:17:33 -08:00
Eelco Dolstra
df2b9b48cb elfutils: 163 -> 165
Also, install programs with the "eu-" prefix to prevent collisions
with binutils (as recommended by upstream), enable xz support, and
enable deterministic archives.
2016-01-15 15:01:13 +01:00
Tristan Helmich
bce59a1a8b libvirtd service: Move mutable configs to /var
Modifies libvirt package to search for configs in /var/lib and changes
libvirtd service to copy the default configs to the new location.

This enables the user to change e.g. the networking configuration with
virsh or virt-manager and keep those settings.
2016-01-15 14:26:20 +01:00
Vladimír Čunát
6607b72dc0 Revert "eigen: 3.2.5 -> 3.3-alpha1" to fix freecad
This reverts commit c8b9753882.
Fixes #12401. It wasn't intended to have "alpha" version as default.
2016-01-15 13:56:37 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
34fe0833c8 iozone: commit some forgotten fixups (/cc #12387) 2016-01-15 10:26:18 +01:00
Vincent Laporte
60e1740763 goffice: 0.10.24 -> 0.10.26 2016-01-15 10:04:06 +01:00
Svein Ove Aas
a28032ed58 iozone: init at 3.434 (close #12387)
vcunat amended some $out/share/ install paths.
2016-01-15 09:47:57 +01:00
Damien Cassou
0b4c7d42a8 pharo-vm: Refactor to introduce new VMs (close #12388)
The Pharo community now has a Spur VM: this VM is the only one to
open Pharo50 images.
2016-01-15 09:29:11 +01:00
Vladimír Čunát
98218971c2 Merge #12299: make firefox-like browsers wrapped by default 2016-01-15 08:53:58 +01:00
Vladimír Čunát
a8f1d40c1f all-packages: browserWrapper -> browser
- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
2016-01-15 08:36:08 +01:00
Alexey Shmalko
c37c8e1c00 ycmd: Init at 2016-01-12 2016-01-15 01:39:21 +02:00
Eric Merritt
4ed5836dd3 hex2nix: init at 0.0.2 2016-01-14 14:38:10 -08:00
Eric Merritt
b1719f9fcc erlang support: Add 187 packages pulled from Hex
This commit adds 187 packages from Hex.pm and documents 100 more that
could not be imported for various reasons. The packages where generated
by hex2nix.
2016-01-14 14:37:56 -08:00
Eric Merritt
d541d0e640 erlang support: seperate hex and rebar3 support
Building Hex packages is a superset of building with rebar3. There is no
need to force folks that use rebar3 but not hex to build with hex. This
commit seperates the rebar3 specific bits and the hex specific bits into
seperate functions that can be used independently.
2016-01-14 14:37:35 -08:00
Eric Merritt
b509dadbf1 erlang support: remove broken buildErlang function
The buildErlang function is broken and and leads Engineers down a wrong
path. For vanilla erlang that doesn't user rebar3, its better to simply
use `stdenv.mkDerivation` along with a set setupHook then the existing
functionality.
2016-01-14 14:37:21 -08:00
Eric Merritt
10fd4dff99 erlang support: move hex packages to hex namespace
This commit moves all the hex based packages to a single namespace. It
also moves all the packages to a single file.  This is in preparation
for the move to a system to generate the hex packages from the hex
package store.
2016-01-14 14:37:07 -08:00
Eric Merritt
474e417891 erlang support: allow nix-shell to work correctly
This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
2016-01-14 14:36:47 -08:00
Eric Merritt
a0309d871c move callPackage into the export set for 'Erlang'
This allows us to have a callPackages that includes erlang packages
2016-01-14 14:35:03 -08:00
Eric Merritt
99bf9bf07a rebar3-nix-boostrap: init at 0.0.1 2016-01-14 14:34:47 -08:00
Arseniy Seroka
be12086866 Merge pull request #12371 from otwieracz/master
ccl updated to 1.11
2016-01-14 19:01:32 +03:00
Nathan Zadoks
174221b744 go: 1.5.2 -> 1.5.3
This addresses CVE-2015-8618 (a vulnerability in math/big)
This issue can affect RSA computations in crypto/rsa, which is used by
crypto/tls. TLS servers on 32-bit systems could plausibly leak their RSA
private key due to this issue. Other protocol implementations that
create many RSA signatures could also be impacted in the same way.
https://groups.google.com/forum/#!topic/golang-dev/MEATuOi_ei4
2016-01-14 14:55:43 +01:00
Vladimír Čunát
e534896c7d telepathy-qt: disable parallel make
http://hydra.nixos.org/build/30377457/nixlog/1/raw
https://bugs.freedesktop.org/show_bug.cgi?id=93707
2016-01-14 11:31:32 +01:00
Rob Vermaas
3da892a18e Add binary openjdk 8 build for x86_64-darwin, similar to the openjdk 7 build for x86_64-darwin.
(cherry picked from commit 5f3e33b8ec)
2016-01-14 10:29:18 +00:00
Rob Vermaas
5f3e33b8ec Add binary openjdk 8 build for x86_64-darwin, similar to the openjdk 7 build for x86_64-darwin. 2016-01-14 02:28:16 -08:00
Slawomir Gonet
e056b66613 ccl: 1.10 -> 1.11 2016-01-14 08:33:23 +01:00
Jude Taylor
88f9fb7c21 build jailbreak-cabal on GHC 8.0.x 2016-01-13 14:06:53 -08:00
Jude Taylor
552207f5ef package GHC-8.0.1-rc1 2016-01-13 12:04:18 -08:00
Nikolay Amiantov
ad735e76e7 vc: 1.0.0 -> 1.1.0 2016-01-13 21:21:43 +03:00
Nikolay Amiantov
530ac7b17b cppzmq: 20150926 -> 20151203 2016-01-13 21:21:43 +03:00
Nikolay Amiantov
ca4e0a483e libtirpc: 0.3.2 -> 1.0.1 2016-01-13 21:21:43 +03:00
Nikolay Amiantov
0f516115a4 libbluray: 0.9.0 -> 0.9.2 2016-01-13 21:21:43 +03:00
Joe Hermaszewski
9238521b1c llvm: Add enableSharedLibraries option to 3.5 and 3.6 2016-01-13 15:21:23 +00:00
lethalman
091c74b1c8 Merge pull request #12062 from mogorman/platformio
platformio: init at 2.7.0
2016-01-13 15:47:25 +01:00
Sander van der Burg
6ea56a46fb titaniumsdk: bump to version 5.1.2 2016-01-13 10:49:34 +00:00
Nikolay Amiantov
d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Nikolay Amiantov
cdb5f269e2 rustcMaster: 2015-12-09 -> 2016-01-10 2016-01-13 13:48:24 +03:00
Nikolay Amiantov
1ea34520cd opendkim: adopt, cleanup and fix opendkim-genkey 2016-01-13 13:07:11 +03:00
Peter Simons
a7468dd951 Merge pull request #12201 from otwieracz/master
utox, libutoxcore and filter_audio version bump
2016-01-13 10:14:25 +01:00
Vladimír Čunát
cea8ee50c7 phantomjs2: fix evaluation and refactor
The error was due to the fact that with-introduced bindings have lower
priority and we do have `darwin` in scope already.

Fixes #12350. Closes #12351. (A slightly different fix.
I chose this to lower the risk of people re-introducing the mistake.)
2016-01-13 08:34:35 +01:00
Jude Taylor
e6a892bb55 phantomjs2: build on darwin 2016-01-12 21:52:49 -08:00
Slawomir Gonet
0d02182843 utox, libutoxcore and filter_audio version bump 2016-01-12 21:44:38 +01:00
Arseniy Seroka
28bd6a0e22 Merge pull request #12334 from couchemar/elixir-1.2.0
elixir: 1.1.1 -> 1.2.0
2016-01-12 20:07:49 +03:00
Florent Becker
f5e731168b cohttp: 0.17.1 -> 0.19.3 2016-01-12 16:21:55 +01:00
Andrey Pavlov
9c2da8a296 elixir: 1.1.1 -> 1.2.0 2016-01-12 18:14:43 +03:00
Nikolay Amiantov
e9597ff555 Revert "libpcap: support static build"
This reverts commit ee6ca494d2.
2016-01-12 17:15:14 +03:00
Nikolay Amiantov
ee6ca494d2 libpcap: support static build 2016-01-12 15:06:15 +03:00
Peter Simons
8e70d65652 haskell-cabal-helper: drop obsolete override
Tests are now being disabled by hackage2nix.
2016-01-12 11:02:51 +01:00
Peter Simons
c8da4cf7af configuration-hackage2nix.yaml: update list of broken builds 2016-01-12 11:02:51 +01:00
Peter Simons
43f1de91f8 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:

  - Nixpkgs: 7cbc1f27d4
  - Hackage: dfdbb526ed
  - LTS Haskell: e72964a553
  - Stackage Nightly: a9df6f5b32
2016-01-12 11:02:43 +01:00
Luke Clifton
8da514d726 Bring in krb5 for darwin builds seeing as we use 2016-01-12 21:00:33 +11:00
Tobias Geerinckx-Rice
b021d9aacf metaEnvironment: remove dead packages
Broken since 2013. Upstream is dead.
2016-01-12 03:08:10 +01:00
Tobias Geerinckx-Rice
464f327aa6 Move some excess description to longDescription 2016-01-12 03:08:10 +01:00
Domen Kožar
5c2c881c57 pypy: parallel build improvements, remove some patching
incorporates http://paste.pound-python.org/show/oFyMaSSzvb07lenWYmAK/
from NixCon sprints
2016-01-11 20:42:00 +01:00
Corbin Simpson
da698fd9da pypy: add some required build inputs and disable some unsafe tests
I had to disable another networking-centric test suite; it was trying to make
unapproved phone calls.
2016-01-11 20:42:00 +01:00
Tobias Geerinckx-Rice
64d15ab844 libpsl: list 2016-01-04 -> 2016-01-09 2016-01-11 18:35:50 +01:00
Peter Simons
1ec9144cad ghcjs: mark broken
Citing from http://hydra.cryp.to/build/1533084/log/raw:

    Configuring ghcjs-0.2.0...
    Setup: At least the following dependencies are missing:
    aeson >=0.7 && <0.10,
    haskell-src-exts ==1.16.*,
    optparse-applicative ==0.11.*,
    syb >=0.4 && <0.6

This issue has been present for a while now, and it's only gotten worse.
2016-01-11 12:06:03 +01:00
Tobias Geerinckx-Rice
fcb913b3a7 systemtap: remove dead package
Broken since 2013. Depends on equally broken latex2html.
Our version 1.2 is almost six years old; latest is 2.9.
And it's (still) no dtrace.
2016-01-11 01:41:54 +01:00
Thomas Tuegel
521817fd76 Merge branch 'kde-frameworks-5.18' 2016-01-10 14:10:59 -06:00
Thomas Tuegel
f807f15942 kde5: remove kde-frameworks-5.17 2016-01-10 14:10:03 -06:00
Peter Simons
a05017cd6c haskell-vector-algorithms: temporarily disable test suite to work around a compiler crash 2016-01-10 19:46:36 +01:00
Peter Simons
7fb70c2db9 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:

  - Nixpkgs: fbf35cf17d
  - Hackage: 3e0920b425
  - LTS Haskell: e72964a553
  - Stackage Nightly: c0de8ca462
2016-01-10 19:46:28 +01:00
Thomas Tuegel
ab16bbd0a4 kde5_latest.ktexteditor: update patches and dependencies
ktexteditor-5.18.0 needs its patches updated. An optional dependency on
`libgit2` was also added. `makeQtWrapper` was added to
`nativeBuildInputs` to set `XDG_DATA_DIRS` correctly.
2016-01-10 10:58:03 -06:00
Thomas Tuegel
67d63d24e0 kde5_latest.kdelibs4support: add missing kded dependency 2016-01-10 10:16:55 -06:00
Thomas Tuegel
d03a25c5ea kde5_latest.kpackage: update patches for 5.18.0 2016-01-10 09:43:23 -06:00
Thomas Tuegel
aaaf23f1e8 kde5_latest.frameworks: 5.17.0 -> 5.18.0 2016-01-10 09:09:40 -06:00
Arseniy Seroka
4a5bf88fde Merge pull request #12296 from hrdinka/add/communi
Add communi IRC client
2016-01-10 16:02:00 +03:00
Christoph Hrdinka
4ad12e038a libcommuni: init at 2016-01-02 2016-01-10 13:31:31 +01:00
vbgl
81996579a9 Merge pull request #12186 from FlorentBecker/pcre_buildOcaml
ocaml-pcre: use buildOcaml
2016-01-10 11:37:45 +01:00
Vladimír Čunát
513994da9d cyrus-sasl: only apply patch on FreeBSD to fix #12279
I noticed the breakage but forgot this patch in another branch.
https://github.com/NixOS/nixpkgs/pull/10816#issuecomment-168486249
2016-01-10 07:05:41 +01:00
Nikolay Amiantov
fea89d6bc3 openmpi: 1.6.5 -> 1.10.1 2016-01-10 07:32:36 +03:00
Jude Taylor
36ebae29ce update xcode patches for node v0.10.41 2016-01-09 14:38:37 -08:00
Pascal Wittmann
26a6b4b58d yodl: 3.05.01 -> 3.06.00 2016-01-09 20:07:43 +01:00
Pascal Wittmann
1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Thomas Tuegel
fdefc0cb2c Merge branch 'kdenetwork-filesharing' 2016-01-08 14:20:46 -06:00
Thomas Tuegel
e44af9ed42 openslp: init at 2.0.0 2016-01-08 14:20:06 -06:00
Pascal Wittmann
5d53d3282c farbfeld: init at 1 2016-01-08 20:22:07 +01:00
Arseniy Seroka
3443462ab1 Merge pull request #12233 from deeky666/php-7.0.2
php: 7.0.1 -> 7.0.2
2016-01-08 20:22:00 +03:00
Florent Becker
a14c867d62 js_of_ocaml: Allow caml >= 4.02 to find camlp4 2016-01-08 16:06:00 +01:00
Thomas Tuegel
ba443da270 kde5.kio: fix Samba detection 2016-01-08 09:03:50 -06:00
Peter Simons
7550ddaf91 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:

  - Nixpkgs: b05b64ed59
  - Hackage: ce76547c84
  - LTS Haskell: 87e2d54643
  - Stackage Nightly: 392791fc31
2016-01-08 15:52:22 +01:00
Eelco Dolstra
aa73be3609 Merge pull request #12232 from deeky666/php-5.5.31
php: 5.5.30 -> 5.5.31
2016-01-08 12:36:09 +01:00
Steve Müller
4341df2f70 php: 7.0.1 -> 7.0.2 2016-01-08 10:51:35 +01:00
Steve Müller
5250326474 php: 5.5.30 -> 5.5.31 2016-01-08 10:49:04 +01:00
Steve Müller
7c54bca127 php: 5.6.16 -> 5.6.17 2016-01-08 10:42:32 +01:00
Frederik Rietdijk
83bf145075 pythonPackages.numpy: 1.10.2 -> 1.10.4 2016-01-08 09:01:22 +01:00
Pascal Wittmann
f438011aed Merge pull request #12216 from bjornfor/thrift
thrift: 0.9.2 -> 0.9.3
2016-01-08 08:30:11 +01:00
Jude Taylor
81710923bd add gyp fix to node v4.x 2016-01-07 21:52:12 -08:00
Jude Taylor
08c081309b Revert "gnustep-make: fix installation path"
This reverts commit 4f1559a751.
2016-01-07 21:52:11 -08:00
Dan Peebles
732495017b perl-5.20: break dependency on the compiler that built it
This is a major closure size reduction on Darwin, and probably a less
significant one on Linux. On darwin, retaining the compiler means adding
clang and its dependency llvm to the perl closure, which gives us ~400MB
of extra stuff. Considering that Nix itself depends on this version of
perl, that makes cutting a new Nix release rather unpleasaont Darwin.

After this patch, I was able to get the `nixUnstable` closure down to
21MB after feeding it into a .tar.xz (123MB before compression). There's
still room for improvement but this should carry us over until we split
outputs.
2016-01-07 23:01:02 -05:00
Tobias Geerinckx-Rice
3d3ccd4a15 myguiSvn: remove dead package
Subversion snapshot from 2011. Only dependent was Rigs of Rods.
2016-01-08 01:36:32 +01:00
Tobias Geerinckx-Rice
777f254ce3 caelum: remove dead package
Last updated Jan 2012, upstream dead. Broken since 2013.
Only dependent was Rigs of Rods.
2016-01-08 01:36:32 +01:00
Bjørn Forsman
972c5641e4 thrift: 0.9.2 -> 0.9.3
Add Twisted as build input so that we can continue to have Python
support. (./configure disables Python support unless it finds the
'trial' program, from Twisted.) I don't know whether upstream intended
that, because it seems perfectly fine to run thrift + Python without
Twisted. (Only the TTwisted transport uses Twisted...)

Ah, Thrift use Twisted in its unit tests. Even when we pass
--enable-tests=no to ./configure :-D
2016-01-07 21:36:28 +01:00
Gabriel Ebner
7c28451287 pyqt5: 5.4.2 -> 5.5.1 2016-01-07 18:46:50 +01:00
Sander van der Burg
b6d84748b9 xcodeenv: make it work with xcode 7.2 2016-01-07 14:43:17 +00:00
Sander van der Burg
d268fa7676 titaniumsdk: add SDK version 5.1 and remove older versions 2016-01-07 13:47:26 +00:00
Peter Simons
274cf0339b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:

  - Nixpkgs: f24e81fbd3
  - Hackage: 01c9e56f5d
  - LTS Haskell: 87e2d54643
  - Stackage Nightly: c30758374f
2016-01-07 12:53:50 +01:00
Domen Kožar
78096e9b89 python: 3.4.3 -> 3.4.4 2016-01-07 11:19:40 +01:00
Robin Gloster
897fb98a96 llvm: 3.7.0 -> 3.7.1 (close #12200)
This obsoletes a backport for rust.
2016-01-07 11:12:54 +01:00
Jakob Gillich
90b853b706 plib: fix CVE-2012-4552 (close #12195)
patch source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694810#10
2016-01-07 10:25:26 +01:00
Jakob Gillich
aee934b3aa libxml2: security update 2.9.2 -> 2.9.3 (close #12197) 2016-01-07 10:18:34 +01:00
Tobias Geerinckx-Rice
2357918b00 opensc-dnie lib & wrapper: remove dead packages
Last updated in 2010, broken since 2013.

cc @viric
2016-01-07 09:40:42 +01:00
Asko Soukka
a225a650bf R: fix Darwin build
Merged manually from https://github.com/NixOS/nixpkgs/pull/10623.
2016-01-06 22:20:40 +01:00
Michel Kuhlmann
26f80d7a6f r-modules: update list of broken packages
Closes https://github.com/NixOS/nixpkgs/pull/12181.
2016-01-06 21:50:36 +01:00
Florent Becker
93fc00b157 ocaml-pcre: use buildOcaml 2016-01-06 20:00:20 +01:00
Gabriel Ebner
b12cabd223 electron: 0.28.2 -> 0.36.2 2016-01-06 19:05:00 +01:00
Johannes Bornhold
7672c68ed7 dmd: Avoid depending on gcc for the darwin build (close #11949)
Adding stdenv.cc into the PATH, also setting CC, so that on Darwin
clang will be used by default. Still allowing to use an existing value
of CC if it is set already.

Replacing __inline_isnanl with __inline_isnan on darwin since the former
one was not defined.
2016-01-06 15:06:53 +01:00
Matthew O'Gorman
119a9458fb
platformio: init at 2.7.0 2016-01-06 04:09:52 -05:00
Vincent Laporte
ca8ef0fa1d coq-interval: 2.1.0 -> 2.2.1 2016-01-06 09:35:05 +01:00
Vincent Laporte
e182ddf008 coqPackages.coquelicot: init at 2.1.1
Coquelicot is a Coq library for Reals.

Homepage: http://coquelicot.saclay.inria.fr/
2016-01-06 09:13:38 +01:00
Tobias Geerinckx-Rice
e1f555477c opencv_2_1: remove dead package
Broken since 2013. Only used by qrdecode which suffered the same fate.

cc @viric
2016-01-06 03:49:47 +01:00
Tobias Geerinckx-Rice
2ee6396bf7 libmusclecard: remove dead package
No upstream release since 2009. Broken since 2013.
2016-01-06 02:14:03 +01:00
Tobias Geerinckx-Rice
894299f187 libdc1394avt: remove dead package
Orphaned dependency of cc1394. Broken since 2013. Sources long gone.

cc @viric
2016-01-06 01:46:16 +01:00
Arseniy Seroka
6059831148 Merge pull request #12119 from devhell/mediainfo
{lib}mediainfo{-gui}: 0.7.80 -> 0.7.81
2016-01-06 01:29:15 +03:00
Tobias Geerinckx-Rice
ad200bb5bc Fix remaining sane{Front,Back}ends 2016-01-05 20:44:35 +01:00
Tobias Geerinckx-Rice
0f6659bab7 libpsl: list 2015-12-17 -> 2016-01-04 2016-01-05 20:22:35 +01:00
Eelco Dolstra
0db7ccb5c6 gcc: Respect $SOURCE_DATE_EPOCH 2016-01-05 17:21:48 +01:00
Peter Simons
56a3ffcc25 Merge pull request #12126 from michelk/r-modules/cran-update
r-modules: regenerate CRAN packages
2016-01-05 12:23:56 +01:00
Peter Simons
1355e928cf Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
2016-01-05 12:22:23 +01:00
Peter Simons
550fe7f233 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:

  - Nixpkgs: 665c16fbe1
  - Hackage: d9755ca900
  - LTS Haskell: d3e5ae70f9
  - Stackage Nightly: 56e1f693d5
2016-01-05 11:10:34 +01:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát
556a28908e Merge: xorg and gtk-related updates 2016-01-05 09:53:01 +01:00
Vladimír Čunát
7c879d342d Merge #10816: improve FreeBSD support 2016-01-05 09:50:10 +01:00
Vladimír Čunát
aa4562596f apr-util: refactor options 2016-01-05 09:42:56 +01:00
Vladimír Čunát
9b091e8a0c krb5: simplify unpacking 2016-01-05 09:37:51 +01:00
Vincent Laporte
2027caa875 coq-flocq: 2.5.0 -> 2.5.1 2016-01-04 23:37:40 +01:00
Vincent Laporte
3553258b1d Revert "coqPackages.flocq: 2.4.0 -> 2.5.0"
This reverts commit db9bc6875f.

That reverted commit had introduced a wrong URL.
2016-01-04 23:37:40 +01:00
Vincent Laporte
7462d96a65 ssreflect, mathcomp: fix build 2016-01-04 23:37:40 +01:00