Unverified Commit de451eac authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.devpi-{server,ldap,common,client}: fixes (#494912)

parents 4e521f6f 262e67f9

pkgs/by-name/de/devpi-client/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { 
  ++ (with python3.pkgs; [

    mercurial

    mock

    packaging-legacy

    pypitoken

    pytestCheckHook

    sphinx

pkgs/by-name/de/devpi-server/package.nix

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{ python3Packages }:



with python3Packages;

toPythonApplication devpi-server

pkgs/development/python-modules/devpi-common/default.nix

+18 −10
Original line number Diff line number Diff line
@@ -2,14 +2,18 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,



  # build-system

  setuptools,



  # dependencies

  lazy,

  packaging-legacy,

  pytestCheckHook,

  requests,

  setuptools-changelog-shortener,

  setuptools,

  tomli,

  nix-update-script,



  # tests

  packaging-legacy,

  pytestCheckHook,

}:



buildPythonPackage (finalAttrs: {
@@ -24,26 +28,30 @@ buildPythonPackage (finalAttrs: { 
    hash = "sha256-YFY2iLnORzFxnfGYU2kCpJL8CZi+lALIkL1bRpfd4NE=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail '"setuptools_changelog_shortener",' ""

  '';



  sourceRoot = "${finalAttrs.src.name}/common";



  build-system = [

    setuptools

    setuptools-changelog-shortener

  ];



  dependencies = [

    lazy

    packaging-legacy

    requests

    tomli

  ];



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    pytestCheckHook

    packaging-legacy

  ];



  pythonImportsCheck = [ "devpi_common" ];



  passthru.updateScript = nix-update-script { };



  meta = {

    homepage = "https://github.com/devpi/devpi";

    description = "Utilities jointly used by devpi-server and devpi-client";

pkgs/development/python-modules/devpi-ldap/default.nix

+21 −14
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  devpi-server,

  fetchFromGitHub,



  # build-system

  setuptools,



  # dependencies

  devpi-server,

  ldap3,

  mock,

  pyyaml,



  # tests

  packaging-legacy,

  pytest-cov-stub,

  pytest-mock,

  pytestCheckHook,

  pythonOlder,

  pythonAtLeast,

  pyyaml,

  setuptools,

  setuptools-changelog-shortener,

  webtest,

}:
@@ -20,9 +24,6 @@ buildPythonPackage (finalAttrs: { 
  version = "2.1.1-unstable-2026-01-22";

  pyproject = true;



  # build-system broken for 3.14, package incompatible <3.13

  disabled = pythonOlder "3.13" || pythonAtLeast "3.14";



  src = fetchFromGitHub {

    owner = "devpi";

    repo = "devpi-ldap";
@@ -30,27 +31,33 @@ buildPythonPackage (finalAttrs: { 
    hash = "sha256-2LpreWmG6WMRrc5L7ylSej5Ce6VhfNDAW2eoJ76D49o=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail '"setuptools_changelog_shortener",' ""

  '';



  build-system = [

    setuptools

    setuptools-changelog-shortener

  ];



  dependencies = [

    devpi-server

    pyyaml

    ldap3

    pyyaml

  ];



  nativeCheckInputs = [

    devpi-server

    mock

    packaging-legacy

    pytest-cov-stub

    pytest-mock

    pytestCheckHook

    webtest

  ];



  pythonImportsCheck = [ "devpi_ldap" ];



  passthru.skipBulkUpdate = true; # avoid reversion to previous stable version



  meta = {

    description = "LDAP authentication for devpi-server";

    homepage = "https://github.com/devpi/devpi-ldap";

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