Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions pkgs/by-name/ki/kikit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let
in
buildPythonApplication rec {
pname = "kikit";
version = "1.7.1";
version = "1.7.2";
pyproject = true;

disabled = pythonOlder "3.7";
Expand All @@ -35,7 +35,13 @@ buildPythonApplication rec {
owner = "yaqwsx";
repo = "KiKit";
tag = "v${version}";
hash = "sha256-GG0OXPoTy219QefQ7GwMen4u66lPob5DI8lU9sqwaRQ=";
hash = "sha256-HSAQJJqJMVh44wgOQm+0gteShLogklBFuIzWtoVTf9I=";
# Upstream uses versioneer, which relies on gitattributes substitution.
# This leads to non-reproducible archives on GitHub.
# See https://github.com/NixOS/nixpkgs/issues/84312
postFetch = ''
rm "$out/kikit/_version.py"
'';
};

build-system = [
Expand Down Expand Up @@ -75,6 +81,11 @@ buildPythonApplication rec {
"kikit"
];

postPatch = ''
# Recreate _version.py, deleted at fetch time due to non-reproducibility.
echo 'def get_versions(): return {"version": "${version}"}' > kikit/_version.py
'';

preCheck = ''
export PATH=$PATH:$out/bin

Expand Down
14 changes: 14 additions & 0 deletions pkgs/by-name/ki/kikit/drop-versioneer.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/setup.py b/setup.py
index 9351fc9..75dfb2c 100644
--- a/setup.py
+++ b/setup.py
@@ -66,9 +66,6 @@
"solidpython>=1.1.2",
"commentjson>=0.9"
],
- setup_requires=[
- "versioneer"
- ],
extras_require={
"dev": ["pytest"],
},
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/pcbnewtransition/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
}:
buildPythonPackage rec {
pname = "pcbnewtransition";
version = "0.5.0";
version = "0.5.2";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchPypi {
pname = "pcbnewTransition";
inherit pname;
inherit version;
hash = "sha256-4XNcnQzUWpY0NEfS2bdtkedvG4lY79jaPe0QqTWNW6s=";
hash = "sha256-zLnvbu0G2mJKCHLCjbIKHBqSfdEyhR+1afkOFU++TfI=";
};

propagatedBuildInputs = [ kicad ];
Expand Down