1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-25 03:09:47 +01:00

nixpkgs: add module

This commit is contained in:
Robert Helgesson 2017-10-20 23:22:47 +02:00
parent df84c466c1
commit 7417d8e86e
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
3 changed files with 135 additions and 2 deletions

View file

@ -11,12 +11,13 @@ with lib;
let let
modules = [ modules = [
./home-environment.nix
./files.nix ./files.nix
./home-environment.nix
./manual.nix ./manual.nix
./misc/fontconfig.nix ./misc/fontconfig.nix
./misc/gtk.nix ./misc/gtk.nix
./misc/news.nix ./misc/news.nix
./misc/nixpkgs.nix
./misc/pam.nix ./misc/pam.nix
./programs/bash.nix ./programs/bash.nix
./programs/beets.nix ./programs/beets.nix
@ -73,9 +74,10 @@ let
fold f res res.config.warnings; fold f res res.config.warnings;
pkgsModule = { pkgsModule = {
config._module.args.pkgs = lib.mkForce pkgs;
config._module.args.baseModules = modules; config._module.args.baseModules = modules;
config._module.args.pkgs = lib.mkDefault pkgs;
config._module.check = check; config._module.check = check;
config.nixpkgs.system = mkDefault pkgs.system;
}; };
rawModule = lib.evalModules { rawModule = lib.evalModules {

View file

@ -410,6 +410,18 @@ in
automatically whenever you do a switch. automatically whenever you do a switch.
''; '';
} }
{
time = "2017-10-23T23:26:17+00:00";
message = ''
A new module is available: 'nixpkgs'.
Like the identically named NixOS module, this allows you to
set Nixpkgs options and define Nixpkgs overlays. Note, the
changes you make here will not automatically apply to Nix
commands run outside Home Manager.
'';
}
]; ];
}; };
} }

119
modules/misc/nixpkgs.nix Normal file
View file

@ -0,0 +1,119 @@
# Adapted from Nixpkgs.
{ config, lib, pkgs, ... }:
with lib;
let
isConfig = x:
builtins.isAttrs x || builtins.isFunction x;
optCall = f: x:
if builtins.isFunction f
then f x
else f;
mergeConfig = lhs_: rhs_:
let
lhs = optCall lhs_ { inherit pkgs; };
rhs = optCall rhs_ { inherit pkgs; };
in
lhs // rhs //
optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs:
optCall lhs.packageOverrides pkgs //
optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
} //
optionalAttrs (lhs ? perlPackageOverrides) {
perlPackageOverrides = pkgs:
optCall lhs.perlPackageOverrides pkgs //
optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs;
};
configType = mkOptionType {
name = "nixpkgs-config";
description = "nixpkgs config";
check = traceValIfNot isConfig;
merge = args: fold (def: mergeConfig def.value) {};
};
overlayType = mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
check = builtins.isFunction;
merge = lib.mergeOneOption;
};
_pkgs = import <nixpkgs> (
filterAttrs (n: v: v != null) config.nixpkgs
);
in
{
options.nixpkgs = {
config = mkOption {
default = null;
example = { allowBroken = true; };
type = types.nullOr configType;
description = ''
The configuration of the Nix Packages collection. (For
details, see the Nixpkgs documentation.) It allows you to set
package configuration options.
</para><para>
If <literal>null</literal>, then configuration is taken from
the fallback location, for example,
<filename>~/.config/nixpkgs/config.nix</filename>.
'';
};
overlays = mkOption {
default = null;
example = literalExample
''
[ (self: super: {
openssh = super.openssh.override {
hpnSupport = true;
withKerberos = true;
kerberos = self.libkrb5;
};
};
) ]
'';
type = types.nullOr (types.listOf overlayType);
description = ''
List of overlays to use with the Nix Packages collection. (For
details, see the Nixpkgs documentation.) It allows you to
override packages globally. This is a function that takes as
an argument the <emphasis>original</emphasis> Nixpkgs. The
first argument should be used for finding dependencies, and
the second should be used for overriding recipes.
</para><para>
If <literal>null</literal>, then the overlays are taken from
the fallback location, for example,
<filename>~/.config/nixpkgs/overlays</filename>.
'';
};
system = mkOption {
type = types.str;
example = "i686-linux";
internal = true;
description = ''
Specifies the Nix platform type for which the user environment
should be built. If unset, it defaults to the platform type of
your host system. Specifying this option is useful when doing
distributed multi-platform deployment, or when building
virtual machines.
'';
};
};
config = {
_module.args = {
pkgs = _pkgs;
pkgs_i686 = _pkgs.pkgsi686Linux;
};
};
}