[Nix-dev] [Nix-commits] SVN commit: nix - r30325 - nixos/trunk/modules/installer/tools

[Nicolas Pierron]

Hi Eelco,

The goal of this was to simplify the task for new comers, and avoid
them the pain of selecting what they need.  Profile are made to be
separated from the ISO, and thus to be used in such as way.  I think
this modification has proved to be useful and I don't want it to be
removed, even if this includes a lot of stuff at first.

Please revert this patch and ease the life of new comers.
What you can do instead, is adding an option in "nixos-option
--install" to avoid including the ISO profile.

On Tue, Nov 8, 2011 at 16:39, Eelco Dolstra <e.dolstra at tudelft.nl> wrote:
> Author: eelco
> Date: Tue Nov  8 15:39:13 2011
> New Revision: 30325
> URL: https://nixos.org/websvn/nix/?rev=30325&sc=1
>
> Log:
> * nixos-hardware-scan: don't emit an include of an "install profile".
>  That's confusing and wrong: nixos-hardware-scan should just enable
>  support for the detected hardware, not enable lots of software (let
>  alone KDE).
>
> Modified:
>   nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl
>   nixos/trunk/modules/installer/tools/tools.nix
>
> Modified: nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl
> ==============================================================================
> --- nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl  Tue Nov  8 15:15:07 2011        (r30324)
> +++ nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl  Tue Nov  8 15:39:13 2011        (r30325)
> @@ -230,7 +230,6 @@
>
>  {
>   require = [
> -    "\${modulesPath}/profiles/@profile at .nix"
>     "\${modulesPath}/installer/scan/not-detected.nix"
>   ];
>
>
> Modified: nixos/trunk/modules/installer/tools/tools.nix
> ==============================================================================
> --- nixos/trunk/modules/installer/tools/tools.nix       Tue Nov  8 15:15:07 2011        (r30324)
> +++ nixos/trunk/modules/installer/tools/tools.nix       Tue Nov  8 15:39:13 2011        (r30325)
> @@ -49,7 +49,6 @@
>     name = "nixos-hardware-scan";
>     src = ./nixos-hardware-scan.pl;
>     inherit (pkgs) perl;
> -    profile = cfg.installProfile;
>   };
>
>   nixosOption = makeProg {
> @@ -103,14 +102,6 @@
>       '';
>     };
>
> -    installer.installProfile = pkgs.lib.mkOption {
> -      default = "base";
> -      example = "graphical";
> -      description = ''
> -        Name of the profile used when generating the hardware-scan.
> -      '';
> -    };
> -
>     installer.enableGraphicalTools = pkgs.lib.mkOption {
>       default = false;
>       type = with pkgs.lib.types; bool;
> _______________________________________________
> nix-commits mailing list
> nix-commits at lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-commits
>



-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/