Commit graph

19 commits

Author SHA1 Message Date
Eelco Dolstra 3224ea8a1e Don't require nixUnstable 2012-12-11 13:14:33 +01:00
Eelco Dolstra 35922e61d9 Systemd requires the latest Nix 2012-11-15 22:55:36 +01:00
Eelco Dolstra cce6e48edf Don't use consolekit anywhere 2012-08-23 10:25:15 -04:00
Eelco Dolstra c2da812bd0 Enable upower's systemd unit 2012-08-21 11:29:59 -04:00
Eelco Dolstra 5408f1ebcd Build slim without consolekit 2012-08-20 11:11:25 -04:00
Eelco Dolstra 36f5c97b49 Use systemd-udevd instead of udevd 2012-08-16 16:34:49 -04:00
Peter Simons 20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy 9d496c77ac nixpkgs: Always set nixpkgs.config.{state,store}Dir
This will allow NixOS modules to always refer to config.nixpkgs.config.nix to find the store or state
directory

svn path=/nixos/trunk/; revision=30103
2011-10-29 18:20:02 +00:00
Eelco Dolstra a82bfec343 * Add an option ‘deployment.ec2.zone’. For EC2 deployments, this
automatically sets ‘deployment.ec2.controller’ and
  ‘deployment.ec2.ami’ to sensible values.

svn path=/nixos/trunk/; revision=30005
2011-10-25 01:59:39 +00:00
Peter Simons eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Yury G. Kudryashov c56a8456ed Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config
Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
2011-09-11 12:41:47 +00:00
Eelco Dolstra 453675c5c1 * Allow literal examples to be included in the manual.
svn path=/nixos/trunk/; revision=29025
2011-09-05 10:14:42 +00:00
Eelco Dolstra 5813e99fb3 * Fix description.
svn path=/nixos/trunk/; revision=29022
2011-09-05 09:46:14 +00:00
Nicolas Pierron 6669cf61f4 Add merge capabilities to nixpkgs.config option.
svn path=/nixos/trunk/; revision=29021
2011-09-05 09:19:59 +00:00
Lluís Batlle i Rossell 25b9c03571 Updating from trunk (specially for the enableFontDir option, as it was not up
to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871
2010-11-26 14:16:12 +00:00
Eelco Dolstra c958902d44 * Added an option "nixpkgs.system" to specify the system type for
which NixOS should be built.  This is useful in NixOS network
  specifications, because it allows machines in the network to have
  different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823
2010-11-23 16:07:00 +00:00
Lluís Batlle i Rossell 7fe1c5fe90 Making eval-config not pass 'platform' as a nixpkgs parameter, but expect a nixpkgs config attribute.
svn path=/nixos/branches/stdenv-updates/; revision=23688
2010-09-08 16:52:15 +00:00
Lluís Batlle i Rossell 9002335101 Making nixos handle the nixpkgs 'platform' parameter.
svn path=/nixos/trunk/; revision=20274
2010-02-27 18:37:12 +00:00
Eelco Dolstra 6f1b1aefde * Added an option `nixpkgs.config' that allows the Nixpkgs options to
be set from the NixOS configuration.  For instance, you can say

    nixpkgs.config.firefox.enableGeckoMediaPlayer = true;

    environment.systemPackages = [ pkgs.firefox ];

  but the more interesting application is to apply global overrides to
  Nixpkgs throughout NixOS, e.g.

    nixpkgs.config.packageOverrides = pkgs:
      { glibc = pkgs.glibc27;
        gcc = pkgs.gcc42;
      };

  would build the whole system with Glibc 2.7 and GCC 4.2.  (There are
  some issues with "useFromStdenv" in all-packages.nix that need to be
  fixed for packages in the stdenv bootstrap though.)

  The implementation of this option is kind of evil though due to the
  need to prevent a circularity between the evaluation of
  nixpkgs.config and the "pkgs" module argument.

svn path=/nixos/trunk/; revision=16866
2009-08-26 16:52:38 +00:00