From 0091e0358bec6952511786b28676753b02bdf860 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jul 2020 21:49:20 +0200 Subject: [PATCH] python.pkgs.zstandard: it vendors a copy of zstd... so we don't even need to give zstd at all. Related discussion https://github.com/NixOS/nixpkgs/issues/92075. Follow-up to 3b4df94aeb6e215085d08e3d5b0edc1313b9f584 --- pkgs/development/python-modules/zstandard/default.nix | 2 -- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 75c84762431..760593904be 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -3,7 +3,6 @@ , fetchPypi , cffi , hypothesis -, zstd }: buildPythonPackage rec { @@ -15,7 +14,6 @@ buildPythonPackage rec { sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; }; - buildInputs = [ zstd ]; propagatedBuildInputs = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f272c88315f..dc40a0668a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7298,9 +7298,7 @@ in { inherit (pkgs) zstd pkgconfig; }; - zstandard = callPackage ../development/python-modules/zstandard { - inherit (pkgs) zstd; - }; + zstandard = callPackage ../development/python-modules/zstandard { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { };