From 861e2de8a8295702f010e77f42d5ef3750c1e0cb Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Sun, 4 Mar 2018 14:06:10 +0100 Subject: [PATCH 1/2] ansible-lint: init at 3.4.20 --- lib/maintainers-list.nix | 5 +++++ .../tools/ansible-lint/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/ansible-lint/default.nix diff --git a/lib/maintainers-list.nix b/lib/maintainers-list.nix index f397ee0ddb8..6d2308e5489 100644 --- a/lib/maintainers-list.nix +++ b/lib/maintainers-list.nix @@ -3155,6 +3155,11 @@ github = "sellout"; name = "Greg Pfeil"; }; + sengaya = { + email = "tlo@sengaya.de"; + github = "sengaya"; + name = "Thilo Uttendorfer"; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix new file mode 100644 index 00000000000..51f89698d5a --- /dev/null +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, pythonPackages, ansible }: + +pythonPackages.buildPythonPackage rec { + pname = "ansible-lint"; + version = "3.4.20"; + doCheck = false; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1e7f1d5d5ee91b817dedc0b612c2beb5ff44879d592ea17a2eaa6571aa9a2bff"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; + + meta = { + homepage = "https://github.com/willthames/ansible-lint"; + description = "Best practices checker for Ansible"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.sengaya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79d4289d26c..ac86b86b6f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7338,6 +7338,8 @@ with pkgs; ansible = ansible_2_4; ansible2 = ansible_2_4; + ansible-lint = callPackage ../development/tools/ansible-lint {}; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; From 10b1cb28a795c72d53fd5525db6596bdcd5a3e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 6 Mar 2018 00:11:42 +0000 Subject: [PATCH 2/2] ansible-lint: fix tests --- .../tools/ansible-lint/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 51f89698d5a..16d2782b734 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -1,17 +1,28 @@ -{ stdenv, pythonPackages, ansible }: +{ stdenv, fetchFromGitHub, pythonPackages, ansible }: pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; version = "3.4.20"; - doCheck = false; - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "1e7f1d5d5ee91b817dedc0b612c2beb5ff44879d592ea17a2eaa6571aa9a2bff"; + src = fetchFromGitHub { + owner = "willthames"; + repo = "ansible-lint"; + rev = "v${version}"; + sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; + checkInputs = [ pythonPackages.nose ]; + + postPatch = '' + patchShebangs bin/ansible-lint + ''; + + checkPhase = '' + nosetests test + ''; + meta = { homepage = "https://github.com/willthames/ansible-lint"; description = "Best practices checker for Ansible";