From 962a2f26a09b4145c64329c5335477533d6bbe9c Mon Sep 17 00:00:00 2001 From: Flakebi Date: Thu, 24 Jun 2021 23:54:59 +0200 Subject: [PATCH] salt: 3003 -> 3003.1 Need to patch out the contextvars dependency (which is included in python 3.7+). The same patch is discussed in arch: https://bugs.archlinux.org/task/71344 (cherry picked from commit c0b46c6b596dd25f32733ff01156d3d769640ab5) --- pkgs/tools/admin/salt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 38ece95e3a4..0620bb28534 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3003"; + version = "3003.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "xGiXM9/nOM8ofjHLP908uNFgYpUgKxjY5m1I03LVync="; + sha256 = "inGE095NFydhjw0/u6eeVDia7/hbcvTOuCALzBZ/br4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -31,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace "salt/utils/rsax931.py" \ --subst-var-by "libcrypto" "${openssl.out}/lib/libcrypto.so" + substituteInPlace requirements/base.txt \ + --replace contextvars "" ''; # The tests fail due to socket path length limits at the very least;