From 252ae444165fe4be8c8b3e3fc42a1c4eb857d609 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 23 Mar 2021 10:38:57 +0100 Subject: [PATCH] python3Packages.setuptools: 50.3.1 -> 54.2.0 --- .../python-modules/bootstrapped-pip/default.nix | 1 + .../development/python-modules/setuptools/default.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 5a6333d656af..42eb1cccee35 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { echo "Building setuptools wheel..." pushd setuptools + rm pyproject.toml ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 12bbbb7d0e5b..0e144c5b0090 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchurl , buildPythonPackage , fetchFromGitHub , python @@ -13,7 +14,12 @@ let pname = "setuptools"; - version = "50.3.1"; + version = "54.2.0"; + + bootstrap = fetchurl { + url = "https://raw.githubusercontent.com/pypa/setuptools/v52.0.0/bootstrap.py"; + sha256 = "sha256-HzhlnJvMskBfb3kVnYltdnjS63wt1GWd0RK+VQqrJQ8="; + }; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +29,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "Z4KHB3Pv4wZPou/Vbp1DFDgDp47OTDfVChGP55GtIJE="; + sha256 = "sha256-ZHJZiwlWLHP4vf2TLwj/DYB9wjbRp0apVmmjsKCLPq0="; name = "${pname}-${version}-source"; }; @@ -32,6 +38,7 @@ let ]; buildPhase = '' + cp ${bootstrap} bootstrap.py ${python.pythonForBuild.interpreter} bootstrap.py ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar