about summary refs log tree commit diff
path: root/nixos/lib
Commit message (Collapse)AuthorAge
...
* Update option-usages.nix expression to work with newer version of the module ↵Nicolas B. Pierron2015-08-09
| | | | system.
* Unify NixOS and Nixpkgs channel structureEelco Dolstra2015-08-05
| | | | | | | | | | | | | | | | | | | | | | This is primarily to ensure that -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz and -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz and -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz behave consistently. It also allows installing packages via "nix-env -iA nixos.<pkg>" rather than "nixos.pkgs.<pkg>". It would be even better to allow "nixpkgs.<pkg>", but that requires a change to nix-channel. Fixes #7659.
* nixUnstable: Update to 1.10pre4200_76cc8e9Eelco Dolstra2015-07-30
| | | | Also unify the nixStable and nixUnstable expressions.
* Merge pull request #8978 from dezgeg/pr-arm-imagesviric2015-07-29
|\ | | | | ARM SD card image expressions
| * nixos: Add derivations for SD card installation images on ARMTuomas Tynkkynen2015-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resulting image can be copied to a SD card with `dd` and is directly bootable by a suitably configured U-Boot. Though depending on the board, some extra steps are required for copying U-Boot itself to the SD card. Inside the image is a partition table, with a FAT32 /boot and a normal writable EXT4 rootfs. It's possible to directly reuse the SD image's partition layout and "install" NixOS on the same SD card by replacing the default configuration.nix and nixos-rebuild, and actually is the preferred way to use these images. To assist in this installation method, the boot scripts on the image automatically resize the rootfs partition to fit the SD card on the first boot. The SD images come in two flavors; one for the ARMv6 Raspberry Pi, and one multiplatform image for all the boards supported by the mainline kernel's multi_v7_defconfig config target. At the moment, these have been tested on: - Raspberry Pi Model B (512MB model) - NVIDIA Jetson TK1 - Linksprite pcDuino3 Nano To build, run: nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage \ -I nixos-config='<nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix>'
* | Remove zipTwoListsEelco Dolstra2015-07-28
|/ | | | This function is redundant (we also have zipLists).
* all tests: added meta.maintainers sectionJoachim Schiele2015-07-12
|
* Factor the NixOS channel building code out into its own file, so I can use ↵Dan Peebles2015-06-13
| | | | it elsewhere
* Simple EC2 user-data VM testDan Peebles2015-06-11
|
* Merge pull request #8204 from copumpkin/modulesPathDaniel Peebles2015-06-10
|\ | | | | An importable modulesPath, once again
| * Bring an importable modulesPath back from the dead, in the only way I knowDan Peebles2015-06-08
| |
* | Drop obsolete boot=on parameterEelco Dolstra2015-06-10
|/
* nixos/test-driver: Fix bashism in Machine.pm.aszlig2015-05-22
| | | | | | Thanks to @bjornfor for the note. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixos/testing: Use stripped down tesseract only.aszlig2015-05-22
| | | | | | | Only include the English language for the VM tests, because we most likely won't need other languages. At least for now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixos/test-driver: Make tesseract OCR optional.aszlig2015-05-22
| | | | | | | | | | | | | | | | | By default this is now enabled, and it has to be explicitely enabled using "enableOCR = true". If it is set to false, any usage of getScreenText or waitForText will fail with an error suggesting to pass enableOCR. This should get rid of the rather large dependency on tesseract which we don't need for most tests. Note, that I'm using system("type -P") here to check whether tesseract is in PATH. I know it's a bashism but we already have other bashisms within the test scripts and we also run it with bash, so IMHO it's not a problem here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixos/test-driver: Add new waitForText function.aszlig2015-05-21
| | | | | | | | As promised in the previous commit, this can be used similarly to $machine->waitForWindow, where you supply a regular expression and it's retrying OCR until the regexp matches. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixos/test-driver: Add new getScreenText function.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | Basically, this creates a screenshot and throws tesseract at it to recognize the characters from the screenshot. In order to produce a result that is well enough, we're using lanczos scaling and scale the image up to 400% of its original size. This provides the base functionality for a new Machine method which will be called waitForText. I originally had that idea long ago when writing the VM tests for VirtualBox and Chromium, but thought it would be disproportionate to the case. The downside however is that VM tests now depend on tesseract, but given the average runtime of our tests it really shouldn't have a too big impact and it's only a runtime dependency after all. Another issue is that the OCR process takes quite some time to finish, but IMHO it's better (as in more deterministic) than to rely on sleep(). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* VM tests: Don't produce output on failureEelco Dolstra2015-04-10
| | | | | Producing output makes it hard to restart builds that failed for intermittent reasons (like timeouts). So let's not do that.
* Merge rename.nix changes.Nicolas B. Pierron2015-04-03
|\
| * nixos: test: add tests for booting installation iso in various waysBob van der Linden2015-03-24
| |
| * nixos: iso-image: filename escaping in xorrisoBob van der Linden2015-03-24
| |
| * nixos: iso-image: use syslinux bootloader for USB booting supportBob van der Linden2015-03-24
| | | | | | | | | | | | | | This changes the bootloader for iso generation from Grub to syslinux. In addition this adds USB booting support, so that "dd" can be used to burn the generated ISO to USB thumbdrives instead of needing applications like UnetBootin.
* | Document and rename internal option of modules.Nicolas B. Pierron2015-03-15
| |
* | Move most extra args out of eval-config.nixShea Levy2015-03-12
| |
* | Add comments about the module system interfaceShea Levy2015-03-12
| | | | | | | | | | | | | | Ideally the module system could be configured pretty much completely by the contents of the modules themselves, so add comments about avoiding complicating it further and possibly removing now-redundant configurability from the existing interface.
* | evalModules: Add internal option for the check argumentShea Levy2015-03-12
| |
* | nixos: Don't evaluate twice to get the value of config.nixpkgsShea Levy2015-03-12
|/
* In a test VM it's impossible to connect to itself, so fix thisSander van der Burg2015-02-19
|
* nixos: allow adding extra modules through environmentMathijs Kwik2014-12-16
| | | | | | | | | | | | | | This is useful for adding extra functionality or defaults to _every_ nixos evaluation. My use case is overriding behaviour for all nixos tests, for example setting packageOverrides to newer versions and changing some default dependencies/settings. By making this accessible through an environment variable, this can now be fully accomplished externally. No more need to fork nixos/nixpkgs (which becomes a maintenance burden), just use the channel instead and plug in via this envvar.
* nixos/make-system-tarball: extra commands to be executed before archiveJaka Hudoklin2014-12-11
|
* Revert "nixos: iso-image: use syslinux bootloader for USB booting support"Luca Bruno2014-11-08
| | | | This reverts commit 455db168b30d53c903c96be80ef843b79e0744ae.
* nixos: iso-image: use syslinux bootloader for USB booting supportBob van der Linden2014-11-02
| | | | | | | This changes the bootloader for iso generation from Grub to syslinux. In addition this adds USB booting support, so that "dd" can be used to burn the generated ISO to USB thumbdrives instead of needing applications like UnetBootin.
* test-driver: Use netpbm instead of imagemagickEelco Dolstra2014-09-25
| | | | Imagemagick pulls in 100s of megabytes of dependencies.
* nixos/test-reports: use local copy of jqueryBjørn Forsman2014-09-07
| | | | | | | | | | | | | | The current way test reports get jquery, src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js" only works when getting reports over http:// or https://, not file://. Change it so that it works for all protocols by using a local copy of jquery. This fixes the issue where locally created and browsed test reports cannot be navigated properly; clicking the '+' symbol to expand sub-sections doesn't work.
* nixos/utils: Don't remove first character if not a /William A. Kennington III2014-09-03
|
* Merge pull request #3779 from offlinehacker/dockerMichael Raskin2014-09-02
|\ | | | | full nixos inside docker
| * nixos: make-system-tarball, add option for extra arguments for tarJaka Hudoklin2014-08-25
| | | | | | | | | | | | Sometimes extra arguments when making tarball are required, for example if making a container owner of files has to be changed to root.
* | Revert "Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by ↵William A. Kennington III2014-08-31
| | | | | | | | | | | | 86c0f8c"" This reverts commit 2f697bf6931b24cdd428e22effbf6427a85afd42.
* | Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""William A. Kennington III2014-08-31
| | | | | | | | This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
* | Revert "Merge pull request #3182 from wkennington/master.ipv6"Rob Vermaas2014-08-31
| | | | | | | | | | This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
* | Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"Rob Vermaas2014-08-31
| | | | | | | | This reverts commit 704e91bab005eabe968a3b140222fb0cf7afd4db.
* | Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8cRickard Nilsson2014-08-30
| |
* | Refactor nixos files relying on the old ipAddress / prefixLength / ↵William A. Kennington III2014-08-30
|/ | | | subnetMask attributes
* Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-08-04
|\ | | | | | | | | Conflicts: pkgs/desktops/e18/enlightenment.nix
| * makeTest: Pass nodes attributeEelco Dolstra2014-07-30
| | | | | | | | | | | | This allows doing things like: nix-build nixos/tests/misc.nix -A nodes.machine.config.system.build.initialRamdisk
* | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-07-01
|\| | | | | | | | | Conflicts: pkgs/servers/serfdom/default.nix
| * support for nixos test namesFlorian Friesdorf2014-06-28
| |
| * nixos/log2html: Remove schema from jQuery URLs.aszlig2014-06-27
| | | | | | | | | | | | | | This allows viewing test logs for example when using a Hydra running with HTTPS. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | Another attempt to eradicate ensureDirEelco Dolstra2014-06-30
|/ | | | See c556a6ea46e71e1907d78b71fab36df30297b3ad.
* test-driver: Set context to include machines created by createMachineEelco Dolstra2014-05-21
|