diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/README.md | 2 | ||||
| -rw-r--r-- | pkgs/games/planetaryannihilation/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/impure.nix | 8 |
5 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index 9a7ccc55ac9..cb962e138c5 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -4,7 +4,7 @@ R packages ## Installation Define an environment for R that contains all the libraries that you'd like to -use by adding the following snippet to your $HOME/.nixpkgs/config.nix file: +use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: ```nix { diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bd7e1188928..451d4b71296 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -6,7 +6,7 @@ assert ((config.planetary_annihilation or null).url or null) != null; assert ((config.planetary_annihilation or null).sha256 or null) != null; /* to setup: - $ cat ~/.nixpkgs/config.nix + $ cat ~/.config/nixpkgs/config.nix { planetary_annihilation = { url = "file:///home/user/PA_Linux_62857.tar.bz2"; 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 diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index d1a28b9b15e..63112034d29 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -17,13 +17,15 @@ in system ? builtins.currentSystem , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or - # $HOME/.nixpkgs/config.nix. + # $HOME/.config/nixpkgs/config.nix. config ? let configFile = getEnv "NIXPKGS_CONFIG"; - configFile2 = homeDir + "/.nixpkgs/config.nix"; + configFile2 = homeDir + "/.config/nixpkgs/config.nix"; + configFile3 = homeDir + "/.nixpkgs/config.nix"; # obsolete in if configFile != "" && pathExists configFile then import configFile else if homeDir != "" && pathExists configFile2 then import configFile2 + else if homeDir != "" && pathExists configFile3 then import configFile3 else {} , # Overlays are used to extend Nixpkgs collection with additional @@ -31,7 +33,7 @@ in # fix-point made by Nixpkgs. overlays ? let dirPath = try (if pathExists <nixpkgs-overlays> then <nixpkgs-overlays> else "") ""; - dirHome = homeDir + "/.nixpkgs/overlays"; + dirHome = homeDir + "/.config/nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in |