From e3d11af1d2d3abf04bcbc8bd25d694cf51e2189a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 27 Aug 2023 01:25:49 -0700 Subject: [PATCH] python310Packages.fe25519: remove patch leftover from merge There is a conflict between https://github.com/NixOS/nixpkgs/pull/251649 and https://github.com/NixOS/nixpkgs/pull/250778/commits/7418b09f49d6a0531f8cd8134e02acacecbba20a. --- pkgs/development/python-modules/fe25519/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 6a935cadd179..819c7cc34df6 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -1,7 +1,6 @@ { lib , bitlist , buildPythonPackage -, fetchpatch , fetchPypi , fountains , parts @@ -23,15 +22,6 @@ buildPythonPackage rec { hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs="; }; - patches = [ - # https://github.com/nthparty/fe25519/pull/1 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/nthparty/fe25519/commit/0565f60ddbb1aa4755c68edc85b7df12a3a7311e.patch"; - hash = "sha256-FcqkHPdkYN6y+Pvviul2wDsmhhcycfRGqFhmX5sxo1k="; - }) - ]; - nativeBuildInputs = [ setuptools wheel