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

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 27 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/zc-lockfile/default.nix b/nixpkgs/pkgs/development/python-modules/zc-lockfile/default.nix
new file mode 100644
index 000000000000..5104a221e1e8
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/zc-lockfile/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage
+, fetchPypi
+, mock
+, zope-testing
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "zc-lockfile";
+  version = "3.0";
+
+  src = fetchPypi {
+    pname = "zc.lockfile";
+    inherit version;
+    hash = "sha256-5Y/9ndYsbUMuhoK/oZbJDKw+XB4/JNrjuJ1ggihV14g=";
+  };
+
+  buildInputs = [ mock ];
+  propagatedBuildInputs = [ zope-testing ];
+
+  meta = with lib; {
+    description = "Inter-process locks";
+    homepage =  "https://www.python.org/pypi/zc.lockfile";
+    license = licenses.zpl20;
+    maintainers = with maintainers; [ goibhniu ];
+  };
+}