diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/python-modules/devpi-server/default.nix
similarity index 89%
rename from pkgs/development/tools/devpi-server/default.nix
rename to pkgs/development/python-modules/devpi-server/default.nix
index 4463adc31f87..d42ef6a3766d 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/python-modules/devpi-server/default.nix
@@ -1,37 +1,45 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
-  gitUpdater,
+  buildPythonPackage,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   aiohttp,
   appdirs,
-  beautifulsoup4,
   defusedxml,
   devpi-common,
   execnet,
+  httpx,
   itsdangerous,
-  nginx,
   packaging,
   passlib,
   platformdirs,
   pluggy,
   py,
-  httpx,
   pyramid,
-  pytest-asyncio,
-  pytestCheckHook,
   repoze-lru,
-  setuptools,
-  setuptools-changelog-shortener,
   strictyaml,
   waitress,
+
+  # tests
+  beautifulsoup4,
+  nginx,
+  packaging-legacy,
+  pytest-asyncio,
+  pytestCheckHook,
   webtest,
-  testers,
+
+  # passthru
   devpi-server,
+  gitUpdater,
   nixosTests,
+  testers,
 }:
 
-buildPythonApplication (finalAttrs: {
+buildPythonPackage (finalAttrs: {
   pname = "devpi-server";
   version = "6.19.1";
   pyproject = true;
@@ -43,11 +51,15 @@ buildPythonApplication (finalAttrs: {
     hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools_changelog_shortener",' ""
+  '';
+
   sourceRoot = "${finalAttrs.src.name}/server";
 
   build-system = [
     setuptools
-    setuptools-changelog-shortener
   ];
 
   dependencies = [
@@ -56,25 +68,25 @@ buildPythonApplication (finalAttrs: {
     defusedxml
     devpi-common
     execnet
+    httpx
     itsdangerous
     packaging
     passlib
     platformdirs
     pluggy
+    py
     pyramid
     repoze-lru
     setuptools
     strictyaml
     waitress
-    py
-    httpx
   ]
   ++ passlib.optional-dependencies.argon2;
 
   nativeCheckInputs = [
     beautifulsoup4
     nginx
-    py
+    packaging-legacy
     pytest-asyncio
     pytestCheckHook
     webtest
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7fc449cbfe4..63e6f33aafda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3822,8 +3822,6 @@ with pkgs;
     llvmPackages = crystal.llvmPackages;
   };
 
-  devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
-
   dprint-plugins = recurseIntoAttrs (callPackage ../by-name/dp/dprint/plugins { });
 
   reaction-plugins = reaction.passthru.plugins;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e707fbef7e0e..15ffa774fb72 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3856,6 +3856,8 @@ self: super: with self; {
 
   devpi-ldap = callPackage ../development/python-modules/devpi-ldap { };
 
+  devpi-server = callPackage ../development/python-modules/devpi-server { };
+
   devtools = callPackage ../development/python-modules/devtools { };
 
   dfdiskcache = callPackage ../development/python-modules/dfdiskcache { };