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

Merge pull request #19011 from aneeshusa/move-salt-package 

Move salt package
This commit is contained in:
Frederik Rietdijk 2016-09-27 19:42:23 +02:00 committed by GitHub
parent 8aaf610d4d 7b7d8ddbca
commit ba69aa80aa
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/admin/salt/testing.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "SaltTesting-${version}";
version = "2016.9.7";
disabled = pythonPackages.isPy3k;
src = fetchurl {
url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
sha256 = "0vcw1b1176qm9nkic3sbxh6vnv9kpd9kgyqz5fpsp5jnb2hsf1qx";
};
meta = with stdenv.lib; {
homepage = https://github.com/saltstack/salt-testing;
description = "Common testing tools used in the Salt Stack projects";
maintainers = with maintainers; [ aneeshusa ];
license = licenses.asl20;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -3482,6 +3482,8 @@ in
safe-rm = callPackage ../tools/system/safe-rm { }; safe-rm = callPackage ../tools/system/safe-rm { };
salt = callPackage ../tools/admin/salt {};
salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
samplicator = callPackage ../tools/networking/samplicator { }; samplicator = callPackage ../tools/networking/samplicator { };

4
pkgs/top-level/python-packages.nix
View File

@ -22882,10 +22882,6 @@ in modules // {
}; };
}; };
salt = callPackage ../tools/admin/salt {};
salttesting = callPackage ../tools/admin/salt/testing.nix {};
sandboxlib = buildPythonPackage rec { sandboxlib = buildPythonPackage rec {
name = "sandboxlib-${version}"; name = "sandboxlib-${version}";
version = "0.31"; version = "0.31";