Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- pkgs/applications/graphics/seamly2d/default.nix

pkgs/development/interpreters/python/cpython/docs/2.7-html.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python27-docs-html";

pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python27-docs-pdf-a4";

pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python27-docs-pdf-letter";

pkgs/development/interpreters/python/cpython/docs/2.7-text.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python27-docs-text";

pkgs/development/interpreters/python/cpython/docs/3.10-html.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python310-docs-html";

pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python310-docs-pdf-a4";

pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python310-docs-pdf-letter";

pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python310-docs-texinfo";

pkgs/development/interpreters/python/cpython/docs/3.10-text.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "python310-docs-text";

pkgs/development/interpreters/python/cpython/docs/template-info.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "pythonMAJORMINOR-docs-TYPE";

pkgs/development/interpreters/python/cpython/docs/template.nix

@@ -1,6 +1,6 @@
 # This file was generated and will be overwritten by ./generate.sh
 
-{ stdenv, fetchurl, lib }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   pname = "pythonMAJORMINOR-docs-TYPE";