Commit graph

69072 commits

Author SHA1 Message Date
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
Thomas Tuegel 3dcff36085 julia: build dependencies with same openblas 2015-09-16 11:19:03 -05:00
Thomas Tuegel aa4efac850 arpack: update homepage 2015-09-16 11:08:39 -05:00
lethalman 8e6acbe201 Merge pull request #9888 from krgn/renoise
add Renoise to nixpkgs
2015-09-16 17:57:02 +02:00
karsten gebbert 6625fde1c7 add renoise to nixpkgs 2015-09-16 17:46:16 +02:00
Edward Tjörnhammar c6cadd11db Merge pull request #9785 from khumba/jitsi-rpath-fix
jitsi: patch RPATHs for missing libraries
2015-09-16 16:10:04 +02:00
Bjørn Forsman 0af5fccf2a pidgin-sipe: 1.18.1 -> 1.20.0
Build and run tested (on release-15.09 branch).
2015-09-16 15:47:16 +02:00
Bryan Gardiner 476f2e3e2d
jitsi: add myself as maintainer 2015-09-16 06:42:26 -07:00
Bryan Gardiner e422c2398c
jitsi: make a path patch for java slightly safer 2015-09-16 06:42:26 -07:00
Bryan Gardiner 8ef6197be5
jitsi: patch RPATHs of bundled .so files
Possibly helps with bug #3482.
2015-09-16 06:42:25 -07:00
Bryan Gardiner 4140c7fe16
openjdk8: add the architecture passthru from openjdk7 2015-09-16 06:42:22 -07:00
taku0 a904293857 wavpack: disabled asm for Clang 2015-09-16 21:10:19 +09:00
Edward Tjörnhammar 54ced3be71 Merge pull request #9856 from rycee/bump/svtplay-dl
svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13
2015-09-16 13:51:21 +02:00
Tobias Geerinckx-Rice 0f0b20ac0c eid-mw: 4.1.5 -> 4.1.6 2015-09-16 13:08:17 +02:00
Tobias Geerinckx-Rice 33d2f27d95 stress-ng: 0.04.18 -> 0.04.19 2015-09-16 13:08:17 +02:00
lethalman d938e6bad5 Merge pull request #9881 from rycee/bump/some-perl-packages
Bump versions of some Perl packages
2015-09-16 11:23:34 +02:00
Domen Kožar 122efd93d0 Merge pull request #9880 from mbbx6spp/add-package-option-elasticsearch-module
elasticsearch module: add package option
2015-09-16 10:48:16 +02:00
aszlig cb5e5a5b9d
Revert "makeInitrd, makeModulesClosure: reduce repetition"
This reverts commit b5ee55f81f.

The reason is that the args attribute in this case doesn't contain the
optional attributes which are specified, see here for example:

$ nix-instantiate --eval -E '(args@{ bar ? 111, ... }: args) {}'
{ }
$

This essentially breaks all VM tests, because stage-1 is passing all
arguments but pkgs/build-support/vm/default.nix does not.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 10:33:10 +02:00