3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

144 commits

Author SHA1 Message Date
Eelco Dolstra b3eb981a95 apache-httpd: Make 2.4 the default
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Eelco Dolstra c7ee917197 Fix tests.runInMachine evaluation 2014-11-04 14:28:09 +01:00
Luca Bruno 5d2b3ff8cf nixos: increase allocated memory for gnome tests. Closes #4651 2014-11-02 16:33:10 +01:00
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir.
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:59 +02:00
aszlig 7676ff5973
nixpart: Bring back requirements for version 0.4.
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig 9d2e514f46
nixos/tests/partition: Fix typo in F2FS tests.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig cff26e2d38
nixos: Add VM test for blivet.
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67.
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
Domen Kožar 4941b96f0c eval fix 2014-10-07 21:46:15 +02:00
Shea Levy 92837f2dbf Ditch efi installer tests
They've been broken forever due to weirdness in qemu tests, and they don't add much over installer tests
2014-10-07 12:20:56 -04:00
Domen Kožar b0b9e5d50c tests.bittorrent: use opentracker as bittorrent tracker 2014-10-07 17:22:42 +02:00
Eelco Dolstra 7f043ffbbe tests/kde4.nix: Don't build kdeedu
This prevents a dependency on liblapack (which randomly fails) and
TeXlive (which is huge).

http://hydra.nixos.org/build/14897240
(cherry picked from commit b9bde98161)
2014-09-29 13:32:55 +02:00
Domen Kožar 63280c511e nixos: munin/jenkins: specify timeout correctly 2014-09-28 14:25:11 +02:00
Domen Kožar 1e05bbaa96 nixos: increase timeout for jenkins/munin systemd services 2014-09-27 23:28:49 +02:00
Eelco Dolstra 0a967b9268 Installer test: Use the minimal ISO
So we don't depend on KDE etc. (which we don't even test here).
2014-09-25 00:07:35 +02:00
William A. Kennington III 8250059a9f nixos/tests/nat: Add tests for standalone and firewall based nat 2014-09-18 14:39:46 -07:00
William A. Kennington III b047f2ddec nixos/tests/nat: Modify test to accomodate for firewall consolidation 2014-09-18 11:28:58 -07:00
aszlig d394d095ab
containers: Don't descend into mounts on destroy.
This tells the sad tale of @the-kenny who had bind-mounted his home
directory into a container. After doing `nixos-container destroy` he
discovered that his home directory went from "full of precious data" to
"no more data".

We want to avoid having similar sad tales in the future, so this now also
check this in the containers VM test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-11 18:12:35 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Domen Kožar 130e56cd42 nixos.tests.gnome3: wait 20sec for the screenshot 2014-09-07 14:51:10 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Thomas Tuegel 53fa517176 Merge pull request #3961 from wkennington/master.grub
nixos/install-grub: Read correct mountpoints
2014-09-05 20:01:08 -05:00
Eelco Dolstra 0dc8d73d17 Fix munin test evaluation 2014-09-06 00:54:40 +02:00
Domen Kožar b420eeba44 remove bittorrent package since it's obsolete 2014-09-05 22:49:31 +02:00
William A. Kennington III 6fb6ba48f8 nixos/installer-test: nixos-option syntax correction 2014-09-05 09:49:05 -07:00
William A. Kennington III e07e1c3fdf nixos/installer-test: Add writable store test 2014-09-05 09:48:58 -07:00
Eelco Dolstra 59edfd61ad Increase systemd timeout on Jenkins and Munin tests
These were timing out a lot.

http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
2014-09-05 15:50:55 +02:00
Eelco Dolstra daebba2c97 Fix container test 2014-09-05 14:08:35 +02:00
aszlig c9d1c0d8d1
nixos/tests: Add basic test for nsd module.
Currently only tests basic resource record lookup against IPv4 and IPv6.
Nothing special yet, but probably enough for most setups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
Strahinja Popovic fe3f7716f0 Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306 2014-09-03 15:46:59 +04:00
William A. Kennington III 4eff4afa3c nixos/installer-test: Use nested subvolumes for root to test detection 2014-09-02 09:16:13 -07:00
William A. Kennington III 3944239362 nixos/tests-installer: Add a test for btrfs default volumes and bind mounts 2014-09-02 09:16:13 -07:00
William A. Kennington III 36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
2014-09-02 09:16:13 -07:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
William A. Kennington III 3e834e1783 nixos/tests: Fix usage of head function without pkgs.lib 2014-09-01 04:39:45 -07:00
William A. Kennington III 3d037ebb94 Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""
This reverts commit ea8910652f.
2014-08-31 09:46:16 -07:00
Rob Vermaas ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6"
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
2014-08-31 10:58:54 +02:00
Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
2014-08-31 12:58:37 +04:00
William A. Kennington III 86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Luca Bruno 01f0b1cf1a Fix evaluation of nixos tested 2014-08-29 11:49:36 +02:00
William A. Kennington III cc62623b37 tests/installer: Provided test should add symlinks to /dev/disk if udev doesn't 2014-08-28 13:35:36 -07:00
William A. Kennington III 4f096c044f nixos/grub: Simplify detection of labels / uuids for provided device names 2014-08-28 13:35:36 -07:00
William A. Kennington III 6549bcff96 tests/installer: Fix provided test uuid and label mounts 2014-08-28 13:35:36 -07:00
William A. Kennington III b651097d19 tests/installer: Swapspace should be larger 2014-08-28 13:35:36 -07:00
William A. Kennington III 7264941a46 tests/installer: Remove unneeded tests 2014-08-28 13:35:36 -07:00
William A. Kennington III 429f785135 tests/installer: Fix simple tests 2014-08-28 13:35:36 -07:00
William A. Kennington III 8ff4b3b780 tests/installer: Add swap to the new tests 2014-08-28 13:35:36 -07:00
William A. Kennington III 8b36bf5c59 tests/installer: fix mount 2014-08-28 13:35:36 -07:00
William A. Kennington III 62fedf6081 installer/btrfs: Typo in subvol 2014-08-28 13:35:35 -07:00