Unverified Commit b58121a5 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #302013 from slotThe/anki-24.04 

anki: 23.12.1 -> 24.04
parents 79641887 cd384cce

pkgs/development/python-modules/git-versioner/default.nix

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

, buildPythonPackage

, setuptools-scm

, fetchFromGitLab

}:



buildPythonPackage rec {

  pname = "git-versioner";

  version = "7.1";

  pyproject = true;



  src = fetchFromGitLab {

    owner = "alelec";

    repo = "__version__";

    rev = "v${version}";

    hash = "sha256-bnpuFJSd4nBXJA75V61kiB+nU5pUzdEAIScfKx7aaGU=";

  };



  nativeBuildInputs = [

    setuptools-scm

  ];



  pythonImportsCheck = [

    "__version__"

  ];



  meta = with lib; {

    description = "Manage current / next version for project";

    homepage = "https://gitlab.com/alelec/__version__";

    license = licenses.mit;

    maintainers = with maintainers; [ slotThe ];

  };



}

pkgs/development/python-modules/pip-system-certs/default.nix

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

, buildPythonPackage

, fetchPypi

, setuptools-scm

, wheel

, git-versioner

, wrapt

}:



buildPythonPackage rec {

  pname = "pip-system-certs";

  version = "4.0";

  pyproject = true;



  src = fetchPypi {

    inherit version;

    pname = "pip_system_certs";

    hash = "sha256-245qMTiNl5XskTmVffGon6UnT7ZhZEVv0JGl0+lMNQw=";

  };



  nativeBuildInputs = [

    setuptools-scm

    wheel

    git-versioner

  ];



  propagatedBuildInputs = [

    wrapt

  ];



  pythonImportsCheck = [

    "pip_system_certs.wrapt_requests"

    "pip_system_certs.bootstrap"

  ];



  meta = with lib; {

    description = "Live patches pip and requests to use system certs by default";

    homepage = "https://gitlab.com/alelec/pip-system-certs";

    license = licenses.bsd2;

    maintainers = with maintainers; [ slotThe ];

  };



}

pkgs/development/python-modules/pip-tools/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ buildPythonPackage rec { 
    "test_compile_recursive_extras"

    "test_combine_different_extras_of_the_same_package"

    "test_diff_should_not_uninstall"

    "test_cli_compile_all_extras_with_multiple_packages"

    # Deprecations

    "test_error_in_pyproject_toml"

  ];



  pythonImportsCheck = [

pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch

+13 −12
Original line number Diff line number Diff line 
diff --color -ru a/piptools/scripts/compile.py b/piptools/scripts/compile.py

--- a/piptools/scripts/compile.py	2022-06-30 11:24:26.000000000 +0200

+++ b/piptools/scripts/compile.py	2022-08-01 13:40:58.392515765 +0200

@@ -6,7 +6,7 @@

 from typing import IO, Any, BinaryIO, List, Optional, Tuple, Union, cast

diff --git a/piptools/scripts/compile.py b/piptools/scripts/compile.py

index 195faa7..3e69437 100755

--- a/piptools/scripts/compile.py

+++ b/piptools/scripts/compile.py

@@ -9,7 +9,7 @@ from pathlib import Path

 from typing import IO, Any, BinaryIO, cast



 import click

-from build import BuildBackendException

+from build import BuildException

 from build.util import project_wheel_metadata

 from click.utils import LazyFile, safecall

 from pip._internal.commands import create_command

@@ -421,7 +421,7 @@

                 metadata = project_wheel_metadata(

                     os.path.dirname(os.path.abspath(src_file))

 from pip._internal.req import InstallRequirement

 from pip._internal.req.constructors import install_req_from_line

@@ -369,6 +369,6 @@ def cli(

                     isolated=build_isolation,

                     quiet=log.verbosity <= 0,

                 )

-            except BuildBackendException as e:

+            except (BuildException, StopIteration) as e:

pkgs/games/anki/Cargo.lock

+792 −650

File changed.

Preview size limit exceeded, changes collapsed.