diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-09-05 11:16:41 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-06 13:54:10 +0200 |
| commit | 67651d80bc8baaf09ab91fec8ea423e09107ed8f (patch) | |
| tree | 216a82ca309b80298039c2038160a22e94a1de6f /pkgs/tools/admin/ansible | |
| parent | 036bafe0b94fb99ee9d1eb3d2fb902293a9f39a6 (diff) | |
Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
Diffstat (limited to 'pkgs/tools/admin/ansible')
| -rw-r--r-- | pkgs/tools/admin/ansible/2.1.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/admin/ansible/2.2.nix | 9 |
2 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index 5a20b5256076..6232e4ad95ba 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -7,16 +7,14 @@ with pythonPackages; let - jinja = jinja2.override rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; - }; - + }); in buildPythonPackage rec { pname = "ansible"; version = "2.1.4.0"; diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 528dbf0e97bc..02392d7ac89f 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -9,12 +9,11 @@ with pythonPackages; let # Shouldn't be needed anymore in next version # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 - jinja = (jinja2.override rec { - pname = "Jinja2"; + jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + name = "${old.pname}-${version}"; + src = old.src.override { + inherit version; sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; }; }); |