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

Merge pull request #95021 from Flakebi/salt

Browse Source 
salt: 3001 -> 3001.1
This commit is contained in:
Martin Weinelt 2020-08-15 03:54:50 +02:00 committed by GitHub
commit c48dd6b8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,34 +5,16 @@
# passing them in this array enables Salt to find them. # passing them in this array enables Salt to find them.
, extraInputs ? [] , extraInputs ? []
}: }:
let python3.pkgs.buildPythonApplication rec {
py = python3.override {
packageOverrides = self: super: {
# Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved
msgpack = super.msgpack.overridePythonAttrs (
oldAttrs: rec {
version = "0.6.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a";
};
}
);
};
};
in
py.pkgs.buildPythonApplication rec {
pname = "salt"; pname = "salt";
version = "3001"; version = "3001.1";
src = py.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw"; sha256 = "1g2sdcibir0zhldmngv1iyzlhh2adq9dqjc73grap3df5zcv9sz9";
}; };
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
distro distro
jinja2 jinja2
markupsafe markupsafe