Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'

Conflicts:
	nixpkgs/nixos/modules/config/update-users-groups.pl

1 files changed, 0 insertions, 32 deletions

diff --git a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix b/nixpkgs/pkgs/tools/admin/swiftclient/default.nix
deleted file mode 100644
index 512a7f620923..000000000000
--- a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, buildPythonApplication, fetchPypi, requests, six, pbr, setuptools }:
-
-buildPythonApplication rec {
-  pname = "python-swiftclient";
-  version = "3.11.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3972f8b1986e60ea786ad01697e6882f331209ae947ef8b795531940f1e0732b";
-  };
-
-  propagatedBuildInputs = [ requests six pbr setuptools ];
-
-  # For the tests the following requirements are needed:
-  # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt
-  #
-  # The ones missing in nixpkgs (currently) are:
-  # - hacking
-  # - keystoneauth
-  # - oslosphinx
-  # - stestr
-  # - reno
-  # - openstackdocstheme
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/openstack/python-swiftclient";
-    description = "Python bindings to the OpenStack Object Storage API";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ c0deaddict ];
-  };
-}