Unverified Commit 242c2b2f authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

poetry: 2.0.1 -> 2.1.1 (#387217)

parents 64734a97 596e44da

pkgs/by-name/po/poetry/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ let 
      # We keep the override around even when the versions match, as

      # it's likely to become relevant again after the next Poetry update.

      poetry-core = super.poetry-core.overridePythonAttrs (old: rec {

        version = "2.0.1";

        version = "2.1.1";

        src = fetchFromGitHub {

          owner = "python-poetry";

          repo = "poetry-core";

          tag = version;

          hash = "sha256-X3HFvnjbQ8An856QwSsWm5bmzs9KuscPE9LaVebNfgk=";

          hash = "sha256-DeDfDaP+jPrN6F/lv6shVOG6+4VdD1nL9mz1wJn55Sc=";

        };

      });

    }

pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix

+13 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  poetry,

  poetry-core,

  pytest-mock,
@@ -21,6 +22,18 @@ buildPythonPackage rec { 
    hash = "sha256-AP3/njzbLEi2s4pOUSLLLzqNprvxwLe9LSY7qh08EWc=";

  };



  patches = [

    # Remove after next release of poetry-plugin-export

    (fetchpatch {

      url = "https://github.com/python-poetry/poetry-plugin-export/commit/16637f194e86708913ec6e09064c713eb0715bb6.patch";

      includes = [

        "tests/test_exporter.py"

        "tests/markers.py"

      ];

      hash = "sha256-ncz9kqp18+yeRXlhmLEcWfO1bDavjohhmVw6DwTy1hA=";

    })

  ];



  build-system = [

    poetry-core

  ];

pkgs/by-name/po/poetry/unwrapped.nix

+11 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  pythonOlder,

  fetchFromGitHub,

  fetchpatch2,

  findpython,

  installShellFiles,

  build,

  cachecontrol,
@@ -14,6 +15,7 @@ 
  installer,

  keyring,

  packaging,

  pbs-installer,

  pkginfo,

  platformdirs,

  poetry-core,
@@ -36,7 +38,7 @@ 


buildPythonPackage rec {

  pname = "poetry";

  version = "2.0.1";

  version = "2.1.1";

  pyproject = true;



  disabled = pythonOlder "3.9";
@@ -45,14 +47,14 @@ buildPythonPackage rec { 
    owner = "python-poetry";

    repo = "poetry";

    tag = version;

    hash = "sha256-RpAoADxZmH9hQSEjufLBoKJsxIc74RnRxZB3RVNk/iE=";

    hash = "sha256-2u0idmnXY0FNvc8peDMWIFAeGH/xdIfMrMErUdxc0UA=";

  };



  patches = [

    # https://github.com/python-poetry/poetry/pull/9939

    (fetchpatch2 {

      url = "https://github.com/python-poetry/poetry/commit/89c0d02761229a8aa7ac5afcbc8935387bde4c5b.patch?full_index=1";

      hash = "sha256-YuAevkmCSTGuFPfuKrJfcLUye1YGpnHSb9TFSW7F1SU=";

      url = "https://github.com/python-poetry/poetry/commit/c2387ff3c878ab608d7616e4984fc01c4226416c.patch?full_index=1";

      hash = "sha256-cxTDbFykRr+kGk4jYzKwhU8QEZvK5A/P8zxliXpE+Sg=";

    })

  ];
@@ -77,9 +79,11 @@ buildPythonPackage rec { 
      cleo

      dulwich

      fastjsonschema

      findpython

      installer

      keyring

      packaging

      pbs-installer

      pkginfo

      platformdirs

      poetry-core
@@ -100,7 +104,9 @@ buildPythonPackage rec { 
    ++ lib.optionals (pythonOlder "3.10") [

      importlib-metadata

    ]

    ++ cachecontrol.optional-dependencies.filecache;

    ++ cachecontrol.optional-dependencies.filecache

    ++ pbs-installer.optional-dependencies.download

    ++ pbs-installer.optional-dependencies.install;



  postInstall = ''

    installShellCompletion --cmd poetry \