1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Commit graph

62993 commits

Author SHA1 Message Date
Charles Strahan 688e9ea04c ghcjs: bump ghcjs and ghcjs-boot
fixes #7881
2015-05-21 21:03:54 -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
Michael Raskin 86da6fae74 Update fltk to 1.3.3; apparently it includes most of the old patch now 2015-05-21 19:48:25 +03:00
Michael Raskin aca9050ad9 Use 32-bit Wine for Pipelight 2015-05-21 19:48:25 +03:00
John Wiegley 597aebc94d libgcrypt: Set libpcap to null on Darwin 2015-05-21 10:55:54 -05:00
John Wiegley 7d4b5d04c8 bedrock: Change build to use "src native" 2015-05-21 10:55:17 -05:00
John Wiegley 725005b89f emacs24Macport: Upgrade Mac Port patch to 5.8 2015-05-21 10:55:00 -05:00
Pascal Wittmann 623f5f78da Merge pull request #7924 from DamienCassou/update-openal-1.16.0
openal 1.7.411 -> 1.16.0
2015-05-21 16:06:45 +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
Pascal Wittmann 16a745fbb9 libs3: fix meta attributes 2015-05-21 15:41:06 +02:00
Pascal Wittmann 71aaebc954 thrust: fix build 2015-05-21 15:24:59 +02:00
Peter Simons 0c35edb25c haskell-wuss: test suite needs network access --> disable to fix the build 2015-05-21 14:57:18 +02:00
Peter Simons 9b9d94def4 Disable builds for broken Haskell packages lens-action and servant-server. 2015-05-21 14:57:17 +02:00
Peter Simons 0a85cee798 haskell-curlhs: disable failing test suite 2015-05-21 14:57:17 +02:00
Peter Simons f26b51e00e haskell-language-glsl: build has been fixed upstream 2015-05-21 14:57:17 +02:00
Nikolay Amiantov 7e55534e8d haskell-idris: fix build 2015-05-21 14:57:17 +02:00
Nikolay Amiantov 03f9f0a634 haskell-cheapskate: not broken now 2015-05-21 14:57:17 +02:00
Nikolay Amiantov 743c265797 haskell-pandoc: use ordinary jailbreak 2015-05-21 14:57:16 +02:00
Peter Simons bf468dac2b haskell-HList: the build errors have been fixed upstream 2015-05-21 14:57:16 +02:00
Peter Simons 493663d785 jailbreak-cabal: always build the tool with Cabal 1.20
This change mitigates the effects of https://github.com/peti/jailbreak-cabal/issues/9.
2015-05-21 14:57:16 +02:00
Peter Simons 06d002acb5 hackage-packages.nix: update to 25810f6054 with hackage2nix revision a70a5194597133ba31b950c826ef09206249cca9 2015-05-21 14:57:12 +02:00
Arseniy Seroka 8d10975e4d Merge pull request #7918 from codyopel/ffmpeg
ffmpeg(-full): 2.6.2 -> 2.6.3
2015-05-21 15:48:23 +03:00
Ricardo M. Correia 5277bf945d grsecurity: Update stable patch from 3.1-3.14.43-201505181929 -> 3.1-3.14.43-201505191737 2015-05-21 14:45:56 +02:00
Damien Cassou 515f88cb54 openal 1.7.411 -> 1.16.0 2015-05-21 14:08:19 +02:00
Paulus Esterhazy c4a8acd983 Add sqlite3_analyzer 2015-05-21 13:57:53 +02:00
aszlig 7808efe5b7
nixos/release: Add luksroot test to "tested" job.
We want to avoid getting broken LUKS systems into the latest channel, so
let's ensure that the channel update won't happen if LUKS support is
broken again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 13:21:41 +02:00
aszlig 1f34503010
nixos/tests/installer: Add test for LUKS rootfs.
This serves as a regression test for #7859.

It's pretty straightforward, except from the fact that nixos-generate-
config doesn't detect LUKS devices and the "sleep 60".

As for the former, I have tried to add support for LUKS devices for
nixos-generate-config, but it's not so easy as it sounds, because we
need to create a device tree across all possible mappers and/or LVM up
to the "real" device and then decide whether it is relevant to what is
currently mounted. So I guess this is something for the nixpart branch
(see #2079).

And the latter isn't very trivial as well, because the LUKS passphrase
prompt is issued on /dev/console, which is the last "console=..." kernel
parameter (thus the `mkAfter`). So we can't simply grep the log, because
the prompt ends up being on one terminal only (tty0) and using select()
on $machine->{socket} doesn't work very well, because the FD is always
"ready for read". If we would read the FD, we would conflict with
$machine->connect and end up having an inconsistent state. Another idea
would be to use multithreading to do $machine->connect while feeding the
passphrase prompt in a loop and stop the thread once $machine->connect
is done. Turns out that this is not so easy as well, because the threads
need to share the $machine object and of course need to do properly
locking.

In the end I decided to use the "blindly hope that 60 seconds is enough"
approach for now and come up with a better solution later. Other VM
tests surely use sleep as well, but it's $machine->sleep, which is bound
to the clock of the VM, so if the build machine is on high load, a
$machine->sleep gets properly delayed but the timer outside the VM won't
get that delay, so the test is not deterministic.

Tested against the following revisions:

5e3fe39: Before the libgcrypt cleanup (a71f78a) that broke cryptsetup.
69a6848: While cryptsetup was broken (obviously the test failed).
15faa43: After cryptsetup has been switched to OpenSSL (fd588f9).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 13:21:41 +02:00
aszlig 3b396701fd
nixos/tests/installer: Allow pre-boot commands.
These commands will be executed directly after the machine is created,
so it gives us the chance to for example type in passphrases using the
virtual keyboard.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 13:21:41 +02:00
aszlig 5d2c6f0353
nixos/tests/installer: Allow to pass extra config.
We're going to need it for installer tests where nixos-generate-config
isn't yet able to fully detect the filesystems/hardware. for example for
device mapper configurations other than LVM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-21 13:21:40 +02:00
Luca Bruno 478e1d6f14 vanubi: use vte 2.90 2015-05-21 12:58:01 +02:00
Joachim Schiele d254729034 goPackage: enabled checks for goquery/cascadia 2015-05-21 12:55:44 +02:00
Joachim Schiele a523f234f1 Merge pull request #7921 from qknight/goPackages_pq_goquery_cascadia
new goPackage(s): pq, goquery, cascadia
2015-05-21 12:51:44 +02:00
Joachim Schiele ed8e6f62df new goPackage(s): goquery, cascadia 2015-05-21 12:51:04 +02:00