diff --git a/vbox/release.nix b/vbox/release.nix index b33d5bf..581699b 100644 --- a/vbox/release.nix +++ b/vbox/release.nix @@ -8,7 +8,7 @@ let version = builtins.readFile ./.version; versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}"; - systems = [ "x86_64-linux" "i686-linux" ]; + systems = [ "x86_64-linux" ]; pkgs = import { system = "x86_64-linux"; }; @@ -16,45 +16,10 @@ let versionModule = { system.nixosVersionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix; }; - - makeIso = - { module, type, description ? type, maintainers ? ["eelco"], system }: - - with import { inherit system; }; - - let - - config = (import lib/eval-config.nix { - inherit system; - modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; - }).config; - - iso = config.system.build.isoImage; - - in - # Declare the ISO as a build product so that it shows up in Hydra. - runCommand "nixos-iso-${config.system.nixosVersion}" - { meta = { - description = "NixOS installation CD (${description}) - ISO image for ${system}"; - maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; - }; - inherit iso; - passthru = { inherit config; }; - } - '' - mkdir -p $out/nix-support - echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products - ''; - +################# https://github.com/NixOS/nixpkgs/blob/master/nixos/release.nix + in { -/* - iso_minimal = pkgs.lib.genAttrs systems (system: makeIso { - #module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; - module = /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix; - type = "minimal"; - inherit system; - }); -*/ + /* # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = pkgs.lib.genAttrs systems (system: @@ -87,4 +52,5 @@ in { '' # */ ); +*/ } \ No newline at end of file