0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge pull request #324451 from Wulfsta/gerbolyze-v3.1.8

gerbolyze: 3.1.7 -> 3.1.8
This commit is contained in:
Peder Bergebakken Sundt 2024-07-04 20:10:03 +02:00 committed by GitHub
commit cb4fedaf67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2,16 +2,17 @@
, stdenv
, python3Packages
, fetchFromGitHub
, gitUpdater
, resvg
}:
let
version = "3.1.7";
version = "3.1.8";
src = fetchFromGitHub {
owner = "jaseg";
repo = "gerbolyze";
rev = "v${version}";
hash = "sha256-0iTelSlUJUafclRowwsUAoO44nc/AXaOKXnZKfKOIaE=";
hash = "sha256-uF06aU9zT7LjYHreQ8aFQKn/wAesS31LvzHBgD50LfQ=";
fetchSubmodules = true;
};
@ -43,22 +44,6 @@ let
platforms = platforms.linux;
};
};
# FIXME: check if this downgrade is still required when bumping gerbolyze
# https://github.com/jaseg/gerbolyze/issues/47
resvg' = resvg.overrideAttrs (old: rec {
version = "0.41.0";
src = old.src.override {
rev = "v${version}";
hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY=";
};
cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
name = "${old.pname}-${version}-vendor.tar.gz";
inherit src;
outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww=";
});
});
in python3Packages.buildPythonApplication rec {
inherit version src;
pname = "gerbolyze";
@ -77,7 +62,7 @@ in python3Packages.buildPythonApplication rec {
python3Packages.python-slugify
python3Packages.lxml
python3Packages.gerbonara
resvg'
resvg
svg-flatten
];
@ -95,7 +80,11 @@ in python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "gerbolyze" ];
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ];
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ];
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Directly render SVG overlays into Gerber and Excellon files";