3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #177305 from dotlambda/dmarc-metrics-exporter-0.6.0

dmarc-metrics-exporter: 0.5.1 -> 0.6.0
This commit is contained in:
Maximilian Bosch 2022-06-13 06:51:05 +02:00 committed by GitHub
commit 0d627e417f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 21 deletions

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bite-parser";
version = "0.1.1";
version = "0.1.3";
disabled = pythonOlder "3.7";
@ -18,15 +18,9 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4";
sha256 = "0f246e98a5556d6ed9a33fda1e94c3ab906305729feb30d25e35344b3e1c1fd9";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'python = "^3.7,<=3.10"' 'python = "^3.7,<3.11"' \
--replace poetry.masonry.api poetry.core.masonry.api
'';
nativeBuildInputs = [
poetry-core
];
@ -42,6 +36,7 @@ buildPythonPackage rec {
meta = {
description = "Asynchronous parser taking incremental bites out of your byte input stream";
homepage = "https://github.com/jgosmann/bite-parser";
changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};

View file

@ -1,11 +1,10 @@
{ lib
, python3
, fetchpatch
}:
python3.pkgs.buildPythonApplication rec {
pname = "dmarc-metrics-exporter";
version = "0.5.1";
version = "0.6.0";
disabled = python3.pythonOlder "3.7";
@ -13,21 +12,11 @@ python3.pkgs.buildPythonApplication rec {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "22ec361f9a4c86abefbfab541f588597e21bf4fbedf2911f230e560b2ec3503a";
sha256 = "70f39b373ead42acb8caf56040f7ebf13ab67aea505511025c09ecf4560f8b1b";
};
patches = [
# https://github.com/jgosmann/dmarc-metrics-exporter/pull/23
(fetchpatch {
url = "https://github.com/jgosmann/dmarc-metrics-exporter/commit/3fe401f5dfb9e0304601a2a89ac987ff853b7cba.patch";
hash = "sha256-MjVLlFQMp2r3AhBMu1lEmRm0Y2H9FdvCfPgAK5kvwWE=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'python = "^3.7,<3.10"' 'python = "^3.7,<3.11"' \
--replace poetry.masonry.api poetry.core.masonry.api \
--replace '"^' '">='
'';
@ -63,6 +52,7 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Export Prometheus metrics from DMARC reports";
homepage = "https://github.com/jgosmann/dmarc-metrics-exporter";
changelog = "https://github.com/jgosmann/dmarc-metrics-exporter/blob/v${version}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ma27 ];
};