diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index c63fd1edeaf..38369dfd4d2 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -21,30 +21,20 @@ buildPythonPackage rec { pname = "flit"; - version = "3.0.0"; - disabled = !isPy3k; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g="; + sha256 = "sha256-zN+/oAyXBo6Ho7n/xhOQ2mjtPGKA1anCvl3sVf7t+Do="; }; nativeBuildInputs = [ flit-core ]; - # Use toml instead of pytoml - # Resolves infinite recursion since packaging started using flit. - patches = [ - (fetchpatch { - url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch"; - sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI="; - }) - ]; - propagatedBuildInputs = [ docutils requests diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 0d1673123af..ac1d891412c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -32,6 +32,8 @@ with self; with super; { feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + flit = disabled super.flit; + flit-core = disabled super.flit-core; fontforge = disabled super.fontforge;