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

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 0 insertions, 25 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/d2to1/default.nix b/nixpkgs/pkgs/development/python-modules/d2to1/default.nix
deleted file mode 100644
index eaad9fc9095b..000000000000
--- a/nixpkgs/pkgs/development/python-modules/d2to1/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ buildPythonPackage
-, lib
-, fetchFromGitHub
-, nose
-}:
-buildPythonPackage rec {
-  pname = "d2to1";
-  version = "0.2.12.post1";
-
-  nativeCheckInputs = [ nose ];
-
-  src = fetchFromGitHub {
-    owner = "embray";
-    repo = pname;
-    rev = version;
-    sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2";
-  };
-
-  meta = with lib;{
-    description = "Support for distutils2-like setup.cfg files as package metadata";
-    homepage = "https://github.com/embray/d2to1";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ makefu ];
-  };
-}