Commit Graph

69731 Commits

Author SHA1 Message Date
Eelco Dolstra
b3347287be Use make-disk-image.nix for VirtualBox images 2015-09-28 14:31:19 +02:00
Eelco Dolstra
f596f0323f Disable the ec2-config test
"amazon-init.nix" is not included in the default AMIs because it
unconditionally runs a nixos-rebuild. Also, the test has never worked
(http://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.ec2-config).
2015-09-28 13:47:14 +02:00
Eelco Dolstra
412477e914 Fix the EC2 test 2015-09-28 13:47:14 +02:00
Eelco Dolstra
640dff2918 Fix GRUB syntax in EC2 HVM images
There is no "root" command in GRUB 2, and it's not needed anyway. This
command delayed HVM boots for a few seconds.
2015-09-28 13:47:14 +02:00
Eelco Dolstra
7338f5ff46 ec2-data.nix: Remove superfluous check 2015-09-28 13:47:14 +02:00
Arseniy Seroka
d7d7650483 Merge pull request #10114 from ikervagyok/wpa_supplicant
wpa_supplicant: 2.4 -> 2.5
2015-09-28 14:43:45 +03:00
Rob Vermaas
ad4f110b73 Revert "nixops: 1.2 -> 1.3."
This reverts commit 43dee76b4b.
2015-09-28 11:41:10 +00:00
Rob Vermaas
43dee76b4b nixops: 1.2 -> 1.3.
(cherry picked from commit fcaf96b8d4)
2015-09-28 11:33:58 +00:00
Lengyel Balázs
c67efeb616 wpa_supplicant: 2.4 -> 2.5 2015-09-28 13:29:01 +02:00
Bjørn Forsman
3dec100104 qt55: apply mkspecs-libgl.patch from qt54 2015-09-28 10:39:11 +02:00
Bjørn Forsman
583845d00b qt54: add missing mesa include dir
Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to
find <GL/gl.h>. This fixes it.

[1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html
(Although since nixpkgs qtcreator still lacks 'examples', we have to
download the sources manually and use "qmake && make".)
2015-09-28 10:39:11 +02:00
Bjørn Forsman
c79fa9aeda Fix eval
Fix breakage from 078d544005 ("libdbusmenu-qt5: build with Qt 5.5").
2015-09-28 10:38:05 +02:00
Edward Tjörnhammar
7cef1a4150 ihaskell: pass an ipython jupyter environment 2015-09-28 09:00:00 +02:00
Charles Strahan
a36ab12727 Merge pull request #10067 from tailhook/unprivileged_overlayfs
Unprivileged overlayfs mounts kernel patch from ubuntu
2015-09-28 01:27:50 -05:00
Edward Tjörnhammar
e8ebf051a9 idea-{community,ultimate}: 14.1.4 -> 14.1.5 2015-09-28 07:22:59 +02:00
Benjamin Saunders
fce8924331 libuv: 1.6.1 -> 1.7.5
closes #9814
2015-09-28 01:00:50 -04:00
Arseniy Seroka
9597ff6c8c Merge pull request #10081 from fazo96/openmw
openmw: init at 0.36.1
2015-09-28 00:27:53 +03:00
Enrico Fasoli
e3538153b5 openmw: init at 0.36.1 2015-09-27 23:22:31 +02:00
Thomas Tuegel
cbe318d531 Merge branch 'qt-5.5' 2015-09-27 16:07:05 -05:00
Thomas Tuegel
79be4a769f manual: document Qt packaging tools 2015-09-27 16:06:29 -05:00
Arseniy Seroka
329d0271ed Merge pull request #9977 from avnik/inconsolata-lgc
inconsolata-lgc:  init at 30bbc1b
2015-09-27 23:33:14 +03:00
Arseniy Seroka
8d1dd2630a Merge pull request #10093 from yochai/master
steam: added libcxxabi workaround
2015-09-27 23:30:10 +03:00
Thomas Tuegel
c20b7ba4f3 cool-retro-term: build with Qt 5.5 2015-09-27 15:09:51 -05:00
Thomas Tuegel
3ae6dabaed plasma54: allow overriding mkDerivation 2015-09-27 15:09:51 -05:00
Thomas Tuegel
63d95f505e kdeApps_15_08: allow overriding mkDerivation 2015-09-27 15:09:51 -05:00
Thomas Tuegel
d8d5e9868c dropbox: prepare for Qt upgrade 2015-09-27 15:09:50 -05:00
Thomas Tuegel
f998d502fc dropbox: build with Qt 5.5 2015-09-27 15:09:50 -05:00
Thomas Tuegel
62fc4cf4d1 add qt5Libs 2015-09-27 15:09:49 -05:00
Thomas Tuegel
f00d622e44 dropbox: set meta.platforms 2015-09-27 15:09:49 -05:00
Thomas Tuegel
60fc0af74a sddm: build with Qt 5.5 2015-09-27 15:09:49 -05:00
Thomas Tuegel
50f76e0625 mlt-qt5: build with Qt 5.5 2015-09-27 15:09:49 -05:00
Thomas Tuegel
8d5b2be9ae lightdm_qt: build with Qt 5.5 2015-09-27 15:09:48 -05:00
Thomas Tuegel
0331d7e7a7 flightgear: build with Qt 5.5 2015-09-27 15:09:47 -05:00
Thomas Tuegel
5ecc06293a mudlet: build with Qt 5.5 2015-09-27 15:09:47 -05:00
Thomas Tuegel
51496d6c6d sonic-visualiser: build with Qt 5.5 2015-09-27 15:09:46 -05:00
Thomas Tuegel
3060396296 musescore: build with Qt 5.5 2015-09-27 15:09:46 -05:00
Thomas Tuegel
3935f63732 keyfinder: build with Qt 5.5 2015-09-27 15:09:45 -05:00
Thomas Tuegel
e25434801b fmit: build with Qt 5.5 2015-09-27 15:09:45 -05:00
Thomas Tuegel
d97dbf87c0 dfasma: build with Qt 5.5 2015-09-27 15:09:44 -05:00
Thomas Tuegel
fdc0e17490 cantata: build with Qt 5.5 2015-09-27 15:09:44 -05:00
Thomas Tuegel
9e3b22d25a telepathy_qt5: build with Qt 5.5 2015-09-27 15:09:44 -05:00
Thomas Tuegel
e462bdce89 openbr: build with Qt 5.5 2015-09-27 15:09:43 -05:00
Thomas Tuegel
e745467726 libkeyfinder: build with Qt 5.5 2015-09-27 15:09:43 -05:00
Thomas Tuegel
569316e4fc grantlee: build with Qt 5.5 2015-09-27 15:09:42 -05:00
Thomas Tuegel
dfbcab342a accounts-qt: build with Qt 5.5 2015-09-27 15:09:17 -05:00
Thomas Tuegel
4a3d7eae7e qmltermwidget: build with Qt 5.5 2015-09-27 15:08:49 -05:00
Thomas Tuegel
3d6110d221 deprecate kde414.networkmanagement 2015-09-27 15:08:49 -05:00
Thomas Tuegel
38461f18c3 signon: build with Qt 5.5 2015-09-27 15:08:48 -05:00
Thomas Tuegel
078d544005 libdbusmenu-qt5: build with Qt 5.5 2015-09-27 15:08:46 -05:00
Thomas Tuegel
cf4defce2c quassel: build with Qt 5.5 2015-09-27 15:08:12 -05:00