diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-01 16:03:42 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-01 16:07:55 +0100 |
| commit | 9d6a55aefd771f047d2aa3085c9a3f8a2f452333 (patch) | |
| tree | 5e249e50300763f8a3bf9c69745a5381f64f7011 /pkgs/stdenv | |
| parent | 7dacca324d9e86fe7f7fad450ec833c746f21415 (diff) | |
| download | nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.gz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.bz2 nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.lz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.xz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.zst nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.zip | |
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for backwards compatibility (but not for overlays because they're a new feature).
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 90a55188f09..3ffe1ab15d9 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -183,7 +183,7 @@ rec { This adapter can be defined on the defaultStdenv definition. You can use it by patching the all-packages.nix file or by using the override - feature of ~/.nixpkgs/config.nix . + feature of ~/.config/nixpkgs/config.nix . */ validateLicenses = licensePred: stdenv: stdenv // { mkDerivation = args: diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c61d0e2d641..34ba2fd8dd9 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -153,7 +153,7 @@ let b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${up reason} = true; } - to ~/.nixpkgs/config.nix. + to ~/.config/nixpkgs/config.nix. '')); # Check if a derivation is valid, that is whether it passes checks for |