From f356ef9b6b470652136a41e6d221f369d2e23dd9 Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Tue, 29 Jul 2025 17:42:09 +0200 Subject: [PATCH] nix: replace partftpy overlay with real package --- contrib/package/nix/partftpy/default.nix | 28 ++++++++++++++++++++++++ flake.nix | 11 +--------- 2 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 contrib/package/nix/partftpy/default.nix diff --git a/contrib/package/nix/partftpy/default.nix b/contrib/package/nix/partftpy/default.nix new file mode 100644 index 00000000..4bc1a79b --- /dev/null +++ b/contrib/package/nix/partftpy/default.nix @@ -0,0 +1,28 @@ +{ + lib, + buildPythonPackage, + fetchurl, + setuptools, +}: + +buildPythonPackage rec { + pname = "partftpy"; + version = "0.4.0"; + pyproject = true; + + src = fetchurl { + url = "https://github.com/9001/partftpy/releases/download/v0.4.0/partftpy-0.4.0.tar.gz"; + hash = "sha256-5Q2zyuJ892PGZmb+YXg0ZPW/DK8RDL1uE0j5HPd4We0="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "partftpy.TftpServer" ]; + + meta = { + description = "Pure Python TFTP library (copyparty edition)"; + homepage = "https://github.com/9001/partftpy"; + changelog = "https://github.com/9001/partftpy/releases/tag/${version}"; + license = lib.licenses.mit; + }; +} diff --git a/flake.nix b/flake.nix index 403a7f15..c5181bfe 100644 --- a/flake.nix +++ b/flake.nix @@ -18,16 +18,7 @@ }; python3 = prev.python3.override { packageOverrides = pyFinal: pyPrev: { - partftpy = pyFinal.tftpy.overrideAttrs { - pname = "partftpy"; - version = "0.4.0"; - src = final.fetchurl { - url = "https://github.com/9001/partftpy/releases/download/v0.4.0/partftpy-0.4.0.tar.gz"; - hash = "sha256-5Q2zyuJ892PGZmb+YXg0ZPW/DK8RDL1uE0j5HPd4We0="; - }; - pyproject = true; - pythonImportsCheck = [ "partftpy.TftpServer" ]; - }; + partftpy = pyFinal.callPackage ./contrib/package/nix/partftpy { }; }; }; };