public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-09-27 00:03:11 +00:00 committed by GitHub
parent af98bd1601 a0da4b7b0c
commit 56ecd91ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/lief/default.nix
View File

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.11.4";
version = "0.11.5";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "DgsTrJ2+zdXJK6CdDOan7roakaaxQiwrVeiQnzJnk0A=";
sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE=";
};
outputs = [ "out" "py" ];

6
pkgs/tools/admin/salt/default.nix
View File

@ -7,11 +7,11 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "salt";
version = "3003";
version = "3003.3";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "xGiXM9/nOM8ofjHLP908uNFgYpUgKxjY5m1I03LVync=";
sha256 = "pvnIyLXiYA6oYgtKZzcd4XYRvrT42X5LubCzCKN+0eI=";
};
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;