From 5af0d861aaee215ee998d71803d64b61cb506696 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Apr 2022 08:40:26 +0200
Subject: [PATCH] awslogs: relax jmespath constraint
- add pythonImportsCheck
---
pkgs/tools/admin/awslogs/default.nix | 39 +++++++++++++++++++++-------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix
index 5b61e4828ef6..2f60e414d74a 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/pkgs/tools/admin/awslogs/default.nix
@@ -1,30 +1,51 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib
+, fetchFromGitHub
+, python3
+}:
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "awslogs";
version = "0.14.0";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "jorgebastida";
- repo = "awslogs";
+ repo = pname;
rev = version;
- sha256 = "1gyry8b64psvmjcb2lb3yilpa7b17yllga06svls4hi69arvrd8f";
+ sha256 = "sha256-DrW8s0omQqLp1gaoR6k/YR11afRjUbGYrFtfYhby2b8=";
};
- propagatedBuildInputs = with python3Packages; [
- boto3 termcolor python-dateutil docutils setuptools jmespath
+ propagatedBuildInputs = with python3.pkgs; [
+ boto3
+ termcolor
+ python-dateutil
+ docutils
+ setuptools
+ jmespath
];
- checkInputs = [ python3Packages.pytestCheckHook ];
+ checkInputs = with python3.pkgs; [
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1"
+ '';
+
disabledTests = [
"test_main_get_query"
"test_main_get_with_color"
];
+ pythonImportsCheck = [
+ "awslogs"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/jorgebastida/awslogs";
description = "AWS CloudWatch logs for Humans";
- maintainers = with maintainers; [ dbrock ];
+ homepage = "https://github.com/jorgebastida/awslogs";
license = licenses.bsd3;
+ maintainers = with maintainers; [ dbrock ];
};
}