Commit graph

69089 commits

Author SHA1 Message Date
aszlig 389e654e03
systemd: Backport fix for detecting VirtualBox.
This is a backport of systemd/systemd@e32886e.

As noted by @ts468 in #9876, systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.

Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).

Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.

Fixes #9876.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
aszlig da0e642c2b
tests/virtualbox: Add systemd-detect-virt subtest.
Addresses #9876 in the way that we want to make sure that VirtualBox 5.x
is going to be properly detected. Right now the result is "kvm", so the
subtest fails as expected with:

error: systemd-detect-virt returned "kvm" instead of "oracle" at (eval
       14) line 414, <__ANONIO__> line 92.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
Eelco Dolstra f81982e779 gdb: Update to 7.10 2015-09-17 15:56:42 +02:00
Eelco Dolstra e636e0a532 gdb: Look for debug info in /run/current-system/sw/lib/debug
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.
2015-09-17 15:56:37 +02:00
Eelco Dolstra ec5b66eb4a Enable separate debug info
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
2015-09-17 15:56:33 +02:00
Pascal Wittmann edee7f1720 Transformed meta.maintainers attributes to lists 2015-09-17 15:33:36 +02:00
Pascal Wittmann cd73f0ad69 perl-CPAN-Meta-Check: 0.009 -> 0.012 2015-09-17 15:33:36 +02:00
Pascal Wittmann b8ecf516e3 perlPackages: fix some builds
by adding ModuleMetadata to buildInputs
2015-09-17 15:33:36 +02:00
Pascal Wittmann 1983d9403d perl-Module-Metadata: 1.00019 -> 1.00027 2015-09-17 15:33:36 +02:00
Pascal Wittmann bfc52b2654 perl-CPAN-Meta: 2.142690 -> 2.150005 2015-09-17 15:33:36 +02:00
Pascal Wittmann 19e1197efa perl-B-Hooks-EndOfScope: 0.13 -> 0.15 2015-09-17 15:33:35 +02:00
Pascal Wittmann 482ae6d350 perl-Autobox: 2.82 -> 2.83 2015-09-17 15:33:35 +02:00
Luca Bruno 08bd889058 maint script gnome-latest.sh: don't write sha to a file 2015-09-17 15:21:14 +02:00
Pascal Wittmann 11aa159977 Merge pull request #9900 from LnL7/xhyve-0.2.0
xhyve: xhyve-0.1.0 -> xhyve-0.2.0
2015-09-17 15:14:01 +02:00
Rob Vermaas 7994c99d6f Update libcloud to 0.18.0. Needed for newer nixops. 2015-09-17 12:32:45 +00:00
Daiderd Jordan c0c1374b8a xhyve: xhyve-0.1.0 -> xhyve-0.2.0 2015-09-17 13:27:12 +02:00
Vladimír Čunát ab295420c5 qemu: qemu-2.4.0-x86-only -> qemu-x86-only-2.4.0 2015-09-17 12:47:45 +02:00
aszlig 03730319bd
nixos/virtualbox-image: Use 32MB of video memory.
Booting the demo/installer image won't work if the video memory is too
low. It boots into KDE, shows the background image and doesn't do
anything, according to @domenkozar.

Thanks to @domenkozar for reporting and testing this with 32MB.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig 4e23f1f908
nixos/virtualbox-image: Enable PAE on 32bit.
pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on
line 441 for 32bit systems, which implies PAE.

We now creating the OVA with PAE support enabled, which fixes bootup of
the image if people are just importing it without setting PAE
explicitly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig effe0309ee
tests/virtualbox: Put name in log descriptions.
Makes it easier to debug and find out for which machine a certain log
socket has been started or stopped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig 29f535761a
tests/virtualbox: Use antiquotes for log sockets.
We're simply using antiquotation, since it's been a while since these
got introduced (in Nix 1.7). So we can use them because it makes the
code much more readable.

As usual, I made sure that I didn't accidentally change something in
functionality:

$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig 17f58275a0
tests/virtualbox: Fix long line in guestAdditions.
This is essentially not only "wrapping" the line but refactoring into a
shorter name which is used in two places.

And yes, I know I'm very pedantic if it comes to whitespaces and line
lengths, but I made sure this doesn't change any functionality:

$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig 8f98226f50
tests/virtualbox: Allow to call it with debug attr.
Instead of manually setting debug to true or false, this should make it
possible to now run the test like this:

nix-build nixos/tests/virtualbox.nix --arg debug true

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
Bjørn Forsman b0336c9854 lftp: 4.6.3a -> 4.6.4
Upstream says:

  2015-08-20: lftp-4.6.4 released. Some bugs fixed, minor features added.
2015-09-17 12:17:19 +02:00
Domen Kožar ca6fae24b9 sqlalchemy, IMAPClient: disable on py35 2015-09-17 11:19:18 +02:00
Domen Kožar 539b39c34b python35Packages.pyparted: 3.10 -> 3.10.7 2015-09-17 11:17:03 +02:00
Jascha Geerds d8b6defaae hipchat: 2.2.1373 -> 2.2.1388 2015-09-17 11:06:24 +02:00
Vladimír Čunát 485ea9a621 xf86_video_nouveau: deprecate this alias 2015-09-17 09:11:18 +02:00
William A. Kennington III fc2b0e9d10 argyllcms: gcc5 compat 2015-09-16 21:58:53 -07:00
William A. Kennington III 318ac091b2 ldns: Compat with perl 5.22 2015-09-16 21:20:49 -07:00
Thomas Tuegel 3faf5b53a5 dropbox: 3.8.5 -> 3.8.9 2015-09-16 17:55:12 -05:00
Arseniy Seroka 6c6653a437 vimPlugins: 2015-09-17 update 2015-09-17 00:42:27 +03:00
Arseniy Seroka 742caa28cb Merge pull request #9891 from matthiasbeyer/nixos-container-completion
nixos-container: Add bash completion for "nixos-container" command
2015-09-17 00:26:14 +03:00
William A. Kennington III 35b3a53829 libabw: Boost 1.59 Compat 2015-09-16 13:45:54 -07:00
William A. Kennington III 84505bd36a grsecurity: Update patches 2015-09-16 13:35:41 -07:00
Matthias Beyer a38d9d1ca8 nixos-container: Add bash completion for "nixos-container" command 2015-09-16 22:18:48 +02:00
William A. Kennington III 5a0759971f heimdal: 2015-06-17 -> 2015-09-13 2015-09-16 13:14:23 -07:00
William A. Kennington III 62a04a8bf1 libtasn1: 4.5 -> 4.7 2015-09-16 13:05:16 -07:00
William A. Kennington III 871baf2278 kernel: 4.1.6 -> 4.1.7 2015-09-16 12:55:36 -07:00
William A. Kennington III 5975687f98 kernel: 3.14.51 -> 3.14.52 2015-09-16 12:55:36 -07:00
William A. Kennington III 72d22e3f4d kernel: 3.10.87 -> 3.10.88 2015-09-16 12:55:36 -07:00
Arseniy Seroka 69ea3f4a9a Merge pull request #9867 from AndersonTorres/intercal
Intercal: a quick fix to find gcc
2015-09-16 22:53:05 +03:00
Arseniy Seroka ea8e824cdd Merge pull request #9852 from taku0/wavpack_darwin
wavpack: disabled asm for Darwin
2015-09-16 22:52:27 +03:00
Arseniy Seroka 0345a316ae Merge pull request #9853 from odi/emacs-packages
[emacs-packages]: engine-mode init at 1.0.0
2015-09-16 22:51:45 +03:00
Arseniy Seroka 0488226367 Merge pull request #9882 from rehno-lindeque/vimPlugins-vim-jade
vimPlugins: add vim-jade
2015-09-16 22:51:21 +03:00
Bjørn Forsman c9a6b811d6 duply: 1.9.1 -> 1.9.2 2015-09-16 19:47:45 +02:00
Andreas Wagner 937741c9f3 teensy-loader-cli: consistent naming, version bump 2015-09-16 19:14:01 +02:00
Edward Tjörnhammar f02eed27f9 gitRepo: 1.21 -> 1.22 2015-09-16 19:13:27 +02:00
Bjørn Forsman b95bec7917 wireshark: 1.12.5 -> 1.12.7
Build and run tested.
2015-09-16 19:00:34 +02:00
Thomas Tuegel ac74bb296c Merge branch 'julia' 2015-09-16 11:21:56 -05:00