Commit 42977ec8 authored by Sarah Clark's avatar Sarah Clark
Browse files

devpi-server: extract underlying python library

parent e6fb1ec7

pkgs/development/tools/devpi-server/default.nix→pkgs/development/python-modules/devpi-server/default.nix

+27 −15
Original line number Diff line number Diff line 
{

  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

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 { };