Commit graph

63199 commits

Author SHA1 Message Date
Peter Simons
2e01d4a2b6 haskell-pipes-errors: fix build of latest (non-default) version 2015-05-22 16:35:55 +02:00
Peter Simons
da6567785b hackage-packages.nix: update to 134ac5a06c with hackage2nix revision a31a6f02a9c437a93e5f13394aa2268f476433aa 2015-05-22 16:35:52 +02:00
Peter Simons
86d299bc6e nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:

 | #! /usr/bin/env bash
 |
 | moduliFiles=()
 |
 | generateModuli()
 | {
 |   ssh-keygen -G "moduli-$1.candidates" -b "$1"
 |   ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
 |   rm "moduli-$1.candidates"
 | }
 |
 | for (( i=0 ; i <= 16 ; ++i )); do
 |   let bitSize="2048 + i * 128"
 |   generateModuli "$bitSize" &
 |   moduliFiles+=( "moduli-$bitSize" )
 | done
 | wait
 |
 | echo >moduli "# Time Type Tests Tries Size Generator Modulus"
 | cat >>moduli "${moduliFiles[@]}"
 | rm "${moduliFiles[@]}"

Note that generating moduli takes a long time, i.e. several hours on a fast
machine!

This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.
2015-05-22 16:28:45 +02:00
viric
bcfa84cae2 Merge pull request #7878 from dezgeg/pr-extlinux
generic-extlinux-compatible: Add new bootloader for ARM
2015-05-22 16:02:22 +02:00
Spencer Whitt
7aeab54129 Readme: Minor grammatical tweaks 2015-05-22 09:10:47 -04:00
Edward Tjörnhammar
a49afdf174 idea.clion: 1.0.2 -> 1.0.3
idea.android-studio: 1.2.0.12 -> 1.2.1.1
2015-05-22 14:28:48 +02:00
Arseniy Seroka
adfc77fcdf Merge pull request #7935 from doublec/tor
Update tor to 0.2.6.8
2015-05-22 14:48:04 +03:00
Eelco Dolstra
178c52e7ad Add Ubuntu 15.04 2015-05-22 13:21:02 +02:00
Sander van der Burg
e612ea59c0 rman: add expression 2015-05-22 10:04:44 +00:00
Peter Simons
01945507c5 README.md: add line breaks to make the file readable outside of Github 2015-05-22 11:57:15 +02:00
Sander van der Burg
c5fa23cb85 rman: add package 2015-05-22 09:51:32 +00:00
Eelco Dolstra
99e9710348 thunderbird: Update to 31.7.0
Also enable parallel building, as it seems to work reliably for
Firefox.
2015-05-22 11:46:18 +02:00
aszlig
b26de39252
gyp: Revive old SVN version to build Chromium.
Works around regression from a305e6855d.

We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.

Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:37:40 +02:00
aszlig
5f50f23013
nixos/tests/chromium: Detect popup using OCR.
This will make the test a lot more reliable, because we no longer need
to press ESC multiple times hoping that it will close the popup.

Unfortunately in order to run this test I needed to locally revert the
gyp update from a305e6855d.

With the old gyp version however the test runs fine and it's able to
properly detect the popup.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:23:09 +02:00
Florian Friesdorf
dfbd1ddb8b README.md: more details for nixpkgs-channels 2015-05-22 10:55:06 +02:00
Florian Friesdorf
1b76e29552 README.md: add info about nixpkgs-channels repo 2015-05-22 10:43:33 +02:00
Tobias Geerinckx-Rice
87b27c9da5 stress-ng 0.04.02 -> 0.04.03 2015-05-22 10:39:28 +02:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00
Damien Cassou
188a067d8e Merge pull request #7929 from DamienCassou/update-networkmanager-1.0.2
networkmanager 1.0.0 -> 1.0.2
2015-05-22 10:19:48 +02:00
Damien Cassou
3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
aszlig
2475a6a239
nixos/test-driver: Fix bashism in Machine.pm.
Thanks to @bjornfor for the note.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 08:10:17 +02:00
aszlig
f12208c5a4
nixos/testing: Use stripped down tesseract only.
Only include the English language for the VM tests, because we most
likely won't need other languages. At least for now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 08:01:17 +02:00
aszlig
adb7581459
tesseract: Allow to specify a subset of languages.
Especially useful for our OCR based VM tests, where we only need the
english language. By default the argument is null so all languages are
included. If a list of language name is passed only those languages are
enabled, for example:

tesseract.override { enableLanguages = [ "eng" "spa" ]; };

To only enable support for English and Spanish languages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 07:45:59 +02:00
Allen Nelson
e802740b69 adding metadata, putting version in name 2015-05-22 00:35:13 -05:00
aszlig
8be00dc71d
nixos/test-driver: Make tesseract OCR optional.
By default this is now enabled, and it has to be explicitely enabled
using "enableOCR = true". If it is set to false, any usage of
getScreenText or waitForText will fail with an error suggesting to pass
enableOCR.

This should get rid of the rather large dependency on tesseract which
we don't need for most tests.

Note, that I'm using system("type -P") here to check whether tesseract
is in PATH. I know it's a bashism but we already have other bashisms
within the test scripts and we also run it with bash, so IMHO it's not a
problem here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 07:21:58 +02:00
William A. Kennington III
efd4fcbebc Merge pull request #7919 from codyopel/gyp
gyp: svn-1977 -> 2015-05-17
2015-05-21 20:18:13 -07:00
William A. Kennington III
904fa36ac5 Merge pull request #7917 from codyopel/x265
x265: 1.6 -> 1.7
2015-05-21 20:17:57 -07:00
William A. Kennington III
a3a19e9c8c Merge pull request #7934 from codyopel/ffmpeg-libssh
libssh: fix libsodium linking
2015-05-21 20:17:39 -07:00
William A. Kennington III
31a273cb14 nixos/tinc: users are system users 2015-05-21 20:11:13 -07:00
William A. Kennington III
4f943ef237 nixos/lightdm: More changes 2015-05-21 20:10:52 -07:00
Charles Strahan
688e9ea04c ghcjs: bump ghcjs and ghcjs-boot
fixes #7881
2015-05-21 21:03:54 -04:00
Chris Double
276bd7f16e Update tor to 0.2.6.8 2015-05-22 11:20:10 +12:00
codyopel
3e06aa3aa9 libssh: fix libsodium linking
resolves pkg-config errors for anything linking against libssh
2015-05-21 19:13:52 -04:00
Pascal Wittmann
cc0c2647f4 Merge pull request #7930 from vbgl/scribus-145
scribus: update from 1.4.4 to 1.4.5
2015-05-21 22:14:32 +02:00
Arseniy Seroka
08c39465b1 Merge pull request #7927 from vbgl/fsharp-3.1.1.32
fsharp: update from 3.1.1.31 to 3.1.1.32
2015-05-21 22:56:14 +03:00
Vincent Laporte
30d9e6b144 scribus: update from 1.4.4 to 1.4.5 2015-05-21 21:49:47 +02:00
Thomas Tuegel
ceea949bd0 kdeApps_15_04.okular: enable libspectre for PostScript 2015-05-21 14:38:40 -05:00
lethalman
064c710518 Merge pull request #7928 from gebner/libgit2-glib
Fix gnome3.libgit2-glib build.
2015-05-21 21:14:48 +02:00
Domen Kožar
43a150c05a zed: 1.0.0 -> 1.1.0 2015-05-21 21:13:40 +02:00
Gabriel Ebner
064623599f Remove reference to missing autogen.sh. 2015-05-21 20:37:40 +02:00
Vincent Laporte
7689f0b673 fsharp: update from 3.1.1.31 to 3.1.1.32 2015-05-21 20:12:34 +02:00
Vincent Laporte
a65bba1e27 tuareg-mode: fix hash 2015-05-21 20:09:53 +02:00
aszlig
77d7aa6742
nixos/tests/luksroot: Switch to use waitForText.
Fixes the "blindly hope that 60 seconds is enough" issue from 1f34503,
so that we now have a (hopefully) reliable way to wait for the
passphrase prompt.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 19:55:21 +02:00
aszlig
8bd025a75e
nixos/test-driver: Add new waitForText function.
As promised in the previous commit, this can be used similarly to
$machine->waitForWindow, where you supply a regular expression and it's
retrying OCR until the regexp matches.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 19:55:21 +02:00
aszlig
235c2228ca
nixos/test-driver: Add new getScreenText function.
Basically, this creates a screenshot and throws tesseract at it to
recognize the characters from the screenshot. In order to produce a
result that is well enough, we're using lanczos scaling and scale the
image up to 400% of its original size.

This provides the base functionality for a new Machine method which will
be called waitForText. I originally had that idea long ago when writing
the VM tests for VirtualBox and Chromium, but thought it would be
disproportionate to the case.

The downside however is that VM tests now depend on tesseract, but given
the average runtime of our tests it really shouldn't have a too big
impact and it's only a runtime dependency after all.

Another issue is that the OCR process takes quite some time to finish,
but IMHO it's better (as in more deterministic) than to rely on sleep().

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 19:55:21 +02:00
John Wiegley
5ac9e87b1b nginx: Fix build for Darwin (no AIO there) 2015-05-21 12:42:06 -05:00
Arseniy Seroka
4e838ed303 Merge pull request #6539 from jagajaga/documentation
add information about git-based pkgs
2015-05-21 19:57:53 +03:00
Pascal Wittmann
f3867899ee tightvnc: replace occurences to /usr/bin/ssh
closes #3669
2015-05-21 18:53:45 +02:00
Pascal Wittmann
691b98fc28 tightvnc: refactoring 2015-05-21 18:53:45 +02:00
Michael Raskin
9ce93b6c29 Update TigerVNC to Git version; needed for GNU TLS compatibility 2015-05-21 19:48:25 +03:00