ansible: conventions, fix module execution
This commit is contained in:
parent
92d8001c25
commit
75cb485718
|
@ -43,6 +43,7 @@
|
||||||
iElectric = "Domen Kozar <domen@dev.si>";
|
iElectric = "Domen Kozar <domen@dev.si>";
|
||||||
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
||||||
jcumming = "Jack Cummings <jack@mudshark.org>";
|
jcumming = "Jack Cummings <jack@mudshark.org>";
|
||||||
|
joamaki = "Jussi Maki <joamaki@gmail.com>";
|
||||||
jwiegley = "John Wiegley <johnw@newartisans.com>";
|
jwiegley = "John Wiegley <johnw@newartisans.com>";
|
||||||
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
|
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
|
||||||
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
|
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
|
||||||
|
@ -98,5 +99,5 @@
|
||||||
zef = "Zef Hemel <zef@zef.me>";
|
zef = "Zef Hemel <zef@zef.me>";
|
||||||
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
||||||
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
|
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
|
||||||
joamaki = "Jussi Maki <joamaki@gmail.com>";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,8 +135,7 @@ python.stdenv.mkDerivation (attrs // {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup =
|
postFixup = attrs.postFixup or ''
|
||||||
''
|
|
||||||
wrapPythonPrograms
|
wrapPythonPrograms
|
||||||
|
|
||||||
# If a user installs a Python package, they probably also wants its
|
# If a user installs a Python package, they probably also wants its
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
{ stdenv, pythonPackages, fetchurl, python }:
|
{ stdenv, fetchurl, pythonPackages, python }:
|
||||||
|
|
||||||
pythonPackages.buildPythonPackage rec {
|
pythonPackages.buildPythonPackage rec {
|
||||||
name = "ansible-1.6.1";
|
version = "1.6.1";
|
||||||
|
name = "ansible-${version}";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ansible/ansible/archive/v1.6.1.tar.gz";
|
url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz";
|
||||||
sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z";
|
sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -14,16 +15,23 @@ pythonPackages.buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
dontStrip = true;
|
||||||
|
dontPatchELF = true;
|
||||||
|
dontPatchShebangs = true;
|
||||||
|
|
||||||
pythonPath = with pythonPackages; [
|
propagatedBuildInputs = with pythonPackages; [
|
||||||
paramiko jinja2 pyyaml httplib2
|
paramiko jinja2 pyyaml httplib2
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
postFixup = ''
|
||||||
|
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
homepage = "http://www.ansible.com";
|
homepage = "http://www.ansible.com";
|
||||||
description = "Ansible simple automation tool";
|
description = "A simple automation tool";
|
||||||
license = stdenv.lib.licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = [ stdenv.lib.maintainers.joamaki ];
|
maintainers = [ maintainers.joamaki ];
|
||||||
platforms = stdenv.lib.platforms.linux; # Only tested on Linux
|
platforms = platforms.linux; # Only tested on Linux
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3647,6 +3647,8 @@ let
|
||||||
|
|
||||||
### DEVELOPMENT / TOOLS
|
### DEVELOPMENT / TOOLS
|
||||||
|
|
||||||
|
ansible = callPackage ../tools/system/ansible { };
|
||||||
|
|
||||||
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
|
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
|
||||||
|
|
||||||
antlr3 = callPackage ../development/tools/parsing/antlr { };
|
antlr3 = callPackage ../development/tools/parsing/antlr { };
|
||||||
|
@ -11046,7 +11048,5 @@ let
|
||||||
# Attributes for backward compatibility.
|
# Attributes for backward compatibility.
|
||||||
adobeReader = adobe-reader;
|
adobeReader = adobe-reader;
|
||||||
|
|
||||||
ansible = callPackage ../tools/system/ansible { };
|
|
||||||
|
|
||||||
|
|
||||||
}; in self; in pkgs
|
}; in self; in pkgs
|
||||||
|
|
Loading…
Reference in a new issue