Commit graph

173 commits

Author SHA1 Message Date
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
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
Arseniy Seroka f134150180 Merge pull request #7857 from rushmorem/marathon-module-update
Update Marathon module
2015-05-21 16:52:14 +03:00
rushmorem b5820a5ebd Update Marathon module
The new module makes it possible to pass extra commandline
arguments to Marathon as well as environment variables.
2015-05-21 15:45:13 +02:00
Eelco Dolstra 10ce7ae769 Document the nixpkgs-channels repo
This replaces update-channel-branches.sh with standard Git
invocations.
2015-05-20 14:20:53 +02:00
Thomas Tuegel c59c20ca0f Update HPLIP to 3.15.4 2015-05-16 14:12:11 -05:00
Jascha Geerds 19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise""
This reverts commit 48e65cec4e.
2015-05-10 20:47:50 +02:00
Jascha Geerds 48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds 116006702b cups: Add changelog for the upcoming NixOS release 2015-05-10 12:41:21 +02:00
Bram Duvigneau e37dbea942 Document the brltty servicve in release notes 2015-05-01 00:08:48 +02:00
Domen Kožar f39b1ead2a manual: re-add running nixos tests sections 2015-04-21 02:28:59 -04:00
aszlig e6591588a9
releaso-notes: Document changes from #7349.
Thanks to @domenkozar for implicitly reminding me that documentation is
probably our biggest issue. And I'm a dumbass for contributing to that
situation, so let's do better than that and document it.

The current changes are only preparation for a bigger change coming real
soon[TM] in Hydra and release-tools, so right now it's still a bit
tedious to create custom channels.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-15 21:48:16 +02:00
Luca Bruno fe6b0b15e6 nixos-install: support -j, --cores and --option. Closes #6755 2015-03-11 16:47:44 +00:00
Eelco Dolstra 8a9e427174 Manual tweak 2015-03-11 15:34:57 +01:00
Luca Bruno 6fdd92742c Document container@ systemd service 2015-03-10 16:23:00 +01:00
Eelco Dolstra a574065a81 nixos-rebuild: Add ‘dry-activate’ command
‘nixos-rebuild dry-activate’ builds the new configuration and then
prints what systemd services would be stopped, restarted etc. if the
configuration were actually activated. This could be extended later to
show other activation actions (like uids being deleted).

To prevent confusion, ‘nixos-rebuild dry-run’ has been renamed to
‘nixos-rebuild dry-build’.
2015-03-09 16:50:59 +01:00
Vladimír Čunát dfaded0b8e nixos docs: fix typo 2015-03-07 14:44:13 +01:00
Nikita Mikhailov 25e29b3870 Correct NetworkManager documentation 2015-02-24 22:09:36 +05:00
Nikolay Amiantov 540e3a63e4 manual/release-notes: add unstable release notes with first entries 2015-02-06 02:57:49 +03:00
aszlig 6308cba3fa
nixos/manual: Re-add development section.
I think this has been accidentally dropped by a099ca4, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-25 20:12:06 +01:00
Eelco Dolstra f637e27138 Fix release notes 2015-01-21 16:27:48 +01:00
Domen Kožar c876f7a25d document options to nixos-install script 2015-01-06 14:49:24 +01:00
Khalid Jebbari b385d14b81 Fix typo in recursive set example 2015-01-04 19:28:16 +01:00
Khalid Jebbari 1d3a592ae0 Bad name for the NixOS download page 2015-01-04 18:33:30 +01:00
Domen Kožar 79a51b0cf3 Add Type information into manual and manpages, fixes #4600 2015-01-04 15:41:32 +01:00
Eelco Dolstra c2af4f3ea8 Tweak 2014-12-31 01:29:05 +01:00
Vladimír Čunát 13d5f305da nixos/doc release notes: mention intel GPU driver
(cherry picked from commit 3865ab9e6901a529fbb480599c94f4a04d93c71d)
2014-12-31 01:29:05 +01:00
aszlig d137ff33e2
nixos/release-notes: Fix typo in VirtualBox notes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-30 23:42:14 +01:00
Eelco Dolstra 3370ee6a13 Document small channels 2014-12-30 22:31:27 +01:00
Eelco Dolstra cf1d9ed317 Release notes tweak 2014-12-30 18:43:13 +01:00
Eelco Dolstra 4df1ca0875 Sort stuff 2014-12-30 18:43:13 +01:00
Eelco Dolstra adf62ba9c1 Drop reference to obsolete ControlGroupAttribute option 2014-12-30 18:32:05 +01:00
Eelco Dolstra c502369a23 Release notes 2014-12-30 18:25:02 +01:00
Eelco Dolstra 5f2d5fcc12 Release date 2014-12-30 18:12:52 +01:00
Nicolas B. Pierron c231506b5a Merge pull request #5362 from nbp/update-channels
Add a script to add git branches for each channel.

To create / update references to remote / local channels, you have to run `./maintainers/scripts/update-channel-branches.sh` while you are at the top-level of nixpkgs work directory.  To make this convenient for Nixpkgs / NixOS developer, one can run the following command:

```
$ git config --add alias.fetch-channels '!sh -c "$(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh"'
```

Which will register the alias fetch-channels such that the script can used from sub-directory of nixpkgs by running `git fetch-channels`.
2014-12-20 16:49:18 -08:00
aszlig efb2b27a8f
nixos: Add VBox hardening to 14.12 release notes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-18 22:58:37 +01:00
Nicolas B. Pierron 9334085e80 update-channel-branches.sh: Add verbosity to improve the user experience, and update NixOS documentation. 2014-12-18 22:25:21 +01:00
Domen Kožar 3d5220e691 release notes: reindent, remove renames (redudant)
(cherry picked from commit 8566f66ea44f7adf050d92bd8dc8de9ba814f0d1)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 12:22:22 +01:00
Domen Kožar 44af18f8ae update release notes
(cherry picked from commit 33e9a0503a55aef49c4d8750a712388ab71b6446)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 12:22:17 +01:00
Eelco Dolstra 997531d172 Document screen incompatibility 2014-12-15 19:55:37 +01:00
Peter Simons 60f21f983f nixos/doc/manual/release-notes/rl-1412.xml: document change of default time zone
https://github.com/NixOS/nixpkgs/pull/5332
2014-12-15 16:38:04 +01:00
Domen Kožar 5d9b24e1ec typo
(cherry picked from commit ad4e371acf5104ecf6a309ca8f974c7147ba1843)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 11:29:09 +01:00
Domen Kožar 48a282b913 http://nixos.org -> https://nixos.org
(cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 11:26:45 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
2014-12-10 17:19:37 +01:00
Eelco Dolstra df1f751f03 Rename release notes 2014-12-10 17:19:37 +01:00
Eelco Dolstra faf0797c0c Use https://cache.nixos.org 2014-12-09 13:38:46 +01:00
cillianderoiste 9c90498b1f Update obtaining.xml
Avoid pointing to the wiki for the default installation method (which points back to the manual anyway). Use more words.
2014-12-07 14:38:54 +01:00
Domen Kožar b4cedc7965 nixos: reverse logic in nixos interactive tests documentation 2014-11-27 20:01:18 +01:00
Domen Kožar 91bdca38a0 NetworkManager.service -> network-manager.service 2014-11-27 12:10:20 +01:00