Commit graph

36413 commits

Author SHA1 Message Date
Vladimír Čunát 24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Daniel Peebles 09a9a472ee Merge pull request #24830 from mayflower/refactor/boolToString
treewide: use boolToString function
2017-04-13 09:45:31 -04:00
Tim Steinbach 3c29b8e7da Merge pull request #24864 from NeQuissimus/gradle_3_5
gradle: 3.4.1 -> 3.5
2017-04-13 08:50:49 -04:00
Eelco Dolstra d3c737a080
gcc-snapshot: 7-20161211 -> 7-20170409 2017-04-13 13:07:45 +02:00
Jörg Thalheim 300c59c7fc Merge pull request #24865 from mucaho/conan
conan: init at 0.21.2
2017-04-13 10:34:11 +02:00
Vladimír Čunát 42fd72091e
gnutls: use 3.5.10 on Darwin for now
This contains a revert of d6454e6a1.
2017-04-13 09:39:02 +02:00
Daniel Peebles f21a6940da Merge pull request #24838 from matthewbauer/ibtool
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
mucaho 8d5e55a0f0 conan: init at 0.21.2 2017-04-13 03:43:21 +02:00
mucaho fe2ced1ea8 pythonPackages.node-semver: init at 0.1.1 2017-04-13 03:10:57 +02:00
mucaho acf45e0f9c pythonPackages.pluginbase: init at 0.5 2017-04-13 03:10:10 +02:00
Matthew Bauer 9e5fe7738a
xib2nib: add meta
also:
- NSPlist
- PlistCpp
2017-04-12 20:07:55 -05:00
Tim Steinbach 47e82ef817
gradle: 3.4.1 -> 3.5 2017-04-12 19:40:05 -04:00
Fernando J Pando 80c295f50f pythonPackages.distro: init 1.0.3
- tested on darwin
- tested on nixos
2017-04-13 00:01:30 +02:00
Joachim Fasting 13a0ad3108
opal: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
Seeing as the build already passes, I suspect this is strictly redundant
...

Tested with nix-build -A opal
2017-04-12 19:27:06 +02:00
Joachim Fasting 540a6412e3
suitesparse_4_4: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
Tested with nix-build -A suitesparse_4_4
2017-04-12 19:27:03 +02:00
Joachim Fasting a883581ddb
suitesparse_4_2: remove bogus NIX_CFLAGS
NIX_CFLAGS should be NIX_CFLAGS_COMPILE; since pic is the default, we
simply remove the bogus declaration.

Tested with nix-build -A suitesparse_4_2
2017-04-12 19:26:58 +02:00
Daiderd Jordan 5ba445752b Merge pull request #24700 from hamishmack/fixes-for-macos
gtk fixes for macos
2017-04-12 19:26:32 +02:00
Nikolay Amiantov 8c56608078 unity3d: 5.3.5 -> 5.5.3
Also add udev to dependencies and don't strip unneeded ones.
Fixes #22513.
2017-04-12 16:52:18 +03:00
Matthew Bauer 3d1d805245
Revert "xcbuild: try to fix sdk not found"
This reverts commit 87e6b2c50f.
2017-04-12 05:20:33 -05:00
Matthew Bauer 1781ec934f
xib2nib: move nsplist, plistcpp to own folder
These libraries could be used by other packages so list them in
all-packages.nix as well.
2017-04-12 03:28:33 -05:00
Matthew Bauer d697e5c8ee
ibtool: rename xib2nib 2017-04-12 03:23:28 -05:00
Matthew Bauer f6860a6685
xcbuild: remove unnecessary flags 2017-04-12 03:21:58 -05:00
Matthew Bauer c90058e774
ibtool: update to newer hash 2017-04-12 02:59:18 -05:00
Tristan Helmich cf957fedea pythonPackages.phonenumbers: init at 8.4.0 2017-04-12 01:58:28 +02:00
Profpatsch 048114eb4f compile-daemon: init at 2013-03-08 2017-04-12 00:07:55 +02:00
Franz Pletz 29ed67faea
libressl_2_5: 2.5.1 -> 2.5.3 2017-04-11 19:41:01 +02:00
Bjørn Forsman 9c830c8456 hydra: add dependency on Nix' perl bindings
This unbreaks the build since the latest nixUnstable update
(3dd66ec6e9).

It's basically the same fix as in hydra git repo:

  a0376a92e5
2017-04-11 19:34:25 +02:00
Franz Pletz 3ab45f4b36
treewide: use boolToString function 2017-04-11 18:18:53 +02:00
Rok Garbas 8fcb9275d1
pypi2nix: 1.6.0 -> 1.8.0 2017-04-11 14:33:54 +02:00
Tuomas Tynkkynen e4b48c7186 libsigsegv: Remove aarch64 patch, enable tests
The aarch64 patch has been applied upstream. Let's hope that the new
release fixes the tests as well.
2017-04-11 14:01:34 +03:00
Tuomas Tynkkynen 8eb25e1245 lzo: 2.09 -> 2.10 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 72b2cbe3b7 libsigsegv: 2.10 -> 2.11 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 5de624e437 gmp: 6.1.1 -> 6.1.2 2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen 52797fc600 Merge remote-tracking branch 'upstream/master' into staging 2017-04-11 12:58:43 +03:00
Maximilian Güntner d84029f296
ruby-modules: check tzinfo version
tzinfo 0.3.xx does not contain the file

lib/tzinfo/zoneinfo_data_source.rb

it is only included in the 1.x branch.

closes #24080
closes #24682
2017-04-11 10:44:54 +02:00
Matthew Bauer bb2eb5b0e8
ibtool: use xib2nib src 2017-04-11 03:22:32 -05:00
Hamish Mackenzie 4d5ed187d3 gtk-mac-integration: fix gtk3 version
Include a Gtk3 version of gtk-mac-integration.
Add gobjectIntrospection to gtk-mac-integration.
Use propagatedBuildInputs for gtk.
2017-04-10 23:42:04 -07:00
Hamish Mackenzie da1d13bc07 webkgitgtk: fix 2.14 on macOS
Includes the patches from macports and fixes an issue with the
`otool -L` output that was causing g-ir-scanner to fail.
The paths in the macports patches have been modified so that they
will work with `patches` in nix (an extra directory level was
added).
2017-04-10 23:11:16 -07:00
Matthew Bauer f1fdc98884
pugixml: fixup darwin 2017-04-11 01:03:11 -05:00
Vladimír Čunát d6454e6a15
gnutls: try to fix build on Darwin, after update 2017-04-11 03:39:47 +02:00
aszlig 49cf934642
pyocr: Add patch to support Tesseract 3.05.00
This is from the commit message I've written for the upstream pull
request (jflesch/pyocr#62):

    This is a bit more involved, because Tesseract 3.05.00 comes not
    only with improvements but also with a few quirks we need to deal
    with.

    The first quirk is that the order arguments of the `tesseract'
    command now matters and the list of configurations has to be at the
    end of the command line. So we add a new attribute tesseract_flags
    to the BaseBuilder class that contains a list of all the flags to
    pass to `tesseract', the tesseract_configs attribute however remains
    pretty much the same but now only really contains a list of configs
    instead of being mixed with flag arguments.

    Another quirk has to do with Leptonica >= 1.74 which Tesseract
    3.05.00 now requires. Leptonica has special handling of files that
    reside in /tmp and assumes that it's an internal temporary file of
    Leptonica. In order to deal with it, we now run Tesseract in a
    temporary directory, which contains the input/output files and use
    the relative name of these files because Leptonica only searches for
    path names beginning with /tmp.

    Fortunately the last item we need to address is not really a quirk,
    but an API change. In Tesseract 3.05.00 there is now a new function
    called TessBaseAPIDetectOrientationScript(), which doesn't fill the
    OSResults object anymore but now allows to pass the values we're
    interested in directly by reference. We need to use this new
    function because the old function TessBaseAPIDetectOS() now *always*
    returns false.

I've tested this specifically on NixOS and in conjunction with Paperwork
(the only package that's using pyocr so far) and all the tests of the
dependency chain are now succeeding. However, I didn't do manual tests
of Paperwork though.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:39 +02:00
aszlig 42bb63f803
leptonica: 1.72 -> 1.74.1
The changes are a bit too big to include it here in the commit message,
so if you want the details of what changed, please visit this URL:

http://leptonica.org/source/version-notes.html

I have also provided openjpeg, giflib and libwebp as dependencies so
that Leptonica is able to read/write those file formats.

Additionally I've added a patch that uses pkgconfig to resolve all
dependencies (except giflib), because unlike AC_CHECK_LIB() the
PKG_CHECK_MODULES() macro defines *_LIBS variables to include the linker
search path.

Unfortunately that patch alone is not enough, because the *_LIBS
variable are substituted by the upstream configure.ac to *not* include
the linker search paths, so we need to remove the AC_SUBST() calls
within PKG_CHECK_MODULES().

The only dependency that's not yet using PKG_CHECK_MODULES() is giflib,
because giflib doesn't have a pkg-config description file, therefore
we're using substituteInPlace to insert the linker search path after the
lept.pc file was generated by configure.

Another thing that we no longer need is the dependency on libpng version
1.2, because Leptonica now also works with more recent libpng versions.

Tested by building the package itself and also the following packages
that immediately depend on leptonica:

 * k2pdfopt
 * tesseract
 * jbig2enc

All of these packages succeeded to build on x86_64-linux.

The main reason why I'm bumping Leptonica to version 1.74.1 is that we
need at least version 1.74 to bump Tesseract to the latest upstream
version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:29 +02:00
Vladimír Čunát 6d1374238f
gnutls: bugfix 3.5.10 -> 3.5.11 2017-04-10 17:53:54 +02:00
Vladimír Čunát c714f8241a
libdrm: 2.4.76 -> 2.4.79 2017-04-10 16:27:29 +02:00
Frederik Rietdijk 767e459200 Merge pull request #22726 from matthewbauer/openblas-closure-size
openblas: disable static libs
2017-04-10 16:11:19 +02:00
Tim Steinbach 5a3dca24d8
sbt: 0.13.14 -> 0.13.15 2017-04-10 08:44:32 -04:00
Franz Pletz 6049560e60
jenkins: 2.49 -> 2.53 2017-04-10 14:31:27 +02:00
Franz Pletz b4c7979363
libgit2: 0.24.6 -> 0.25.1 2017-04-10 14:31:26 +02:00
Tobias Geerinckx-Rice f5fe20c7f4 Merge pull request #24773 from cko/maven-3_5_0
maven: 3.3.9 -> 3.5.0
2017-04-10 13:02:57 +01:00
Vladimír Čunát e47ac55a21
glibc: apply the i686 patch only on i686
... to reduce rebuilding. /cc #23177.
2017-04-10 11:18:50 +02:00