Merge remote-tracking branch 'upstream/staging-next' into HEAD

2021-01-17 18:09:56 +01:00
parent 5ca647b244 1279bf812c
commit 57d863b1f0
303 changed files with 1084 additions and 964 deletions
@@ -567,12 +567,13 @@ in the `~/.config/nixpkgs/overlays` directory.
 Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar:

 ```
-  nixpkgs = {
+{ pkgs ? import <nixpkgs> {
    overlays = [
      (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
      # Further overlays go here
    ];
  };
+};
 ```

 Note that this will fetch the latest overlay version when rebuilding your system.