Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 37 insertions, 33 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
index 3d10fca06c05..e621a80d7acd 100644
--- a/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix
@@ -5,45 +5,49 @@
 , jinja2
 , pytestCheckHook
 , railroad-diagrams
+, pyparsing
 }:
 
-let
-  pyparsing = buildPythonPackage rec {
-    pname = "pyparsing";
-    version = "3.0.9";
-    format = "pyproject";
+buildPythonPackage rec {
+  pname = "pyparsing";
+  version = "3.0.9";
+  format = "pyproject";
 
-    src = fetchFromGitHub {
-      owner = "pyparsing";
-      repo = pname;
-      rev = "pyparsing_${version}";
-      sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE=";
-    };
+  src = fetchFromGitHub {
+    owner = "pyparsing";
+    repo = pname;
+    rev = "pyparsing_${version}";
+    hash = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE=";
+  };
 
-    nativeBuildInputs = [
-      flit-core
-    ];
+  nativeBuildInputs = [
+    flit-core
+  ];
 
-    # circular dependencies with pytest if enabled by default
-    doCheck = false;
-    checkInputs = [
-      jinja2
-      pytestCheckHook
-      railroad-diagrams
-    ];
+  # circular dependencies with pytest if enabled by default
+  doCheck = false;
+  nativeCheckInputs = [
+    jinja2
+    pytestCheckHook
+    railroad-diagrams
+  ];
 
-    pythonImportsCheck = [ "pyparsing" ];
+  pythonImportsCheck = [ "pyparsing" ];
 
-    passthru.tests = {
-      check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
-    };
+  passthru.tests = {
+    check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
+  };
 
-    meta = with lib; {
-      homepage = "https://github.com/pyparsing/pyparsing";
-      description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
-      license = licenses.mit;
-      maintainers = with maintainers; [ kamadorueda ];
-    };
+  meta = with lib; {
+    homepage = "https://github.com/pyparsing/pyparsing";
+    description = "Python library for creating PEG parsers";
+    longDescription = ''
+      The pyparsing module is an alternative approach to creating and executing
+      simple grammars, vs. the traditional lex/yacc approach, or the use of
+      regular expressions. The pyparsing module provides a library of classes
+      that client code uses to construct the grammar directly in Python code.
+   '';
+    license = licenses.mit;
+    maintainers = with maintainers; [ kamadorueda ];
   };
-in
-pyparsing
+}