From 26b4ea433f8bd206ae9645122b2a0d40c32a0096 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Tue, 14 Oct 2025 18:39:21 -0500
Subject: [PATCH 1/2] maintainers: add gigamonster256

---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fca8333325bf..27bd6e74a195 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9683,6 +9683,14 @@
     github = "Gigahawk";
     githubId = 10356230;
   };
+  gigamonster256 = {
+    email = "n0603919@outlook.com";
+    github = "gigamonster256";
+    githubId = 19415285;
+    matrix = "@gigamonster256:matrix.org";
+    name = "Caleb Norton";
+    keys = [ { fingerprint = "483A 112B 3567 C4F0 DF89  74E1 D776 F570 2D7E 83AB"; } ];
+  };
   giggio = {
     email = "giggio@giggio.net";
     github = "giggio";

From 9c87c36a4995ad4b77f18b47063d2d9f8d4b1877 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Sat, 21 Mar 2026 15:49:50 -0500
Subject: [PATCH 2/2] python3Packages.uploadserver: init at 6.0.1

---
 .../python-modules/uploadserver/default.nix   | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/uploadserver/default.nix

diff --git a/pkgs/development/python-modules/uploadserver/default.nix b/pkgs/development/python-modules/uploadserver/default.nix
new file mode 100644
index 000000000000..6b769cfc9cc8
--- /dev/null
+++ b/pkgs/development/python-modules/uploadserver/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  urllib3,
+  requests,
+  curl,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "uploadserver";
+  version = "6.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Densaugeo";
+    repo = "uploadserver";
+    tag = finalAttrs.version;
+    hash = "sha256-3obQZF9dY9rRVpeU4362o3ZC95hQtXFhxSNryxPAoLM=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    urllib3
+    requests
+    curl
+  ];
+
+  env.VERBOSE = 0;
+  env.PROTOCOL = "HTTP";
+  enabledTestPaths = [ "test.py" ];
+
+  pythonImportsCheck = [ "uploadserver" ];
+
+  meta = {
+    description = "Python's http.server extended to include a file upload page";
+    homepage = "https://github.com/Densaugeo/uploadserver";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.gigamonster256 ];
+    mainProgram = "uploadserver";
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91e3fa92ccda..4959cbb41b43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20515,6 +20515,8 @@ self: super: with self; {
 
   uplink-protobuf = callPackage ../development/python-modules/uplink-protobuf { };
 
+  uploadserver = callPackage ../development/python-modules/uploadserver { };
+
   upnpy = callPackage ../development/python-modules/upnpy { };
 
   uproot = callPackage ../development/python-modules/uproot { };