Commit Graph

62948 Commits

Author SHA1 Message Date
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
Arseniy Seroka
15faa43f13 Merge pull request #7853 from rushmorem/marathon-update
Update Mesos Library environment variable
2015-05-21 12:58:11 +03:00
William A. Kennington III
8d7d9723af kernel: 3.18.13 -> 3.18.14 2015-05-20 23:00:43 -07:00
William A. Kennington III
3462d04e27 kernel: 3.12.42 -> 3.12.43 2015-05-20 23:00:28 -07:00
William A. Kennington III
3988cfcbff lightdm: Add patch to fix some warnings 2015-05-20 19:14:31 -07:00
William A. Kennington III
4ed8cdc3d4 nixos/bird: Fix doc compilation 2015-05-20 18:53:54 -07:00
William A. Kennington III
acdc3e6c9a nixos/lightdm: Some fixups 2015-05-20 18:32:12 -07:00
William A. Kennington III
19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
William A. Kennington III
d6c6253be0 libseccomp: 2.2.0 -> 2.2.1 2015-05-20 18:30:22 -07:00
William A. Kennington III
737d77db75 btrfsprogs: 4.0 -> 4.0.1 2015-05-20 18:30:22 -07:00
Arseniy Seroka
a9171953c6 Merge pull request #7860 from Lassulus/bird
nixos: add bird module
2015-05-21 03:24:20 +03:00
Pascal Wittmann
bfc1582b81 jumanji: fix gsettings schemas, closes #7916 2015-05-21 01:10:24 +02:00
Pascal Wittmann
c2dd7622c5 Merge pull request #7914 from pjones/pkg/mpdris2
New package: mpDris2, MPRIS 2 support for mpd
2015-05-20 23:45:35 +02:00
Peter Jones
05a6c34e04 New package: mpDris2, MPRIS 2 support for mpd 2015-05-20 15:37:25 -06:00
John Wiegley
98ad87fb4d t1lib: Conditionalize a recent change for Darwin 2015-05-20 15:42:13 -05:00
Nikolay Amiantov
dbcfd854c8 Merge pull request #7104 from gebner/mozc
Add mozc, a Japanese input method from Google.
2015-05-20 22:20:32 +03:00
Pascal Wittmann
2043857a73 youtube-dl: update from 2015-05-15 to 2015-05-20 2015-05-20 21:14:45 +02:00
Ozan Sener
97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
Gabriel Ebner
64ecc21b9a Add mozc and its dependency zinnia. 2015-05-20 20:25:23 +02:00
Shea Levy
e3ed4b590b Fix tarball 2015-05-20 14:09:15 -04:00
Pascal Wittmann
824da827ac phpPackages.redis: update from 2.2.5 to 2.2.7 2015-05-20 18:53:25 +02:00
Pascal Wittmann
57ec836416 aliceml: update version string 2015-05-20 18:06:18 +02:00
Pascal Wittmann
64dbf824b9 Merge pull request #6973 from doublec/aliceml
Update aliceml from git to get fix for tooltips in IDE
2015-05-20 18:04:52 +02:00
Tobias Geerinckx-Rice
8a53e1a312 geolite-legacy -> 2015-05-20 2015-05-20 16:42:38 +02:00
Tobias Geerinckx-Rice
d01927269e uae: use archive.org links
The original homepage is long gone (as is the tarball it hosted).
2015-05-20 16:42:12 +02:00
Tobias Geerinckx-Rice
622bd2e15f cassandra 2.1.4 -> 2.1.5 2015-05-20 16:42:12 +02:00
Tobias Geerinckx-Rice
b4ceac808b cassandra 2.0.14 -> 2.0.15 2015-05-20 16:42:12 +02:00
Peter Simons
cf6ab47be2 oracle-instantclient: don't strip or patchelf this library 2015-05-20 16:19:11 +02:00
Thomas Tuegel
49fa221c62 Update libbluedevil to 2.1
The bluedevil build has been failing since it was updated to
2.1.1. Bluedevil and libbluedevil must be kept at the same major version!
2015-05-20 07:25:13 -05: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
Eelco Dolstra
e98da673e4 nixos-checkout: Add nixpkgs-channels as a remote
This way, you can do things like

  git checkout channels/nixos-14.12

to get the latest tested and built version of NixOS.
2015-05-20 14:16:36 +02:00
Arseniy Seroka
fedfcdedae Merge pull request #7910 from oherrala/oherrala-cfr
cfr: Update to version 0_101 and remove platform restrictions
2015-05-20 15:14:34 +03:00
Luca Bruno
404608478d networkmanagerapplet: fix VPN plugins path. Closes #7908 2015-05-20 11:57:42 +00:00
Evgeny Egorochkin
8ed3ab50ea azure-image: common: add sg3_utils 2015-05-20 13:25:01 +03:00
Evgeny Egorochkin
d6a8bdcdc6 azure sdk for python: update from 0.9.0 to 0.11.0
Conflicts:
	pkgs/top-level/python-packages.nix
2015-05-20 13:24:39 +03:00
Evgeny Egorochkin
2fe9084397 azure-image: fix, split into bootstrap and regular configurations
Conflicts:
	nixos/modules/virtualisation/azure-image.nix
2015-05-20 13:24:38 +03:00
Bjørn Forsman
db991a4024 nixos/libvirtd: remove --verbose flag
Because it spams the log:

  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
  .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
  .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: [137B blob data]
2015-05-20 12:14:18 +02:00
Bjørn Forsman
3d2d78cb39 nixos/libvirtd: add 'extraOptions' option
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
2015-05-20 12:14:18 +02:00
William A. Kennington III
f247481b5d buildGoPackage: Only install files from the goPackagePath 2015-05-20 02:44:09 -07:00
Eelco Dolstra
9a159fc2bc php: Update to latest versions 2015-05-20 11:34:08 +02:00
Pascal Wittmann
86018addc5 Merge pull request #7909 from taku0/thunderbird-bin-31.7.0
thunderbird-bin: update to version 31.7.0
2015-05-20 10:35:00 +02:00
William A. Kennington III
0bc84ecccd gummiboot: 45 -> 48 2015-05-20 00:27:03 -07:00
William A. Kennington III
3b79ea5ce4 libtheora: Refactor 2015-05-20 00:26:45 -07:00
William A. Kennington III
d220ea72e5 gnu-efi: 3.0b -> 3.0.2 2015-05-20 00:26:12 -07:00