Commit graph

36431 commits

Author SHA1 Message Date
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
Vladimír Čunát c30b12b9a5
glibc: fix i686 crashes via an upstream patch
Fixes #23177.
2017-04-10 11:13:00 +02:00
Nikolay Amiantov ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03:00
Michael Raskin f12bd6e9b6 lispPackage.iolib: missed one system 2017-04-10 10:09:22 +02:00
Michael Raskin 08abe4fe93 lispPackage.iolib: list the hidden systems to make sure bundles exist 2017-04-10 09:57:17 +02:00
Daiderd Jordan f8230518a2 Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
2017-04-10 08:50:15 +02:00
Matthew Bauer dd25b6da62 cwebbin: fix src again 2017-04-09 18:33:48 -05:00
Michael Raskin 58d6b50232 lispPackages: load precompiled asdf; support more implementations 2017-04-10 01:10:49 +02:00
Tuomas Tynkkynen a05959e191 Merge remote-tracking branch 'upstream/master' into staging 2017-04-10 01:41:49 +03:00
Michael Raskin 917ecc2390 lispPackages.iolib: precompile iolib/os 2017-04-09 23:48:24 +02:00
David McFarland f2655dd0c7 mesa: patch vulkan manifests when any driver is enabled 2017-04-10 00:17:36 +03:00
Matthew Bauer cb180f47d4
cwebbin: fix src 2017-04-09 15:47:55 -05:00
Daiderd Jordan 35eb784bf2 Merge pull request #24761 from matthewbauer/hidapi2
hidapi: fix macos
2017-04-09 22:39:15 +02:00
Matthew Bauer cba6e28766
hidapi: fix macos 2017-04-09 15:21:26 -05:00
Tuomas Tynkkynen a7b572805c strace: 4.15 -> 4.16 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen 15efefa832 lcov: 1.12 -> 1.13 2017-04-09 21:48:25 +03:00
Tuomas Tynkkynen caccd11442 dtc: 1.4.2 -> 1.4.4 2017-04-09 21:48:25 +03:00
Peter Simons 282bc88093 Merge pull request #24754 from shlevy/haskell-overrideSrc
haskell-lib: Add overrideSrc helper
2017-04-09 17:55:23 +02:00
Christine Koppelt b7223e0393 maven: 3.3.9 -> 3.5.0 2017-04-09 16:58:48 +02:00
Michael Raskin ba7a1b6505 Merge pull request #24520 from asppsa/octave-hg
Add Octave HG version, use with purePackages.octave
2017-04-09 15:23:51 +02:00
Peter Simons 4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Alastair Pharo 68c56c46fb purePackages.octave: Use octaveHg
Pure's Octave package compiles but crashes with Octave 4.2 due to an
upstream bug which is fixed in mercurial.
2017-04-09 21:54:39 +10:00
Alastair Pharo 813eb41cf6 octaveHg: add package 2017-04-09 21:54:14 +10:00
Benno Fünfstück 8130c350b2 Merge pull request #24743 from ljli/hs-haskell-tools
haskell: Correct dependencies for haskell-tools-*_0_6_0_0
2017-04-09 13:35:21 +02:00
Matthew Bauer 87e6b2c50f
xcbuild: try to fix sdk not found
This is an attempt to get rid of the issues with sdk not found in
xcbuild when building pinentry_mac.
2017-04-09 04:27:56 -05:00
Matthew Bauer 34422f428d
ibtool: add to toolchain
- init package
- add into xcbuild/toolchain.nix
2017-04-09 04:27:21 -05:00
Matthew Bauer 5eb75ce205
xcbuild: add app bundle specs 2017-04-09 04:22:08 -05:00
Franz Pletz a49481a740 Merge pull request #24763 from matthewbauer/darwin-glfw-fixes
glfw: fix darwin build
2017-04-09 11:17:42 +02:00
Matthew Bauer 8df24b78d5
wxGTK28: linux only 2017-04-09 02:11:16 -05:00
Alastair Pharo 250ddfe1a2 octave: add runtime texinfo dependency
makeinfo (provided by the texinfo package) is used by the "help"
command in Octave to display info about functions, etc.  By default,
Octave looks for "makeinfo" in the PATH, rather than specifying the
location of the executable.  This results in Nix not being aware that
makeinfo is required at runtime (so unless you happen have makeinfo
available from your path, "help" won't work).

This patch fixes that by setting the path to makeinfo in Octave,
thereby creating a runtime dependency on texinfo.
2017-04-09 16:42:56 +10:00
Matthew Bauer 23d8b4f10c
glfw: fix darwin build 2017-04-09 00:23:24 -05:00
Matthew Bauer 3baff95efd
botan: fix macOS build 2017-04-08 23:49:55 -05:00
Matthew Bauer 3f2560cc08
xbase: make linux-only 2017-04-08 23:34:51 -05:00
Matthew Bauer a1f22aafa2
neardal: make linux-only 2017-04-08 23:34:51 -05:00
Matthew Bauer 04f8199e5b
libx86emu: make linux-only 2017-04-08 23:34:41 -05:00
Matthew Bauer efcd597ab6
cwebbin: Fix macOS build 2017-04-08 23:28:01 -05:00
Matthew Bauer 719cb89342
wxsqlite3: fix macOS build 2017-04-08 23:28:01 -05:00
Matthew Bauer 6a6b371a77
liblastfm: fix macOS build 2017-04-08 23:28:01 -05:00
Cole Scott ff1e372849
arm-frc-linux-gnueabi-gcc: init at 4.9.4
fixes #24578
2017-04-09 01:06:34 +02:00
Cole Scott 1d7a478c92
arm-frc-linux-gnueabi-binutils: init at 2.28 2017-04-09 01:06:34 +02:00
Cole Scott 7c32b93c9a
arm-frc-linux-gnueabi-eglibc: init at 2.21-r0.83 2017-04-09 01:06:33 +02:00
Cole Scott 9597247cc0
arm-frc-linux-gnueabi-linux-api-headers: init at 3.19-r0.36 2017-04-09 01:06:33 +02:00
Shea Levy a6c39ed207 haskell-lib: Add overrideSrc helper 2017-04-08 16:21:57 -04:00
Tim Steinbach 9d94e100f5
coursier: 1.0.0-M15-5 -> 1.0.0-RC1 2017-04-08 15:03:33 -04:00
Leon Isenberg 55e191d844 haskell: Correct dependencies for haskell-tools-*_0_6_0_0 2017-04-08 14:51:43 +02:00
Tim Steinbach 184e3238c7 Merge pull request #24544 from NeQuissimus/skopeo_policy
skopeo: default policy
2017-04-08 08:36:41 -04:00
Thomas Tuegel e0b1288ebd Merge pull request #24340 from periklis/topic_qt58_modules
qt58: extend darwin compatibility
2017-04-08 07:32:21 -05:00
Aristid Breitkreuz a0eabfbcbd Merge pull request #24715 from ljli/ghcjs-dep-cycle
haskell: ghcjs packages: Break dependency cycle less invasive
2017-04-08 12:25:54 +02:00
Aristid Breitkreuz 43626b6a88 Merge pull request #24698 from MP2E/ffmpeg_sdl2
ffmpeg-full: replace SDL support with SDL2 support
2017-04-08 12:16:11 +02:00
Aristid Breitkreuz 18e5d913d7 Merge pull request #24740 from dyrnade/chefdk
chefdk: 0.11.2 -> 1.3.40
2017-04-08 12:13:56 +02:00
Aristid Breitkreuz e893646494 Merge pull request #24692 from LumiGuide/haskell-link-with-gold
haskell: add the linkWithGold function to link packages with ld.gold
2017-04-08 12:01:05 +02:00
Aristid Breitkreuz 058610c355 Merge pull request #24722 from ljli/ghcjs-prim
haskell: ghcjs packages: Remove ghcjs-prim
2017-04-08 11:58:23 +02:00
Aristid Breitkreuz 59057d2272 Merge pull request #24679 from lsix/django_security_fixes
Django security fixes (for CVEs)
2017-04-08 11:48:46 +02:00
Aristid Breitkreuz 6dd7dd52b8 Merge pull request #24539 from Ralith/vulkan-loader
vulkan-loader: 1.0.39.1 -> 1.0.42.2
2017-04-08 11:48:04 +02:00
Aristid Breitkreuz 290315ff6a Merge pull request #24627 from mdaiter/suitesparseCUDATouchups
suitesparse: refining CUDA support
2017-04-08 11:45:17 +02:00
Aristid Breitkreuz f6fc8467cd Merge pull request #24672 from magnetophon/libsndfile
libsndfile: 1.0.27 -> 1.0.28
2017-04-08 11:33:03 +02:00
Aristid Breitkreuz 672160a00f Merge pull request #24741 from kamilchm/ponyc
ponyc: 0.12.2 -> 0.13.0
2017-04-08 11:28:43 +02:00
Vladimír Čunát 26766f0e57
Merge branch 'staging'
There are a few dozen new failures on Darwin, probably related to
updates of stdenv's llvm and/or pkgconfig.
Still the total number of successes increases.
2017-04-08 11:02:36 +02:00
Periklis Tsirakidis 775531c1e3 qt58: extend darwin compatibility 2017-04-08 09:54:46 +02:00
Kamil Chmielewski b55a9f86e4 ponyc: 0.12.2 -> 0.13.0
https://github.com/ponylang/ponyc/issues/1823
2017-04-08 09:43:24 +02:00
dyrnade 0a573f7a0c changed chefdk version to 1.3.40
upgraded dependencies for chefdk-1.3.40
2017-04-08 10:16:56 +03:00
Jörg Thalheim efe12d6658 Merge pull request #24732 from NeQuissimus/scala_2_11_10
scala: 2.11.9 -> 2.11.10
2017-04-08 08:50:50 +02:00
Jörg Thalheim 6c59393888 Merge pull request #24735 from nixy/hy/0.12.1-update
hy: 0.11.1 -> 0.12.1
2017-04-08 08:45:00 +02:00
Andrew R. M 106214a7c9 hy: 0.11.1 -> 0.12.1
Fixed build inputs up a little while bumping version
2017-04-07 23:15:16 -04:00
Tim Steinbach 4151bf5fd4
scala: 2.11.9 -> 2.11.10 2017-04-07 19:54:40 -04:00
Leon Isenberg 60e9371738 haskell: ghcjs packages: Remove ghcjs-prim
It is wired into ghcjs now.
2017-04-07 21:41:01 +02:00
Aristid Breitkreuz be6e9dce32 Merge branch 'master' of github.com:NixOS/nixpkgs 2017-04-07 20:44:40 +02:00
Aristid Breitkreuz d486006e06 rq: 0.9.2 -> 0.10.4 (still broken, our v8 is too old) 2017-04-07 20:43:55 +02:00
Dan Peebles b9e558597d stdenv-darwin: bump to use LLVM 4.0 & new bootstrap tools 2017-04-07 14:36:21 -04:00
Leon Isenberg 7a08e57b9e haskell: ghcjs packages: Break dependency cycle less invasive
Between cabal and hscolour.
2017-04-07 19:02:52 +02:00
Gabriel Ebner 66606beb23 Merge pull request #24706 from NeQuissimus/sbt_0_13_14
sbt: 0.13.13 -> 0.13.14
2017-04-07 14:34:09 +02:00
Dan Peebles 57e25171a5 Merge branch 'master' into staging 2017-04-07 08:28:07 -04:00
Dan Peebles 27cec397b1 itk: 4.10 -> 4.11
Also includes a patch to work against clang 4, which was my original
motivation for the 4.10 -> 4.11 upgrade (since it fixed another issue)
2017-04-07 08:23:08 -04:00
Tim Steinbach 4c718a9a5a
sbt: 0.13.13 -> 0.13.14 2017-04-07 08:22:04 -04:00
Markus Hauck 370452ef41 scalafmt: 0.6.7 -> 0.6.8 (#24699) 2017-04-07 11:42:31 +01:00
Bas van Dijk c865b8e35e haskell: add the linkWithGold function to link packages with ld.gold
Also support linking the double-conversion package with ld.gold.
2017-04-07 09:44:11 +02:00
Dan Peebles 1be61d1921 podofo: fix on LLVM 4
Not sure if the things I made optional on Darwin are really worth keeping
at all, but I don't have a Linux box handy so I'm minimizing potential
damage.
2017-04-06 23:33:14 -04:00
Dan Peebles 0cacae6a5f gcc6: fix for LLVM 4.0 2017-04-06 23:20:35 -04:00
Cray Elliott 5b6b1100f3 ffmpeg-full: replace SDL support with SDL2 support
ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2
2017-04-06 20:13:47 -07:00
Dan Peebles 81352b2cb5 Merge branch 'master' into staging 2017-04-06 21:26:24 -04:00
Dan Peebles 6b1957d17a qt5: fix to work on LLVM 4
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00
Hamish Mackenzie bde6e3da6f Fix geoclue build on Darwin 2017-04-07 00:45:54 +02:00
Michael Raskin 365e8a7b6a quicklispPackages: update to fresh QuickLisp
lispPackages: reduce environment-bombing
2017-04-06 18:47:36 +02:00