Unverified Commit 015bcd8e authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #281328 from TomaSajt/pdm 

pdm: 2.10.4 -> 2.12.1, fix build
parents 1e0387d3 7ecfd267

pkgs/development/python-modules/dep-logic/default.nix

0 → 100644
+47 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, pythonOlder

, fetchFromGitHub

, pdm-backend

, packaging

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "dep-logic";

  version = "0.0.4";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "pdm-project";

    repo = "dep-logic";

    rev = version;

    hash = "sha256-AFiCNzHlo3BADqbjRBruA80cfM6Ytdb+gReEg5hUmro=";

  };



  nativeBuildInputs = [

    pdm-backend

  ];



  propagatedBuildInputs = [

    packaging

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [

    "dep_logic"

  ];



  meta = {

    changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${src.rev}";

    description = "Python dependency specifications supporting logical operations";

    homepage = "https://github.com/pdm-project/dep-logic";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ tomasajt ];

  };

}

pkgs/tools/package-management/pdm/default.nix

+9 −4
Original line number Diff line number Diff line
@@ -32,13 +32,14 @@ in 
with python.pkgs;

buildPythonApplication rec {

  pname = "pdm";

  version = "2.10.4";

  format = "pyproject";

  disabled = pythonOlder "3.7";

  version = "2.12.1";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-bf2dTLWQQ+3sstC0fSCOVdidMzunGX3rBcyi37x6S/s=";

    hash = "sha256-OaKroZmGyUWnm/WEw3dSheJOnH+O2KYDgVthxfrF20w=";

  };



  nativeBuildInputs = [
@@ -49,6 +50,7 @@ buildPythonApplication rec { 
    blinker

    certifi

    cachecontrol

    dep-logic

    findpython

    installer

    packaging
@@ -69,6 +71,9 @@ buildPythonApplication rec { 
  ]

  ++ lib.optionals (pythonOlder "3.10") [

    importlib-metadata

  ]

  ++ lib.optionals (pythonAtLeast "3.10") [

    truststore

  ];



  nativeCheckInputs = [

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -2806,6 +2806,8 @@ self: super: with self; { 














  denonavr = callPackage ../development/python-modules/denonavr { };



























  dep-logic = callPackage ../development/python-modules/dep-logic { };



























  dependency-injector = callPackage ../development/python-modules/dependency-injector { };





























  deploykit = callPackage ../development/python-modules/deploykit { };