diff options
-rw-r--r-- | lib/maintainers.nix | 3 | ||||
-rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/ansible/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 23 insertions, 15 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f49d8485ad10..2af2e65a0d58 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ iElectric = "Domen Kozar <domen@dev.si>"; iyzsong = "Song Wenwu <iyzsong@gmail.com>"; jcumming = "Jack Cummings <jack@mudshark.org>"; + joamaki = "Jussi Maki <joamaki@gmail.com>"; jwiegley = "John Wiegley <johnw@newartisans.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; @@ -98,5 +99,5 @@ zef = "Zef Hemel <zef@zef.me>"; zimbatm = "zimbatm <zimbatm@zimbatm.com>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; - joamaki = "Jussi Maki <joamaki@gmail.com>"; + } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 9dedd3ceae73..59b18d772cf4 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -135,8 +135,7 @@ python.stdenv.mkDerivation (attrs // { runHook postInstall ''; - postFixup = - '' + postFixup = attrs.postFixup or '' wrapPythonPrograms # If a user installs a Python package, they probably also wants its diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 31d8bf40f51c..241bd75fd292 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,11 +1,12 @@ -{ stdenv, pythonPackages, fetchurl, python }: +{ stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - name = "ansible-1.6.1"; + version = "1.6.1"; + name = "ansible-${version}"; namePrefix = ""; - + 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"; }; @@ -14,16 +15,23 @@ pythonPackages.buildPythonPackage rec { ''; doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ paramiko jinja2 pyyaml httplib2 ]; - meta = { + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + meta = with stdenv.lib; { homepage = "http://www.ansible.com"; - description = "Ansible simple automation tool"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joamaki ]; - platforms = stdenv.lib.platforms.linux; # Only tested on Linux + description = "A simple automation tool"; + license = licenses.gpl3; + maintainers = [ maintainers.joamaki ]; + platforms = platforms.linux; # Only tested on Linux }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdabeae8420a..5d2249ff3338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3647,6 +3647,8 @@ let ### DEVELOPMENT / TOOLS + ansible = callPackage ../tools/system/ansible { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -11046,7 +11048,5 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; - ansible = callPackage ../tools/system/ansible { }; - }; in self; in pkgs |