Mettre à jour 'vbox/release.nix'

vbox/release.nix

@@ -72,112 +72,12 @@ let
 
 
 in {
-/*
-  tarball =
-    pkgs.releaseTools.makeSourceTarball {
-      name = "nixos-tarball";
-
-      src = nixosSrc;
-
-      inherit officialRelease version;
-      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
-
-      distPhase = ''
-        echo -n $VERSION_SUFFIX > .version-suffix
-        releaseName=nixos-$VERSION$VERSION_SUFFIX
-        mkdir -p $out/tarballs
-        mkdir ../$releaseName
-        cp -prd . ../$releaseName
-        cd ..
-        chmod -R u+w $releaseName
-        tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
-      '';
-    };
-
-
-  channel =
-    pkgs.releaseTools.makeSourceTarball {
-      name = "nixos-channel";
-
-      src = nixosSrc;
-
-      inherit officialRelease version;
-      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
-
-      buildInputs = [ pkgs.nixUnstable ];
-
-      expr = builtins.readFile lib/channel-expr.nix;
-
-      distPhase = ''
-        echo -n $VERSION_SUFFIX > .version-suffix
-        releaseName=nixos-$VERSION$VERSION_SUFFIX
-        mkdir -p $out/tarballs
-        mkdir ../$releaseName
-        cp -prd . ../$releaseName/nixos
-        cp -prd ${nixpkgs} ../$releaseName/nixpkgs
-        echo "$expr" > ../$releaseName/default.nix
-        NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
-        cd ..
-        chmod -R u+w $releaseName
-        tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
-      '';
-    };
-*/
-
-  /*
-  manual =
-    (import "${nixosSrc}/doc/manual" {
-      inherit pkgs;
-      options =
-        (import lib/eval-config.nix {
-          modules = [
-            { fileSystems = [];
-              boot.loader.grub.device = "/dev/sda";
-            } ];
-        }).options;
-      revision = toString (nixosSrc.rev or nixosSrc.shortRev);
-    }).manual;
-  */
-
-
   iso_minimal = pkgs.lib.genAttrs systems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
     type = "minimal";
     inherit system;
   });
 
-/*
-  iso_minimal_new_kernel = pkgs.lib.genAttrs systems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
-    type = "minimal-new-kernel";
-    inherit system;
-  });
-
-  iso_graphical = pkgs.lib.genAttrs systems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
-    type = "graphical";
-    inherit system;
-  });
-
-  # A variant with a more recent (but possibly less stable) kernel
-  # that might support more hardware.
-  iso_new_kernel = pkgs.lib.genAttrs systems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
-    type = "new-kernel";
-    inherit system;
-  });
-
-  # A variant with efi booting support. Once cd-minimal has a newer kernel,
-  # this should be enabled by default.
-  iso_efi = pkgs.lib.genAttrs systems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
-    type = "efi";
-    maintainers = [ "shlevy" ];
-    inherit system;
-  });
-*/
-
-
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = pkgs.lib.genAttrs systems (system:
 
@@ -209,45 +109,4 @@ in {
         '' # */
 
   );
-
-/*
-  # Provide a tarball that can be unpacked into an SD card, and easily
-  # boot that system from uboot (like for the sheevaplug).
-  # The pc variant helps preparing the expression for the system tarball
-  # in a machine faster than the sheevpalug
-  system_tarball_pc = pkgs.lib.genAttrs systems (system: makeSystemTarball {
-    module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
-    inherit system;
-  });
-*/
-  /*
-  system_tarball_fuloong2f =
-    assert builtins.currentSystem == "mips64-linux";
-    makeSystemTarball {
-      module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
-      system = "mips64-linux";
-    };
-
-  system_tarball_sheevaplug =
-    assert builtins.currentSystem == "armv5tel-linux";
-    makeSystemTarball {
-      module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
-      system = "armv5tel-linux";
-    };
-  */
-
-/*
-  # Run the tests in ./tests/default.nix for each platform.  You can
-  # run a test by doing e.g. "nix-build -A tests.login.x86_64-linux".
-  tests =
-    with pkgs.lib;
-    let
-      testsFor = system:
-        mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
-          (import ./tests { inherit nixpkgs system; });
-    in fold recursiveUpdate {} (map testsFor systems);
-*/    
-/*  
-  run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; });
-*/
 }