Commit graph

105431 commits

Author SHA1 Message Date
Peter Hoeg bf4be8f1dd k8s: convert int to string to avoid interpolation error 2017-04-13 19:31:43 +08:00
Profpatsch 048114eb4f compile-daemon: init at 2013-03-08 2017-04-12 00:07:55 +02:00
Profpatsch 9b7b950832 /lib/default.nix: Add file docstring & unit test hint 2017-04-12 00:01:38 +02:00
Bjørn Forsman d916ce2ef4 nixos/lighttpd: set $HOME for gitweb sub-service
This allows gitweb to expand '~' in /etc/gitconfig. Without a $HOME
variable, it fails to list any projects and instead show the text
"No such projects found" in the UI.

Setting $HOME to the gitweb project root seems like a sensible value.
2017-04-11 22:54:31 +02:00
Daiderd Jordan d55ab1a6b9 Merge pull request #23572 from rycee/fix/gpsbabel-darwin
gpsbabel: fix darwin build
2017-04-11 20:40:52 +02:00
Daiderd Jordan 9561fecd02
gpsbabel: fix build with llvm-4 2017-04-11 20:23:43 +02:00
Franz Pletz 73f04ddd57
nginxMainline: 1.11.10 -> 1.11.13 2017-04-11 19:57:28 +02:00
Bjørn Forsman d45df036c3 release(-lib).nix: add nixpkgsArgs parameter
This allows customizing the nixpkgs arguments by the caller. My use case
is creating a personal nixpkgs channel containing some unfree packages.

The default is still to not build unfree packages, so for nixpkgs this
is no functional change.
2017-04-11 19:43:34 +02:00
Franz Pletz e8351fd305
libressl: 2.5 branch is now stable 2017-04-11 19:41:02 +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
Bjørn Forsman 6047401a71 pythonPackages.boto3: disable tests (fails due to network access)
The test failure started happening with commit
8d18f67a97 ("awscli: 1.11.45 -> 1.11.75"). That commit
also updates botocore, a dependency of boto3.

This unbreaks 'nixops' (a dependee).
2017-04-11 19:14:56 +02:00
edanaher e3559c23c2 acme: Add "domain" option to separate domain from name
Fixes #24731.
2017-04-11 18:28:05 +02:00
Lancelot SIX 54fff9ec1a Merge pull request #24780 from cko/django_1_7_remove
django_1_7: remove
2017-04-11 17:45:21 +02:00
Shea Levy 52f998a2ce Merge branch 'composeExtensions' 2017-04-11 11:16:29 -04:00
Jörg Thalheim 58771c482c Merge pull request #24571 from jbgi/kodi-dvdfix
Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback)
2017-04-11 16:11:17 +02:00
Eelco Dolstra 29b415dcdb
Add nixUnstable.perl-bindings 2017-04-11 15:36:51 +02:00
Eelco Dolstra 3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa 2017-04-11 15:02:45 +02:00
Rok Garbas 8fcb9275d1
pypi2nix: 1.6.0 -> 1.8.0 2017-04-11 14:33:54 +02:00
Rok Garbas 8c8942a5e4
firefox-bin: alsaLib.dev is needed 2017-04-11 14:33:54 +02:00
Thomas Tuegel 149ba2e9dc Merge pull request #24811 from mdorman/emacs-updates
Automated emacs package updates
2017-04-11 07:20:10 -05:00
Benno Fünfstück 285097af27 rustRegistry: 2017-04-08 -> 2017-04-11 2017-04-11 14:16:28 +02:00
Jörg Thalheim c84dd4f09e Merge pull request #24526 from miltador/jetbrains
idea: numerous fixes and improvements
2017-04-11 13:56:20 +02:00
Tuomas Tynkkynen 7f8202bf83 Fix tarball evaluation
http://hydra.nixos.org/build/51460386

This seems the path of least resistance. Adding "x86_64-darwin" to
supportedSystems causes other errors.
2017-04-11 13:45:29 +03:00
Arseniy Seroka 3bbe26cf5f Merge pull request #24793 from sargon/update/trayer
trayer: 1.1.6 -> 1.1.7
2017-04-11 13:09:43 +03:00
Arseniy Seroka fe9faacebe Merge pull request #24795 from mayflower/emby_3.2.12
emby: 3.2.10 -> 3.2.12
2017-04-11 13:04:47 +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
Jörg Thalheim c03b91cdcf Merge pull request #24812 from jonafato/keepassx-community-2.1.4
keepassx-community: 2.1.3 -> 2.1.4
2017-04-11 09:54:52 +02:00
Tuomas Tynkkynen b002d6a868 Revert "btrfs-progs: 4.8.2 -> 4.10.2"
This reverts commit c0cef0425e.

The output of the command-line tool has changed somewhat and at least
nixos-generate-config.pl needs modifications to match. I'm leaving that
to someone who knows a bit more about btrfs.

Issue #24810.
2017-04-11 09:54:43 +03:00
Jörg Thalheim e09b950f54
openvpn: remove no longer correct systemd-notify.patch
This patch was only necessary for 2.3.x, while 2.4.0 improved
its own systemd notify support.

See: https://github.com/NixOS/nixpkgs/issues/24817
2017-04-11 08:51:56 +02:00
Tuomas Tynkkynen 9ae8ce813e dosfstools: Use --enable-compat-symlinks
http://hydra.nixos.org/build/51461475
2017-04-11 09:37:45 +03:00
aszlig 5d5c0d590f
Revert "sddm: Fix test."
This reverts commit 0a6a06346a.

The commit replaced the text to search for from ALICE to BOB, because
our OCR detection only caught "BOB FOOBAR" but missed "ALICE FOOBAR"
completely.

With the improvements to our OCR system this no longer is the case and
the test passes successfully with this reverted.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @shlevy
2017-04-11 03:21:58 +02:00
aszlig a443bdc0a6
nixos/testing: Improve quality of OCR
First of all, we're now using ImageMagick to improve the screenshot so
that Tesseract has an esier time to recognize the text. The resulting
image of this post-processing is a scaled up black-and-white version
with the backgrounds almost entirely removed and the text edges a bit
blurred, so the screen shots now more or less resemble an image from a
scanner rather. This is what Tesseract is trained for by default.

As mentioned in the previous commit we now also use Tesseract 4, which
further improves the quality of text recognition.

I've spent countless hours just to test different postprocessing
variants and testing what works best for our tests and this is the one
that worked best so far. It's certainly not perfect and I'd like to
avoid the scaling step but we're way better off than before.

In addition to this, the OCR process is now done without an intermediate
file, solely using pipes.

I've tested this using the following VM tests which have OCR enabled:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

All of the tests still succeed and comparing some of the recognition
results to the earlier results it now also detects a lot more text than
before this commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:53 +02:00
aszlig 7b5263e1a6
tesseract: Package version 4.x from Git master
Tesseract 4 has got a new long short-term memory neural networking based
OCR engine which really helps a lot in terms of accuracy and our VM
tests.

I ran the new version across a bunch of different screenshots and
comparing the results to the 3.x branch and it really makes a big
difference, especially with various font rendering settings.

The only downside of this is that version 4 hasn't been released yet and
is in alpha state right now, but it will eventually get there and the
only solutions that came into my mind sticking to version 3 were really
sub-par:

 * Use several passes with different color negation on the screenshots.
 * Train Tesseract 3 specifically for screenshots. This is sub-par
   because we'd need to do it for Tesseract 4 from scratch again.
 * Change the test systems so that it specifically uses *only* OCR an
   font when displaying. I've actually tried this but this also isn't
   accurate enough with our default font rendering setup.
 * Turn off special font rendering settings for our tests. In
   conjunction with changing to an OCR font this might work but it won't
   catch all the cases, because applications might use their own font
   rendering.

Given that version 4 is faster[1] when it comes to OCR detection and also
the points just mentioned I think even using the alpha version just for
tests isn't going to hurt anybody.

[1]: https://github.com/tesseract-ocr/tesseract/wiki/4.0-Accuracy-and-Performance

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:46 +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 121751e10f
pyocr: 0.4.4 -> 0.4.6
Upstream changes for version 0.4.5:

 * Clean up exceptions raised when OCR fails:
 * Now, all tools raise only exceptions inheriting from
   pyocr.PyocrException
 * There is now one and only one TesseractError (shared between
   pyocr.libtesseract and pyocr.tesseract)

Upstream changes for version 0.4.6:

 * hOCR outputs: Generate valid XHTML files

The full upstream changelog can be found at:

https://github.com/jflesch/pyocr/blob/master/ChangeLog

Note that because of the version bump of Tesseract neither version 0.4.4
nor version 0.4.6 succeed to build, so we need to fix this up soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:36 +02:00
aszlig c381fa9b63
tesseract: 3.04.01 -> 3.05.00
Upstream changelog:

 * Made some fine tuning to the hOCR output.
 * Added TSV as another optional output format.
 * Fixed ABI break introduced in 3.04.00 with the AnalyseLayout()
   method.
 * text2image tool - Enable all OpenType ligatures available in a font.
   This feature requires Pango 1.38 or newer.
 * Training tools - Replaced asserts with tprintf() and exit(1).
 * Fixed Cygwin compatibility.
 * Improved multipage tiff processing.
 * Improved the embedded pdf font (pdf.ttf).
 * Enable selection of OCR engine mode from command line.
 * Changed tesseract command line parameter '-psm' to '--psm'.
 * Added new C API for orientation and script detection, removed the old
   one.
 * Increased minimum autoconf version to 2.59.
 * Removed dead code.
 * Fixed many compiler warning.
 * Fixed memory and resource leaks.
 * Fixed some issues with the 'Cube' OCR engine.
 * Fixed some openCL issues.
 * Added option to build Tesseract with CMake build system.
 * Implemented CPPAN support for easy Windows building.

The upstream URL of the change log is:

https://github.com/tesseract-ocr/tesseract/releases/tag/3.05.00

Tested by building against the following packages that directly depend
on it:

 * vapoursynth (with ocrSupport = true)
 * pyocr (fails)
 * vobsub2srt

Also tested against the following NixOS VM tests that have OCR enabled:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

All of the packages and tests except pyocr build/succeed on
x86_64-linux.

Fixing pyocr is outside of the scope of this commit and will happen very
soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:32 +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
aszlig 288a79187c
tesseract: Reintroduce enableLanguages
I've removed that attribute in 68bc260ca2,
because the language files no longer were distributed as seperate files,
but if we for example only want to use the English training data, the
closure size of Tesseract gets quite large (around 1.2 GB), which is a
bit much just to be able to run NixOS VM tests.

For this reason I've also switched the VM tests back to using only the
English language.

Tested using the following VM tests (the ones that have OCR enabled) on
x86_64-linux:

 * nixos/tests/chromium.nix -A stable
 * nixos/tests/emacs-daemon.nix
 * nixos/tests/installer.nix -A luksroot
 * nixos/tests/lightdm.nix
 * nixos/tests/plasma5.nix
 * nixos/tests/sddm.nix

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:26 +02:00
Jon Banafato 4a4719c6ec keepassx-community: 2.1.3 -> 2.1.4
KeePassXC has a new bugfix release available: https://github.com/keepassxreboot/keepassxc/releases/tag/2.1.4
2017-04-10 20:54:23 -04:00
Michael Alan Dorman 5a5eea34cc melpa-packages: 2017-04-10
Removals:
 - dos: package removed from melpa
2017-04-10 19:20:07 -04:00
Michael Alan Dorman f087fd3c70 melpa-stable-packages: 2017-04-10 2017-04-10 19:20:07 -04:00
Michael Alan Dorman 842417b4bc elpa-packages: 2017-04-10 2017-04-10 19:20:07 -04:00
Nikolay Amiantov c8c340b05a tlp service: mask systemd-rfkill
Fixes #24737.
2017-04-11 02:09:29 +03:00
Philipp Steinpass eec5775a4c steam: move libpciaccess as non-runtime dependencies 2017-04-11 01:51:46 +03:00
Aristid Breitkreuz 6f3b15e3c1 Merge pull request #24798 from avnik/wine-update
wineUnstable: 2.4 -> 2.5
2017-04-10 23:26:50 +02:00
Robert Helgesson 08656a73f0
gpsbabel: fix darwin build 2017-04-10 22:57:06 +02:00
Aristid Breitkreuz 7813c9676a Merge pull request #24802 from asymmetric/awscli
awscli: 1.11.45 -> 1.11.75
2017-04-10 22:55:13 +02:00
John Ericson 2b85b38b1f Merge pull request #24804 from Ericson2314/platform-whitespace
top-level/platforms.nix: Reformat and clean up whitespace
2017-04-10 16:30:43 -04:00
John Ericson f3055a3c50 top-level/platforms.nix: Reformat and clean up whitespace 2017-04-10 15:39:47 -04:00