kikit: 1.7.1 -> 1.7.2, python3Packages.pcbnewtransition: 0.5.0 -> 0.5.2: Fix kikit build (#395213)

pkgs/by-name/ki/kikit/default.nix

@@ -26,7 +26,7 @@ let
 in
 buildPythonApplication rec {
   pname = "kikit";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -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 = [
@@ -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
 

pkgs/by-name/ki/kikit/drop-versioneer.patch

@@ -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"],
+     },

pkgs/development/python-modules/pcbnewtransition/default.nix

@@ -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 ];