Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d20bbc36082
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66901f081869
Choose a head ref
  • 7 commits
  • 3 files changed
  • 3 contributors

Commits on May 18, 2020

  1. nixos/zfs: add missing dependendy nettools 

    Fix #87823

(cherry picked from commit aa9a88d7bd649c56e35a6577d64eec687aa9f87c)
    @datafoo @Mic92
    datafoo authored and Mic92 committed May 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad96acb View commit details

  2. ansible: v2.9.2 → v2.9.7 

    Fixes: CVE-2020-10684, CVE-2020-1733, CVE-2020-1735, CVE-2020-1739, CVE-2020-1740
(cherry picked from commit dde1577)
    @mweinelt
    mweinelt committed May 18, 2020
    Copy the full SHA
    46ee780 View commit details

  3. ansible: v2.9.7 → v2.9.9 

    (cherry picked from commit 0dea984)
    @mweinelt
    mweinelt committed May 18, 2020
    Copy the full SHA
    92fd2e5 View commit details

  4. ansible_2_8: v2.8.11 → v2.8.12 

    (cherry picked from commit c0e6848)
    @mweinelt
    mweinelt committed May 18, 2020
    Copy the full SHA
    3a1771d View commit details

  5. ansible_2_7: v2.7.17 → v2.7.18 

    (cherry picked from commit 25233a5)
    @mweinelt
    mweinelt committed May 18, 2020
    Copy the full SHA
    b403f32 View commit details

  6. ansible_2_6: mark as insecure 

    Ansible 2.6 went EOL in 2019/11/06 and several CVEs have since come up.
    @mweinelt
    mweinelt committed May 18, 2020
    Copy the full SHA
    905b027 View commit details

  7. Merge pull request #88038 from mweinelt/20.03/ansible 

    [20.03] ansible: v2.9.2 → v2.9.9, v2.8.11 → v2.8.12, v2.7.17 → v2.7.18, mark v2.6 as insecure
    @flokli
    flokli authored May 18, 2020
    Copy the full SHA
    66901f0 View commit details
Showing with 21 additions and 7 deletions.
  1. +10 −1 nixos/modules/tasks/filesystems/zfs.nix
  2. +2 −2 pkgs/development/python-modules/ansible/default.nix
  3. +9 −4 pkgs/tools/admin/ansible/default.nix
11 changes: 10 additions & 1 deletion nixos/modules/tasks/filesystems/zfs.nix
View file
Original file line number Diff line number Diff line change
@@ -433,7 +433,16 @@ in

services.zfs.zed.settings = {
ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ];
PATH = lib.makeBinPath [
packages.zfsUser
pkgs.coreutils
pkgs.curl
pkgs.gawk
pkgs.gnugrep
pkgs.gnused
pkgs.nettools
pkgs.utillinux
];
};

environment.etc = genAttrs
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.9.2";
version = "2.9.9";

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

prePatch = ''
13 changes: 9 additions & 4 deletions pkgs/tools/admin/ansible/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,21 +7,21 @@ rec {

ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
pname = "ansible";
version = "2.8.11";
version = "2.8.12";

src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m";
sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a";
};
}));

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

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

@@ -33,5 +33,10 @@ rec {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn";
};

meta.knownVulnerabilities = [
# https://access.redhat.com/support/policy/updates/ansible-engine
"Ansible 2.6 is End-of-Life since 2019/11/06 and affected by multiple CVEs."
];
}));
}