From cb51a6a99a598ce66b17076fcdd37a0f90b3cc44 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Tue, 1 Apr 2025 10:14:41 -0500
Subject: [PATCH 1/3] python3.pkgs.pcbnewtransition: 0.5.0 -> 0.5.2

It looks like they've started publishing sdists with lowercase filenames
(`pcbnewtransition-X.Y.Z.tar.gz` rather than
`pcbnewTransition-X.Y.Z.tar.gz`).
---
 .../development/python-modules/pcbnewtransition/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pcbnewtransition/default.nix b/pkgs/development/python-modules/pcbnewtransition/default.nix
index f5a674d3763d4..77d59c1851c8d 100644
--- a/pkgs/development/python-modules/pcbnewtransition/default.nix
+++ b/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 ];

From a5f347c409572ea1b3552aa622c27260f9b9dd4c Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Tue, 1 Apr 2025 10:16:53 -0500
Subject: [PATCH 2/3] kikit: 1.7.1 -> 1.7.2

changelog: https://github.com/yaqwsx/KiKit/releases/tag/v1.7.2

This brings in support for KiCAD v9:
https://github.com/yaqwsx/KiKit/releases/tag/v1.7.2, as [we upgraded to
KiCAD v9 recently](https://github.com/NixOS/nixpkgs/pull/384150).
---
 pkgs/by-name/ki/kikit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 8807d8887ba41..66b2b4d13675b 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/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,7 @@ buildPythonApplication rec {
     owner = "yaqwsx";
     repo = "KiKit";
     tag = "v${version}";
-    hash = "sha256-GG0OXPoTy219QefQ7GwMen4u66lPob5DI8lU9sqwaRQ=";
+    hash = "sha256-mwe/CajmQD5nDNYtQXRQm4vIJJiY7P5uFrvn8Ngjqc4=";
   };
 
   build-system = [

From 24d4c5322f11d3efde15d873b14cf920b83126a6 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Sun, 6 Apr 2025 10:59:33 -0700
Subject: [PATCH 3/3] kikit: implement a workaround for non-deterministic
 `fetchFromGitHub`

See https://github.com/NixOS/nixpkgs/issues/84312 for details.
---
 pkgs/by-name/ki/kikit/default.nix           | 13 ++++++++++++-
 pkgs/by-name/ki/kikit/drop-versioneer.patch | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ki/kikit/drop-versioneer.patch

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 66b2b4d13675b..8f24acfff73ea 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -35,7 +35,13 @@ buildPythonApplication rec {
     owner = "yaqwsx";
     repo = "KiKit";
     tag = "v${version}";
-    hash = "sha256-mwe/CajmQD5nDNYtQXRQm4vIJJiY7P5uFrvn8Ngjqc4=";
+    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
 
diff --git a/pkgs/by-name/ki/kikit/drop-versioneer.patch b/pkgs/by-name/ki/kikit/drop-versioneer.patch
new file mode 100644
index 0000000000000..efddd64c7f234
--- /dev/null
+++ b/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"],
+     },