From 72cc6ba17fdd516b8d534f8597188dbf4c406174 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 11:37:27 +0200 Subject: [PATCH] ansible_2_1, ansible_2_2: use overridePythonAttrs --- pkgs/tools/admin/ansible/2.1.nix | 10 ++++------ pkgs/tools/admin/ansible/2.2.nix | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index d8400b66928a..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.overrideDerivation (old: 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 3da3802e40ff..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.overrideDerivation (old: 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"; }; });