commit 2f5dab753cb52539325b82c43df8c5dd0a20635e · pyrox.dev/nixpkgs

+11 -18

pkgs/development/python-modules/ansible/2.1.nix pkgs/tools/admin/ansible/2.1.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
        
       , fetchurl

     

       3
       3
       -
       , buildPythonPackage

     

       4
       4
       -
       , pycrypto

     

       5
       5
       -
       , paramiko

     

       6
       6
       -
       , jinja2

     

       7
       7
       -
       , pyyaml

     

       8
       8
       -
       , httplib2

     

       9
       9
       -
       , boto

     

       10
       10
       -
       , six

     

       11
       11
       -
       , netaddr

     

       12
       12
       -
       , dns

     

       3
       3
       +
       , pythonPackages

     

       13
       4
        
       , windowsSupport ? false

     

       14
       14
       -
       , pywinrm ? null

     

       15
       5
        
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       with pythonPackages;

     

       16
       8
        
       

     

       17
       9
        
       let

     

       18
       10
        
         jinja = jinja2.override rec {

     
···

       45
       37
        
         dontPatchELF = true;

     

       46
       38
        
         dontPatchShebangs = false;

     

       47
       39
        
       

     

       48
       48
       -
         propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2

     

       49
       49
       -
           boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

     

       40
       40
       +
         propagatedBuildInputs = [

     

       41
       41
       +
           pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns

     

       42
       42
       +
         ] ++ stdenv.lib.optional windowsSupport pywinrm;

     

       50
       43
        
       

     

       51
       51
       -
         meta = {

     

       44
       44
       +
         meta = with stdenv.lib; {

     

       52
       45
        
           homepage = http://www.ansible.com;

     

       53
       46
        
           description = "A simple automation tool";

     

       54
       54
       -
           license = with lib.licenses; [ gpl3] ;

     

       55
       55
       -
           maintainers = with lib.maintainers; [

     

       47
       47
       +
           license = with licenses; [ gpl3] ;

     

       48
       48
       +
           maintainers = with maintainers; [

     

       56
       49
        
             jgeerds

     

       57
       50
        
             joamaki

     

       58
       51
        
           ];

     

       59
       59
       -
           platforms = with lib.platforms; linux ++ darwin;

     

       52
       52
       +
           platforms = with platforms; linux ++ darwin;

     

       60
       53
        
         };

     

       61
       54
        
       }

+11 -18

pkgs/development/python-modules/ansible/2.2.nix pkgs/tools/admin/ansible/2.2.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
        
       , fetchurl

     

       3
       3
       -
       , buildPythonPackage

     

       4
       4
       -
       , pycrypto

     

       5
       5
       -
       , paramiko

     

       6
       6
       -
       , jinja2

     

       7
       7
       -
       , pyyaml

     

       8
       8
       -
       , httplib2

     

       9
       9
       -
       , boto

     

       10
       10
       -
       , six

     

       11
       11
       -
       , netaddr

     

       12
       12
       -
       , dns

     

       3
       3
       +
       , pythonPackages

     

       13
       4
        
       , windowsSupport ? false

     

       14
       14
       -
       , pywinrm ? null

     

       15
       5
        
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       with pythonPackages;

     

       16
       8
        
       

     

       17
       9
        
       let

     

       18
       10
        
         # Shouldn't be needed anymore in next version

     
···

       46
       38
        
         dontPatchELF = true;

     

       47
       39
        
         dontPatchShebangs = false;

     

       48
       40
        
       

     

       49
       49
       -
         propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2

     

       50
       50
       -
           boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

     

       41
       41
       +
         propagatedBuildInputs = [

     

       42
       42
       +
           pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns

     

       43
       43
       +
         ] ++ stdenv.lib.optional windowsSupport pywinrm;

     

       51
       44
        
       

     

       52
       52
       -
         meta = {

     

       45
       45
       +
         meta = with stdenv.lib; {

     

       53
       46
        
           homepage = http://www.ansible.com;

     

       54
       47
        
           description = "A simple automation tool";

     

       55
       55
       -
           license = with lib.licenses; [ gpl3] ;

     

       56
       56
       -
           maintainers = with lib.maintainers; [

     

       48
       48
       +
           license = with licenses; [ gpl3] ;

     

       49
       49
       +
           maintainers = with maintainers; [

     

       57
       50
        
             jgeerds

     

       58
       51
        
             joamaki

     

       59
       52
        
           ];

     

       60
       60
       -
           platforms = with lib.platforms; linux ++ darwin;

     

       53
       53
       +
           platforms = with platforms; linux ++ darwin;

     

       61
       54
        
         };

     

       62
       55
        
       }

-50

pkgs/development/python-modules/ansible/2.3.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , fetchurl

     

       3
       3
       -
       , buildPythonPackage

     

       4
       4
       -
       , pycrypto

     

       5
       5
       -
       , paramiko

     

       6
       6
       -
       , jinja2

     

       7
       7
       -
       , pyyaml

     

       8
       8
       -
       , httplib2

     

       9
       9
       -
       , boto

     

       10
       10
       -
       , six

     

       11
       11
       -
       , netaddr

     

       12
       12
       -
       , dns

     

       13
       13
       -
       , windowsSupport ? false

     

       14
       14
       -
       , pywinrm ? null

     

       15
       15
       -
       }:

     

       16
       16
       -
       

     

       17
       17
       -
       buildPythonPackage rec {

     

       18
       18
       -
         pname = "ansible";

     

       19
       19
       -
         version = "2.3.1.0";

     

       20
       20
       -
         name = "${pname}-${version}";

     

       21
       21
       -
       

     

       22
       22
       -
       

     

       23
       23
       -
         src = fetchurl {

     

       24
       24
       -
           url = "http://releases.ansible.com/ansible/${name}.tar.gz";

     

       25
       25
       -
           sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd";

     

       26
       26
       -
         };

     

       27
       27
       -
       

     

       28
       28
       -
         prePatch = ''

     

       29
       29
       -
           sed -i "s,/usr/,$out," lib/ansible/constants.py

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         doCheck = false;

     

       33
       33
       -
         dontStrip = true;

     

       34
       34
       -
         dontPatchELF = true;

     

       35
       35
       -
         dontPatchShebangs = false;

     

       36
       36
       -
       

     

       37
       37
       -
         propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2

     

       38
       38
       -
           boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

     

       39
       39
       -
       

     

       40
       40
       -
         meta = {

     

       41
       41
       -
           homepage = http://www.ansible.com;

     

       42
       42
       -
           description = "A simple automation tool";

     

       43
       43
       -
           license = with lib.licenses; [ gpl3] ;

     

       44
       44
       -
           maintainers = with lib.maintainers; [

     

       45
       45
       -
             jgeerds

     

       46
       46
       -
             joamaki

     

       47
       47
       -
           ];

     

       48
       48
       -
           platforms = with lib.platforms; linux ++ darwin;

     

       49
       49
       -
         };

     

       50
       50
       -
       }

+40

pkgs/tools/admin/ansible/2.3.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       , pythonPackages

     

       4
       4
       +
       , windowsSupport ? false

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       pythonPackages.buildPythonPackage rec {

     

       8
       8
       +
         pname = "ansible";

     

       9
       9
       +
         version = "2.3.1.0";

     

       10
       10
       +
         name = "${pname}-${version}";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "http://releases.ansible.com/ansible/${name}.tar.gz";

     

       14
       14
       +
           sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         prePatch = ''

     

       18
       18
       +
           sed -i "s,/usr/,$out," lib/ansible/constants.py

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         doCheck = false;

     

       22
       22
       +
         dontStrip = true;

     

       23
       23
       +
         dontPatchELF = true;

     

       24
       24
       +
         dontPatchShebangs = false;

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = with pythonPackages; [

     

       27
       27
       +
           pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns

     

       28
       28
       +
         ] ++ stdenv.lib.optional windowsSupport pywinrm;

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       31
       31
       +
           homepage = http://www.ansible.com;

     

       32
       32
       +
           description = "A simple automation tool";

     

       33
       33
       +
           license = with licenses; [ gpl3] ;

     

       34
       34
       +
           maintainers = with maintainers; [

     

       35
       35
       +
             jgeerds

     

       36
       36
       +
             joamaki

     

       37
       37
       +
           ];

     

       38
       38
       +
           platforms = with platforms; linux ++ darwin;

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+5 -2

pkgs/top-level/all-packages.nix

···

       6618
       6618
        
       

     

       6619
       6619
        
         augeas = callPackage ../tools/system/augeas { };

     

       6620
       6620
        
       

     

       6621
       6621
       -
         ansible  = python2Packages.ansible2;

     

       6622
       6622
       -
         ansible2 = python2Packages.ansible2;

     

       6621
       6621
       +
         ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};

     

       6622
       6622
       +
         ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};

     

       6623
       6623
       +
         ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};

     

       6624
       6624
       +
         ansible  = ansible_2_3;

     

       6625
       6625
       +
         ansible2 = ansible_2_3;

     

       6623
       6626
        
       

     

       6624
       6627
        
         antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };

     

       6625
       6628

-7

pkgs/top-level/python-packages.nix

···

       519
       519
        
       

     

       520
       520
        
         amqplib = callPackage ../development/python-modules/amqplib {};

     

       521
       521
        
       

     

       522
       522
       -
         ansible  = self.ansible2;

     

       523
       523
       -
         ansible2 = self.ansible_2_3;

     

       524
       524
       -
       

     

       525
       525
       -
         ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {};

     

       526
       526
       -
         ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};

     

       527
       527
       -
         ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};

     

       528
       528
       -
       

     

       529
       522
        
         apipkg = callPackage ../development/python-modules/apipkg {};

     

       530
       523
        
       

     

       531
       524
        
         appdirs = callPackage ../development/python-modules/appdirs { };