public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28884 from FRidh/python-fixes

Browse Source 
Python: several fixes
This commit is contained in:
Frederik Rietdijk
2017-09-05 11:16:41 +02:00
committed by Frederik Rietdijk
parent 036bafe0b9
commit 67651d80bc
71 changed files with 1365 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/admin/ansible/2.1.nix
View File

@@ -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";

9
pkgs/tools/admin/ansible/2.2.nix
View File

@@ -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";
};
});