Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5bd4028bdcfa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1474940ea454
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 22, 2020

  1. ansible_2_9: init at 2.9.2

    Jonathan Ringer committed Jan 22, 2020
    Copy the full SHA
    99eb923 View commit details

  2. ansible_2_*: overridePythonAttrs -> overrideAttrs

    Jonathan Ringer committed Jan 22, 2020
    Copy the full SHA
    3444d76 View commit details

  3. ansible_2_8: 2.8.6 -> 2.8.7

    Jonathan Ringer committed Jan 22, 2020
    Copy the full SHA
    1474940 View commit details
Showing with 20 additions and 8 deletions.
  1. +2 −2 pkgs/development/python-modules/ansible/default.nix
  2. +15 −5 pkgs/tools/admin/ansible/default.nix
  3. +3 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

buildPythonPackage rec {
pname = "ansible";
version = "2.8.7";
version = "2.9.2";

src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8";
sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8";
};

prePatch = ''
20 changes: 15 additions & 5 deletions pkgs/tools/admin/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
{ python3Packages, fetchurl }:

{
ansible = with python3Packages; toPythonApplication ansible;
rec {
ansible = ansible_2_8;

ansible_2_8 = with python3Packages; toPythonApplication ansible;
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;

ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.8.7";

src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2";
};
}));

ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.7.15";

@@ -15,7 +25,7 @@
};
}));

ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec {
ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.6.20";

4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9653,7 +9653,9 @@ in
inherit (callPackage ../tools/admin/ansible { })
ansible
ansible_2_6
ansible_2_7;
ansible_2_7
ansible_2_8
ansible_2_9;

ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;