diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 20:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 22:00:10 +0200 |
commit | 40785f0dac55be9bffa029498d20539e567822be (patch) | |
tree | c126c0271b8644830e16cd0c1a5d906d520fed65 /nixos | |
parent | ba2eec97b5022848fffeb8c85303b7afe4690e82 (diff) | |
parent | 9aa3e78ab206556754186cc2b88aea5009af0f7c (diff) | |
download | nixlib-40785f0dac55be9bffa029498d20539e567822be.tar nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.gz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.bz2 nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.lz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.xz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.zst nixlib-40785f0dac55be9bffa029498d20539e567822be.zip |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
Diffstat (limited to 'nixos')
17 files changed, 327 insertions, 87 deletions
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml new file mode 100644 index 000000000000..db7440977c9b --- /dev/null +++ b/nixos/doc/manual/man-nixos-version.xml @@ -0,0 +1,102 @@ +<refentry xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude"> + +<refmeta> + <refentrytitle><command>nixos-version</command></refentrytitle> + <manvolnum>8</manvolnum> + <refmiscinfo class="source">NixOS</refmiscinfo> +</refmeta> + +<refnamediv> + <refname><command>nixos-version</command></refname> + <refpurpose>show the version of nixpkgs NixOS was built from</refpurpose> +</refnamediv> + +<refsynopsisdiv> + <cmdsynopsis> + <command>nixos-version</command> + <arg><option>--hash</option></arg> + <arg><option>--revision</option></arg> + </cmdsynopsis> +</refsynopsisdiv> + +<refsection><title>Description</title> + +<para>This command describes the version of nixpkgs used to build +NixOS.</para> + +<para>By default the output includes:</para> + +<itemizedlist> + <listitem><para>The NixOS release</para></listitem> + <listitem><para>Number of commits since the release</para></listitem> + <listitem><para>Git SHA of the released commit</para></listitem> + <listitem><para>Codename of the NixOS release</para></listitem> +</itemizedlist> +</refsection> + +<refsection><title>Example</title> + +<para>Here is an example output, and corresponding information: +<screen>$ nixos-version +16.03.1011.6317da4 (Emu) +</screen> +</para> + +<informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Value</entry> + </row> + </thead> + <tbody> + <row> + <entry>NixOS Release</entry> + <entry><literal>16.03</literal></entry> + </row> + <row> + <entry>Commit Count</entry> + <entry><literal>1011</literal></entry> + </row> + <row> + <entry>Commit SHA</entry> + <entry><literal>6317da4</literal></entry> + </row> + <row> + <entry>Release Codename</entry> + <entry><literal>Emu</literal></entry> + </row> + </tbody> + </tgroup> +</informaltable> +<para> +</para> + + +</refsection> + + +<refsection><title>Options</title> + +<para>This command accepts the following options:</para> + +<variablelist> + + <varlistentry> + <term><option>--hash</option></term> + <term><option>--revision</option></term> + <listitem> + <para>The output will be the full hash of the git commit +<screen>$ nixos-version --hash +6317da40006f6bc2480c6781999c52d88dde2acf +</screen> + </para> + </listitem> + </varlistentry> +</variablelist> + +</refsection> +</refentry> diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 97a2c16d406e..e945e0e62639 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -27,5 +27,6 @@ <xi:include href="man-nixos-install.xml" /> <xi:include href="man-nixos-option.xml" /> <xi:include href="man-nixos-rebuild.xml" /> + <xi:include href="man-nixos-version.xml" /> </reference> diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 192f608e138f..e26caa191643 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -13,8 +13,11 @@ echo "NixOS version is $version ($major)" rm -f ec2-amis.nix +types="hvm pv" +stores="ebs s3" +regions="eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" -for type in hvm pv; do +for type in $types; do link=$stateDir/$type imageFile=$link/nixos.qcow2 system=x86_64-linux @@ -31,7 +34,7 @@ for type in hvm pv; do --arg configuration "{ imports = [ <nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix> ]; ec2.hvm = $hvmFlag; }" fi - for store in ebs s3; do + for store in $stores; do bucket=nixos-amis bucketDir="$version-$type-$store" @@ -39,7 +42,7 @@ for type in hvm pv; do prevAmi= prevRegion= - for region in eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do + for region in $regions; do name=nixos-$version-$arch-$type-$store description="NixOS $system $version ($type-$store)" @@ -51,10 +54,11 @@ for type in hvm pv; do echo "doing $name in $region..." if [ -n "$prevAmi" ]; then - ami=$(ec2-copy-image \ + ami=$(aws ec2 copy-image \ --region "$region" \ - --source-region "$prevRegion" --source-ami-id "$prevAmi" \ - --name "$name" --description "$description" | cut -f 2) + --source-region "$prevRegion" --source-image-id "$prevAmi" \ + --name "$name" --description "$description" | json -q .ImageId) + if [ "$ami" = null ]; then break; fi else if [ $store = s3 ]; then @@ -85,12 +89,12 @@ for type in hvm pv; do ec2-upload-bundle \ -m $imageDir/$type.raw.manifest.xml \ -b "$bucket/$bucketDir" \ - -a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" \ + -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" \ --location EU touch $imageDir/uploaded fi - extraFlags="$bucket/$bucketDir/$type.raw.manifest.xml" + extraFlags="--image-location $bucket/$bucketDir/$type.raw.manifest.xml" else @@ -115,7 +119,8 @@ for type in hvm pv; do if [ -z "$snapId" -a -z "$volId" -a -z "$taskId" ]; then echo "importing $vhdFile..." taskId=$(ec2-import-volume $vhdFile --no-upload -f vhd \ - -o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" \ + -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ + -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" \ --region "$region" -z "${region}a" \ --bucket "$bucket" --prefix "$bucketDir/" \ | tee /dev/stderr \ @@ -125,15 +130,16 @@ for type in hvm pv; do if [ -z "$snapId" -a -z "$volId" ]; then ec2-resume-import $vhdFile -t "$taskId" --region "$region" \ - -o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" + -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ + -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" fi # Wait for the volume creation to finish. if [ -z "$snapId" -a -z "$volId" ]; then echo "waiting for import to finish..." while true; do - volId=$(ec2-describe-conversion-tasks "$taskId" --region "$region" | sed 's/.*VolumeId.*\(vol-[0-9a-f]\+\).*/\1/ ; t ; d') - if [ -n "$volId" ]; then break; fi + volId=$(aws ec2 describe-conversion-tasks --conversion-task-ids "$taskId" --region "$region" | jq -r .ConversionTasks[0].ImportVolume.Volume.Id) + if [ "$volId" != null ]; then break; fi sleep 10 done @@ -143,22 +149,24 @@ for type in hvm pv; do # Delete the import task. if [ -n "$volId" -a -n "$taskId" ]; then echo "removing import task..." - ec2-delete-disk-image -t "$taskId" --region "$region" -o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" || true + ec2-delete-disk-image -t "$taskId" --region "$region" \ + -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \ + -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" || true rm -f $stateDir/$region.$type.task-id fi # Create a snapshot. if [ -z "$snapId" ]; then echo "creating snapshot..." - snapId=$(ec2-create-snapshot "$volId" --region "$region" | cut -f 2) + snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId) + if [ "$snapId" = null ]; then exit 1; fi echo -n "$snapId" > $stateDir/$region.$type.snap-id - ec2-create-tags "$snapId" -t "Name=$description" --region "$region" fi # Wait for the snapshot to finish. echo "waiting for snapshot to finish..." while true; do - status=$(ec2-describe-snapshots "$snapId" --region "$region" | head -n1 | cut -f 4) + status=$(aws ec2 describe-snapshots --snapshot-ids "$snapId" --region "$region" | jq -r .Snapshots[0].State) if [ "$status" = completed ]; then break; fi sleep 10 done @@ -166,35 +174,50 @@ for type in hvm pv; do # Delete the volume. if [ -n "$volId" ]; then echo "deleting volume..." - ec2-delete-volume "$volId" --region "$region" || true + aws ec2 delete-volume --volume-id "$volId" --region "$region" || true rm -f $stateDir/$region.$type.vol-id fi - extraFlags="-b /dev/sda1=$snapId:$vhdFileLogicalGigaBytes:true:gp2" + blockDeviceMappings="DeviceName=/dev/sda1,Ebs={SnapshotId=$snapId,VolumeSize=$vhdFileLogicalGigaBytes,DeleteOnTermination=true,VolumeType=gp2}" + extraFlags="" if [ $type = pv ]; then - extraFlags+=" --root-device-name=/dev/sda1" + extraFlags+=" --root-device-name /dev/sda1" + else + extraFlags+=" --root-device-name /dev/sda1" + extraFlags+=" --sriov-net-support simple" + extraFlags+=" --ena-support" fi - extraFlags+=" -b /dev/sdb=ephemeral0 -b /dev/sdc=ephemeral1 -b /dev/sdd=ephemeral2 -b /dev/sde=ephemeral3" + blockDeviceMappings+=" DeviceName=/dev/sdb,VirtualName=ephemeral0" + blockDeviceMappings+=" DeviceName=/dev/sdc,VirtualName=ephemeral1" + blockDeviceMappings+=" DeviceName=/dev/sdd,VirtualName=ephemeral2" + blockDeviceMappings+=" DeviceName=/dev/sde,VirtualName=ephemeral3" + fi + + if [ $type = hvm ]; then + extraFlags+=" --sriov-net-support simple" + extraFlags+=" --ena-support" fi # Register the AMI. if [ $type = pv ]; then - kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2) - [ -n "$kernel" ] + kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.04-$arch.gz" | jq -r .Images[0].ImageId) + if [ "$kernel" = null ]; then break; fi echo "using PV-GRUB kernel $kernel" extraFlags+=" --virtualization-type paravirtual --kernel $kernel" else extraFlags+=" --virtualization-type hvm" fi - ami=$(ec2-register \ - -n "$name" \ - -d "$description" \ + ami=$(aws ec2 register-image \ + --name "$name" \ + --description "$description" \ --region "$region" \ --architecture "$arch" \ - $extraFlags | cut -f 2) + --block-device-mappings $blockDeviceMappings \ + $extraFlags | jq -r .ImageId) + if [ "$ami" = null ]; then break; fi fi echo -n "$ami" > $amiFile @@ -204,23 +227,45 @@ for type in hvm pv; do ami=$(cat $amiFile) fi - if [ -z "$NO_WAIT" -o -z "$prevAmi" ]; then - echo "waiting for AMI..." - while true; do - status=$(ec2-describe-images "$ami" --region "$region" | head -n1 | cut -f 5) - if [ "$status" = available ]; then break; fi - sleep 10 - done - - ec2-modify-image-attribute \ - --region "$region" "$ami" -l -a all - fi - echo "region = $region, type = $type, store = $store, ami = $ami" + if [ -z "$prevAmi" ]; then prevAmi="$ami" prevRegion="$region" fi + done + + done + +done + +for type in $types; do + link=$stateDir/$type + system=x86_64-linux + arch=x86_64 + + for store in $stores; do + + for region in $regions; do + + name=nixos-$version-$arch-$type-$store + amiFile=$stateDir/$region.$type.$store.ami-id + ami=$(cat $amiFile) + + echo "region = $region, type = $type, store = $store, ami = $ami" + + echo -n "waiting for AMI..." + while true; do + status=$(aws ec2 describe-images --image-ids "$ami" --region "$region" | jq -r .Images[0].State) + if [ "$status" = available ]; then break; fi + sleep 10 + echo -n '.' + done + echo + + # Make the image public. + aws ec2 modify-image-attribute \ + --image-id "$ami" --region "$region" --launch-permission 'Add={Group=all}' echo " \"$major\".$region.$type-$store = \"$ami\";" >> ec2-amis.nix done diff --git a/nixos/modules/i18n/input-method/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix index bdefd2d2d596..e97bb9f80eb5 100644 --- a/nixos/modules/i18n/input-method/fcitx.nix +++ b/nixos/modules/i18n/input-method/fcitx.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.i18n.inputMethod.fcitx; - fcitxPackage = pkgs.fcitx-with-plugins.override { plugins = cfg.engines; }; + fcitxPackage = pkgs.fcitx.override { plugins = cfg.engines; }; fcitxEngine = types.package // { name = "fcitx-engine"; check = x: (lib.types.package.check x) && (attrByPath ["meta" "isFcitxEngine"] false x); diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 51aa2dd82321..e4e4f5c446c8 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -1,6 +1,9 @@ #! @shell@ case "$1" in + --help) + exec man nixos-version + exit 1 --hash|--revision) echo "@nixosRevision@" ;; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 67178e765c8a..2ed711b79c45 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -368,6 +368,7 @@ ./services/networking/ntopng.nix ./services/networking/ntpd.nix ./services/networking/nylon.nix + ./services/networking/offlineimap.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix ./services/networking/openntpd.nix diff --git a/nixos/modules/programs/bash/inputrc b/nixos/modules/programs/bash/inputrc index e4eabc052c5f..f339eb649ed8 100644 --- a/nixos/modules/programs/bash/inputrc +++ b/nixos/modules/programs/bash/inputrc @@ -6,6 +6,7 @@ set meta-flag on set input-meta on set convert-meta off set output-meta on +set colored-stats on #set mark-symlinked-directories on diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 10f3daea69e4..90834c5b2605 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -78,7 +78,7 @@ in test -e ${stateDir}/saves/${cfg.saveName}.zip || \ ${pkgs.factorio-headless}/bin/factorio \ --config=${cfg.configFile} \ - --create=${cfg.saveName} + --create=${stateDir}/saves/${cfg.saveName}.zip ''; serviceConfig = { @@ -93,7 +93,7 @@ in "${pkgs.factorio-headless}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" - "--start-server=${cfg.saveName}" + "--start-server=${stateDir}/saves/${cfg.saveName}.zip" ]; }; }; diff --git a/nixos/modules/services/networking/offlineimap.nix b/nixos/modules/services/networking/offlineimap.nix new file mode 100644 index 000000000000..31ce9280f319 --- /dev/null +++ b/nixos/modules/services/networking/offlineimap.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.offlineimap; +in { + + options.services.offlineimap = { + enable = mkEnableOption "Offlineimap, a software to dispose your mailbox(es) as a local Maildir(s)."; + + install = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to install a user service for Offlineimap. Once + the service is started, emails will be fetched automatically. + + The service must be manually started for each user with + "systemctl --user start offlineimap" or globally through + <varname>services.offlineimap.enable</varname>. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.offlineimap; + defaultText = "pkgs.offlineimap"; + description = "Offlineimap derivation to use."; + }; + + path = mkOption { + type = types.listOf types.path; + default = []; + example = literalExample "[ pkgs.pass pkgs.bash pkgs.notmuch ]"; + description = "List of derivations to put in Offlineimap's path."; + }; + + onCalendar = mkOption { + type = types.str; + default = "*:0/3"; # every 3 minutes + description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See systemd.time(7) for more information about the format."; + }; + + timeoutStartSec = mkOption { + type = types.str; + default = "120sec"; # Kill if still alive after 2 minutes + description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See systemd.time(7) for more information about the format."; + }; + }; + config = mkIf (cfg.enable || cfg.install) { + systemd.user.services.offlineimap = { + description = "Offlineimap: a software to dispose your mailbox(es) as a local Maildir(s)"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${cfg.package}/bin/offlineimap -u basic -o -1"; + TimeoutStartSec = cfg.timeoutStartSec; + }; + path = cfg.path; + }; + environment.systemPackages = [ "${cfg.package}" ]; + systemd.user.timers.offlineimap = { + description = "offlineimap timer"; + timerConfig = { + Unit = "offlineimap.service"; + OnCalendar = cfg.onCalendar; + # start immediately after computer is started: + Persistent = "true"; + }; + } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; + }; +} diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix index 793c7515c761..b27a35b6257d 100644 --- a/nixos/modules/system/boot/coredump.nix +++ b/nixos/modules/system/boot/coredump.nix @@ -36,6 +36,8 @@ with lib; config = mkMerge [ (mkIf config.systemd.coredump.enable { + systemd.additionalUpstreamSystemUnits = [ "systemd-coredump.socket" "systemd-coredump@.service" ]; + environment.etc."systemd/coredump.conf".text = '' [Coredump] @@ -45,7 +47,7 @@ with lib; # Have the kernel pass core dumps to systemd's coredump helper binary. # From systemd's 50-coredump.conf file. See: # <https://github.com/systemd/systemd/blob/v218/sysctl.d/50-coredump.conf.in> - boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %p %u %g %s %t %e"; + boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %P %u %g %s %t %c %e"; }) (mkIf (!config.systemd.coredump.enable) { diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix index c5c250c14cea..576a07c1d272 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix @@ -5,5 +5,4 @@ pkgs.substituteAll { isExecutable = true; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; inherit (pkgs) bash; - kernelDTB = pkgs.stdenv.platform.kernelDTB or false; } diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 78a8e8fd658c..c780a89b102c 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -75,9 +75,10 @@ addEntry() { copyToKernelsDir "$path/kernel"; kernel=$result copyToKernelsDir "$path/initrd"; initrd=$result - if [ -n "@kernelDTB@" ]; then - # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? - copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result + # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? + dtbDir=$(readlink -m "$path/kernel/../dtbs") + if [ -d "$dtbDir" ]; then + copyToKernelsDir "$dtbDir"; dtbs=$result fi timestampEpoch=$(stat -L -c '%Z' $path) @@ -95,7 +96,7 @@ addEntry() { fi echo " LINUX ../nixos/$(basename $kernel)" echo " INITRD ../nixos/$(basename $initrd)" - if [ -n "@kernelDTB@" ]; then + if [ -d "$dtbDir" ]; then echo " FDTDIR ../nixos/$(basename $dtbs)" fi echo " APPEND systemConfig=$path init=$path/init $extraParams" diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b7c09d2e4bfa..5c8cce5066af 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -764,7 +764,7 @@ in { wantedBy = [ "timers.target" ]; timerConfig.OnCalendar = service.startAt; }) - (filterAttrs (name: service: service.startAt != "") cfg.services); + (filterAttrs (name: service: service.enable && service.startAt != "") cfg.services); # Generate timer units for all services that have a ‘startAt’ value. systemd.user.timers = diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index da5575f4b6dd..ebf398fa266f 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -20,8 +20,12 @@ let cfg = config.ec2; in autoResize = true; }; - boot.extraModulePackages = [ config.boot.kernelPackages.ixgbevf ]; - boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" "ixgbevf" ]; + boot.extraModulePackages = + [ config.boot.kernelPackages.ixgbevf + config.boot.kernelPackages.ena + ]; + boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; + boot.initrd.availableKernelModules = [ "ixgbevf" "ena" ]; boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ]; # Prevent the nouveau kernel module from being loaded, as it diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 5257aaf62025..bdf6ed4dcd29 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -90,40 +90,48 @@ "15.09".us-west-2.pv-ebs = "ami-005fb160"; "15.09".us-west-2.pv-s3 = "ami-cd55bbad"; - "16.03".ap-northeast-1.hvm-ebs = "ami-b6edf5d8"; - "16.03".ap-northeast-1.hvm-s3 = "ami-b1e3fbdf"; - "16.03".ap-northeast-1.pv-ebs = "ami-6190880f"; - "16.03".ap-northeast-1.pv-s3 = "ami-908d95fe"; - "16.03".ap-southeast-1.hvm-ebs = "ami-35b16656"; - "16.03".ap-southeast-1.hvm-s3 = "ami-41be6922"; - "16.03".ap-southeast-1.pv-ebs = "ami-4cb96e2f"; - "16.03".ap-southeast-1.pv-s3 = "ami-3bb96e58"; - "16.03".ap-southeast-2.hvm-ebs = "ami-debc91bd"; - "16.03".ap-southeast-2.hvm-s3 = "ami-55bc9136"; - "16.03".ap-southeast-2.pv-ebs = "ami-b38ba6d0"; - "16.03".ap-southeast-2.pv-s3 = "ami-9e8ba6fd"; - "16.03".eu-central-1.hvm-ebs = "ami-7c967413"; - "16.03".eu-central-1.hvm-s3 = "ami-b29072dd"; - "16.03".eu-central-1.pv-ebs = "ami-7a947615"; - "16.03".eu-central-1.pv-s3 = "ami-729b791d"; - "16.03".eu-west-1.hvm-ebs = "ami-ff27a98c"; - "16.03".eu-west-1.hvm-s3 = "ami-6c21af1f"; - "16.03".eu-west-1.pv-ebs = "ami-a33cb2d0"; - "16.03".eu-west-1.pv-s3 = "ami-ec38b69f"; - "16.03".sa-east-1.hvm-ebs = "ami-5bef6637"; - "16.03".sa-east-1.hvm-s3 = "ami-55f87139"; - "16.03".sa-east-1.pv-ebs = "ami-76e56c1a"; - "16.03".sa-east-1.pv-s3 = "ami-e1f8718d"; - "16.03".us-east-1.hvm-ebs = "ami-4bfd1926"; - "16.03".us-east-1.hvm-s3 = "ami-60c5210d"; - "16.03".us-east-1.pv-ebs = "ami-c0c92dad"; - "16.03".us-east-1.pv-s3 = "ami-f9d63294"; - "16.03".us-west-1.hvm-ebs = "ami-13aad473"; - "16.03".us-west-1.hvm-s3 = "ami-e1a8d681"; - "16.03".us-west-1.pv-ebs = "ami-c0a6d8a0"; - "16.03".us-west-1.pv-s3 = "ami-6aa9d70a"; - "16.03".us-west-2.hvm-ebs = "ami-265dad46"; - "16.03".us-west-2.hvm-s3 = "ami-cd40b0ad"; - "16.03".us-west-2.pv-ebs = "ami-7b4aba1b"; - "16.03".us-west-2.pv-s3 = "ami-0849b968"; + "16.03".ap-northeast-1.hvm-ebs = "ami-40619d21"; + "16.03".ap-northeast-1.hvm-s3 = "ami-ce629eaf"; + "16.03".ap-northeast-1.pv-ebs = "ami-ef639f8e"; + "16.03".ap-northeast-1.pv-s3 = "ami-a1609cc0"; + "16.03".ap-northeast-2.hvm-ebs = "ami-deca00b0"; + "16.03".ap-northeast-2.hvm-s3 = "ami-a3b77dcd"; + "16.03".ap-northeast-2.pv-ebs = "ami-7bcb0115"; + "16.03".ap-northeast-2.pv-s3 = "ami-a2b77dcc"; + "16.03".ap-south-1.hvm-ebs = "ami-0dff9562"; + "16.03".ap-south-1.hvm-s3 = "ami-13f69c7c"; + "16.03".ap-south-1.pv-ebs = "ami-0ef39961"; + "16.03".ap-south-1.pv-s3 = "ami-e0c8a28f"; + "16.03".ap-southeast-1.hvm-ebs = "ami-5e964a3d"; + "16.03".ap-southeast-1.hvm-s3 = "ami-4d964a2e"; + "16.03".ap-southeast-1.pv-ebs = "ami-ec9b478f"; + "16.03".ap-southeast-1.pv-s3 = "ami-999b47fa"; + "16.03".ap-southeast-2.hvm-ebs = "ami-9f7359fc"; + "16.03".ap-southeast-2.hvm-s3 = "ami-987359fb"; + "16.03".ap-southeast-2.pv-ebs = "ami-a2705ac1"; + "16.03".ap-southeast-2.pv-s3 = "ami-a3705ac0"; + "16.03".eu-central-1.hvm-ebs = "ami-17a45178"; + "16.03".eu-central-1.hvm-s3 = "ami-f9a55096"; + "16.03".eu-central-1.pv-ebs = "ami-c8a550a7"; + "16.03".eu-central-1.pv-s3 = "ami-6ea45101"; + "16.03".eu-west-1.hvm-ebs = "ami-b5b3d5c6"; + "16.03".eu-west-1.hvm-s3 = "ami-c986e0ba"; + "16.03".eu-west-1.pv-ebs = "ami-b083e5c3"; + "16.03".eu-west-1.pv-s3 = "ami-3c83e54f"; + "16.03".sa-east-1.hvm-ebs = "ami-f6eb7f9a"; + "16.03".sa-east-1.hvm-s3 = "ami-93e773ff"; + "16.03".sa-east-1.pv-ebs = "ami-cbb82ca7"; + "16.03".sa-east-1.pv-s3 = "ami-abb82cc7"; + "16.03".us-east-1.hvm-ebs = "ami-c123a3d6"; + "16.03".us-east-1.hvm-s3 = "ami-bc25a5ab"; + "16.03".us-east-1.pv-ebs = "ami-bd25a5aa"; + "16.03".us-east-1.pv-s3 = "ami-a325a5b4"; + "16.03".us-west-1.hvm-ebs = "ami-748bcd14"; + "16.03".us-west-1.hvm-s3 = "ami-a68dcbc6"; + "16.03".us-west-1.pv-ebs = "ami-048acc64"; + "16.03".us-west-1.pv-s3 = "ami-208dcb40"; + "16.03".us-west-2.hvm-ebs = "ami-8263a0e2"; + "16.03".us-west-2.hvm-s3 = "ami-925c9ff2"; + "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; + "16.03".us-west-2.pv-s3 = "ami-734c8f13"; } diff --git a/nixos/tests/gnome3_20-gdm.nix b/nixos/tests/gnome3_18-gdm.nix index 8b1e9afedfb9..8b1e9afedfb9 100644 --- a/nixos/tests/gnome3_20-gdm.nix +++ b/nixos/tests/gnome3_18-gdm.nix diff --git a/nixos/tests/gnome3_20.nix b/nixos/tests/gnome3_18.nix index 51c83a4e3129..2c88e6abe890 100644 --- a/nixos/tests/gnome3_20.nix +++ b/nixos/tests/gnome3_18.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.displayManager.auto.user = "alice"; services.xserver.desktopManager.gnome3.enable = true; - environment.gnome3.packageSet = pkgs.gnome3_20; + environment.gnome3.packageSet = pkgs.gnome3_18; virtualisation.memorySize = 512; }; |