From 6a66c374794c1e2f793313bce86a7513c8c26781 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Mar 2023 08:42:12 +0000 Subject: [PATCH 1/4] liferea: 1.14.1 -> 1.14.2 (cherry picked from commit e7eef75c5e2d9d8f7a711f1a43c6873d00d0c742) --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 8a4323acf010..7a3802a59680 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw="; + sha256 = "aXgw3MwleHDw2yNbs5Cin687xVTLxeNwBt94c1b4fXQ="; }; nativeBuildInputs = [ From 48e91a25e2521633b9286a1a243f8e0de6f79572 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Mar 2023 14:00:24 +1300 Subject: [PATCH 2/4] poetry2nix: 1.39.1 -> 1.40.1 (cherry picked from commit 096cb0ea379786b8f0e1ba06ed4285f4b5503545) --- .../tools/poetry2nix/poetry2nix/default.nix | 50 +- .../poetry2nix/fetch_from_legacy.py | 6 + .../poetry2nix/poetry2nix/hooks/default.nix | 65 +- .../hooks/python-requires-patch-hook.py | 79 ++ .../hooks/python-requires-patch-hook.sh | 7 + .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 24 +- .../poetry2nix/overrides/build-systems.json | 1162 ++++++++++++++++- .../poetry2nix/overrides/default.nix | 375 ++++-- .../tools/poetry2nix/poetry2nix/pep425.nix | 17 +- 9 files changed, 1605 insertions(+), 180 deletions(-) create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 87a928000c1a..3a410b12d8eb 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.39.1"; + version = "1.40.1"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; @@ -28,6 +28,7 @@ let , includeBuildSystem ? true , groups ? [ ] , checkGroups ? [ "dev" ] + , extras ? [ "*" ] # * means all extras, otherwise include the dependencies for a given extra }: let getInputs = attr: attrs.${attr} or [ ]; @@ -59,12 +60,26 @@ let mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + rawDeps = pyProject.tool.poetry."dependencies" or { }; + + rawRequiredDeps = lib.filterAttrs (_: v: !(v.optional or false)) rawDeps; + + desiredExtrasDeps = lib.unique + (lib.concatMap (extra: pyProject.tool.poetry.extras.${extra}) extras); + + allRawDeps = + if extras == [ "*" ] then + rawDeps + else + rawRequiredDeps // lib.getAttrs desiredExtrasDeps rawDeps; + checkInputs' = getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # =poetry-1.2.0 dependency groups + ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups); in { buildInputs = mkInput "buildInputs" (if includeBuildSystem then buildSystemPkgs else [ ]); propagatedBuildInputs = mkInput "propagatedBuildInputs" ( - (getDeps pyProject.tool.poetry."dependencies" or { }) - ++ ( + getDeps allRawDeps ++ ( # >=poetry-1.2.0 dependency groups if pyProject.tool.poetry.group or { } != { } then lib.flatten (map (g: getDeps pyProject.tool.poetry.group.${g}.dependencies) groups) @@ -72,11 +87,8 @@ let ) ); nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" ( - getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # =poetry-1.2.0 dependency groups - ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups) - ); + checkInputs = mkInput "checkInputs" checkInputs'; + nativeCheckInputs = mkInput "nativeCheckInputs" checkInputs'; }; @@ -125,6 +137,7 @@ lib.makeScope pkgs.newScope (self: { { projectDir ? null , pyproject ? projectDir + "/pyproject.toml" , poetrylock ? projectDir + "/poetry.lock" + , poetrylockPos ? { file = toString poetrylock; line = 0; column = 0; } , overrides ? self.defaultPoetryOverrides , python ? pkgs.python3 , pwd ? projectDir @@ -134,6 +147,7 @@ lib.makeScope pkgs.newScope (self: { , pyProject ? readTOML pyproject , groups ? [ ] , checkGroups ? [ "dev" ] + , extras ? [ "*" ] }: let /* The default list of poetry2nix override overlays */ @@ -143,7 +157,7 @@ lib.makeScope pkgs.newScope (self: { }; getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - poetryPkg = poetry.override { inherit python; }; + poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; }; scripts = pyProject.tool.poetry.scripts or { }; hasScripts = scripts != { }; @@ -194,6 +208,7 @@ lib.makeScope pkgs.newScope (self: { value = self.mkPoetryDep ( pkgMeta // { inherit pwd preferWheels; + pos = poetrylockPos; source = pkgMeta.source or null; # Default to files from lock file version 2.0 and fall back to 1.1 files = pkgMeta.files or lockFiles.${normalizedName}; @@ -222,6 +237,11 @@ lib.makeScope pkgs.newScope (self: { ( [ # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). + (self: super: { + # Upstream nixpkgs uses non canonical names + async-generator = super.async-generator or super.async_generator or null; + }) + (self: super: lib.attrsets.mapAttrs ( name: value: @@ -269,7 +289,7 @@ lib.makeScope pkgs.newScope (self: { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; py = python.override { inherit packageOverrides; self = py; }; - inputAttrs = mkInputAttrs { inherit py pyProject groups checkGroups; attrs = { }; includeBuildSystem = false; }; + inputAttrs = mkInputAttrs { inherit py pyProject groups checkGroups extras; attrs = { }; includeBuildSystem = false; }; requiredPythonModules = python.pkgs.requiredPythonModules; /* Include all the nested dependencies which are required for each package. @@ -305,6 +325,7 @@ lib.makeScope pkgs.newScope (self: { , editablePackageSources ? { } , extraPackages ? ps: [ ] , groups ? [ "dev" ] + , extras ? [ "*" ] }: let inherit (lib) hasAttr; @@ -337,7 +358,7 @@ lib.makeScope pkgs.newScope (self: { excludedEditablePackageNames; poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels pyProject groups; + inherit pyproject poetrylock overrides python pwd preferWheels pyProject groups extras; editablePackageSources = editablePackageSources'; }; @@ -372,11 +393,12 @@ lib.makeScope pkgs.newScope (self: { , preferWheels ? false , groups ? [ ] , checkGroups ? [ "dev" ] + , extras ? [ "*" ] , ... }@attrs: let poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels groups checkGroups; + inherit pyproject poetrylock overrides python pwd preferWheels groups checkGroups extras; }; py = poetryPython.python; @@ -393,7 +415,7 @@ lib.makeScope pkgs.newScope (self: { ]; passedAttrs = builtins.removeAttrs attrs specialAttrs; - inputAttrs = mkInputAttrs { inherit py pyProject attrs groups checkGroups; }; + inputAttrs = mkInputAttrs { inherit py pyProject attrs groups checkGroups extras; }; app = py.pkgs.buildPythonPackage ( passedAttrs // inputAttrs // { @@ -502,8 +524,8 @@ lib.makeScope pkgs.newScope (self: { combining it with poetry2nix default overrides */ withDefaults = overlay: [ - self.defaultPoetryOverrides overlay + self.defaultPoetryOverrides ]; }; }) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py index fee7374d3405..c128710cde45 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py @@ -60,6 +60,12 @@ context = ssl.create_default_context() context.check_hostname = False context.verify_mode = ssl.CERT_NONE +# Extract out username/password from index_url, if present. +parsed_url = urlparse(index_url) +username = parsed_url.username or username +password = parsed_url.password or password +index_url = parsed_url._replace(netloc=parsed_url.netloc.rpartition("@")[-1]).geturl() + req = urllib.request.Request(index_url) if username and password: import base64 diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index a503ea594fb4..40dd371b59f0 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -1,12 +1,14 @@ { python +, stdenv , buildPackages , makeSetupHook , wheel , pip , pkgs +, lib }: let - callPackage = python.pythonForBuild.pkgs.callPackage; + inherit (python.pythonForBuild.pkgs) callPackage; pythonInterpreter = python.pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; @@ -14,23 +16,27 @@ let makeRemoveSpecialDependenciesHook = { fields, kind }: nonOverlayedPython.pkgs.callPackage ( - {}: + _: makeSetupHook { name = "remove-path-dependencies.sh"; - deps = [ ]; substitutions = { # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion # because building of tomlkit and its dependencies also use these hooks. pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ]; pythonInterpreter = nonOverlayedPython.interpreter; pyprojectPatchScript = "${./pyproject-without-special-deps.py}"; - fields = fields; - kind = kind; + inherit fields; + inherit kind; }; } ./remove-special-dependencies.sh ) { }; + makeSetupHookArgs = deps: + if lib.elem "propagatedBuildInputs" (builtins.attrNames (builtins.functionArgs makeSetupHook)) then + { propagatedBuildInputs = deps; } + else + { inherit deps; }; in { removePathDependenciesHook = makeRemoveSpecialDependenciesHook { @@ -48,23 +54,21 @@ in ( { pip, wheel }: makeSetupHook - { + ({ name = "pip-build-hook.sh"; - deps = [ pip wheel ]; substitutions = { inherit pythonInterpreter pythonSitePackages; }; - } ./pip-build-hook.sh + } // (makeSetupHookArgs [ pip wheel ])) ./pip-build-hook.sh ) { }; poetry2nixFixupHook = callPackage ( - {}: + _: makeSetupHook { name = "fixup-hook.sh"; - deps = [ ]; substitutions = { inherit pythonSitePackages; filenames = builtins.concatStringsSep " " [ @@ -77,14 +81,51 @@ in ) { }; + # As of 2023-03 a newer version of packaging introduced a new behaviour where python-requires + # cannot contain version wildcards. This behaviour is complaint with PEP440 + # + # The wildcards are a no-op anyway so we can work around this issue by just dropping the precision down to the last known number. + poetry2nixPythonRequiresPatchHook = callPackage + ( + _: + let + # Python pre 3.9 does not contain the ast.unparse method. + # We can extract this from Python 3.8 for any + unparser = stdenv.mkDerivation { + name = "${python.name}-astunparse"; + inherit (python) src; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/poetry2nix_astunparse + cp ./Tools/parser/unparse.py $out/poetry2nix_astunparse/__init__.py + ''; + }; + + pythonPath = + [ ] + ++ lib.optional (lib.versionOlder python.version "3.9") unparser; + + in + makeSetupHook + { + name = "require-python-patch-hook.sh"; + substitutions = { + inherit pythonInterpreter pythonPath; + patchScript = ./python-requires-patch-hook.py; + }; + } ./python-requires-patch-hook.sh + ) + { }; + # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion # It doesn't _really_ depend on wheel though, it just copies the wheel. wheelUnpackHook = callPackage - ({}: + (_: makeSetupHook { name = "wheel-unpack-hook.sh"; - deps = [ ]; } ./wheel-unpack-hook.sh ) { }; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py new file mode 100644 index 000000000000..bf3a8d1bd3ad --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py @@ -0,0 +1,79 @@ +#!/usr/bin/env python +import ast +import sys +import io + + +# Python2 compat +if sys.version_info[0] < 3: + FileNotFoundError = IOError + + +# Python <= 3.8 compat +def astunparse(tree): + # Use bundled unparse by default + if hasattr(ast, "unparse"): + return ast.unparse(tree) + + # Use example tool from Python sources for older interpreter versions + from poetry2nix_astunparse import Unparser + + buf = io.StringIO() + up = Unparser(tree, buf) + + return buf.getvalue() + + +class Rewriter(ast.NodeVisitor): + def __init__(self, *args, **kwargs): + super(Rewriter, self).__init__(*args, **kwargs) + self.modified = False + + def visit_Call(self, node): + function_name = "" + + if isinstance(node.func, ast.Name): + function_name = node.func.id + elif isinstance(node.func, ast.Attribute): + function_name = node.func.attr + else: + return + + if function_name != "setup": + return + + for kw in node.keywords: + if kw.arg != "python_requires": + continue + + value = kw.value + if not isinstance(value, ast.Constant): + return + + # Rewrite version constraints without wildcard characters. + # + # Only rewrite the file if the modified value actually differs, as we lose whitespace and comments when rewriting + # with the AST module. + python_requires = ", ".join( + [v.strip().rstrip(".*") for v in value.value.split(",")] + ) + if value.value != python_requires: + value.value = python_requires + self.modified = True + + +if __name__ == "__main__": + sys.path.extend(sys.argv[1:]) + + try: + with open("setup.py") as f: + tree = ast.parse(f.read()) + except FileNotFoundError: + exit(0) + + r = Rewriter() + r.visit(tree) + + if r.modified: + with open("setup.py", "w") as f: + f.write(astunparse(tree)) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh new file mode 100644 index 000000000000..57a718fe453f --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh @@ -0,0 +1,7 @@ +poetry2nix-python-requires-patch-hook() { + if [ -z "${dontFixupPythonRequires-}" ]; then + @pythonInterpreter@ @patchScript@ @pythonPath@ + fi +} + +postPatchHooks+=(poetry2nix-python-requires-patch-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 0541ef525f96..a0291ad0b488 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -7,6 +7,7 @@ }: { name , version +, pos ? __curPos , files , source , dependencies ? { } @@ -45,6 +46,7 @@ pythonPackages.callPackage isSource = source != null; isGit = isSource && source.type == "git"; isUrl = isSource && source.type == "url"; + isWheelUrl = isSource && source.type == "url" && lib.strings.hasSuffix ".whl" source.url; isDirectory = isSource && source.type == "directory"; isFile = isSource && source.type == "file"; isLegacy = isSource && source.type == "legacy"; @@ -61,6 +63,8 @@ pythonPackages.callPackage inherit pythonPackages pyProject; } else [ ]; + pname = normalizePackageName name; + preferWheel' = preferWheel && pname != "wheel"; fileInfo = let isBdist = f: lib.strings.hasSuffix "whl" f.file; @@ -69,7 +73,9 @@ pythonPackages.callPackage binaryDist = selectWheel fileCandidates; sourceDist = builtins.filter isSdist fileCandidates; eggs = builtins.filter isEgg fileCandidates; - entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; + # the `wheel` package cannot be built from a wheel, since that requires the wheel package + # this causes a circular dependency so we special-case ignore its `preferWheel` attribute value + entries = (if preferWheel' then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; lockFileEntry = ( if lib.length entries > 0 then builtins.head entries else throw "Missing suitable source/wheel file entry for ${name}" @@ -89,13 +95,12 @@ pythonPackages.callPackage else (builtins.elemAt (lib.strings.splitString "-" name) 2); }; - format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; + format = if isWheelUrl then "wheel" else if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; hooks = python.pkgs.callPackage ./hooks { }; in buildPythonPackage { - pname = normalizePackageName name; - version = version; + inherit pname version; # Circumvent output separation (https://github.com/NixOS/nixpkgs/pull/190487) format = if format == "pyproject" then "poetry2nix" else format; @@ -108,6 +113,7 @@ pythonPackages.callPackage nativeBuildInputs = [ hooks.poetry2nixFixupHook ] + ++ lib.optional (!pythonPackages.isPy27) hooks.poetry2nixPythonRequiresPatchHook ++ lib.optional (isLocked && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook ++ lib.optionals (format == "wheel") [ hooks.wheelUnpackHook @@ -147,6 +153,8 @@ pythonPackages.callPackage in builtins.map (n: pythonPackages.${normalizePackageName n}) depAttrs; + inherit pos; + meta = { broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; license = [ ]; @@ -155,6 +163,7 @@ pythonPackages.callPackage passthru = { inherit args; + preferWheel = preferWheel'; }; # We need to retrieve kind from the interpreter and the filename of the package @@ -174,10 +183,17 @@ pythonPackages.callPackage } )) ) + else if isWheelUrl then + builtins.fetchurl + { + inherit (source) url; + sha256 = fileInfo.hash; + } else if isUrl then builtins.fetchTarball { inherit (source) url; + sha256 = fileInfo.hash; } else if isDirectory then (poetryLib.cleanPythonSources { src = localDepPath; }) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index dc5c5c5b50d9..82908ddaf332 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -28,8 +28,13 @@ "setuptools-scm" ], "acoustics": [ + "flit-core", "setuptools" ], + "acquire": [ + "setuptools", + "setuptools-scm" + ], "actdiag": [ "setuptools" ], @@ -116,7 +121,14 @@ "setuptools-scm" ], "affine": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "2.4.0" + }, + { + "buildSystem": "flit-core", + "from": "2.4.0" + } ], "afsapi": [ "setuptools", @@ -229,6 +241,9 @@ "aiocron": [ "setuptools" ], + "aiocsv": [ + "cython" + ], "aiocurrencylayer": [ "poetry-core", "setuptools" @@ -240,7 +255,7 @@ "setuptools" ], "aioeafm": [ - "poetry", + "poetry-core", "setuptools" ], "aioeagle": [ @@ -352,6 +367,9 @@ "aiolifx-effects": [ "setuptools" ], + "aiolifx-themes": [ + "poetry-core" + ], "aiolimiter": [ "poetry-core", "setuptools" @@ -533,6 +551,9 @@ "aiowebostv": [ "setuptools" ], + "aioweenect": [ + "poetry-core" + ], "aiowinreg": [ "setuptools" ], @@ -570,6 +591,9 @@ "alarmdecoder": [ "setuptools" ], + "ale-py": [ + "setuptools" + ], "alectryon": [ "setuptools" ], @@ -619,6 +643,9 @@ "setuptools", "setuptools-scm" ], + "alog": [ + "setuptools" + ], "alpha-vantage": [ "setuptools" ], @@ -713,6 +740,9 @@ "ansible": [ "setuptools" ], + "ansible-base": [ + "setuptools" + ], "ansible-compat": [ "setuptools", "setuptools-scm" @@ -767,7 +797,14 @@ "setuptools" ], "anyascii": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.1.7" + }, + { + "buildSystem": "flit-core", + "from": "0.1.7" + } ], "anybadge": [ "setuptools" @@ -1053,6 +1090,9 @@ "async-lru": [ "setuptools" ], + "async-modbus": [ + "setuptools" + ], "async-stagger": [ "setuptools" ], @@ -1073,7 +1113,8 @@ "setuptools" ], "asyncio-mqtt": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "asyncio-nats-client": [ "setuptools" @@ -1277,24 +1318,183 @@ "aws-cdk-asset-node-proxy-agent-v5": [ "setuptools" ], + "aws-cdk-assets": [ + "setuptools" + ], + "aws-cdk-aws-apigateway": [ + "setuptools" + ], + "aws-cdk-aws-applicationautoscaling": [ + "setuptools" + ], + "aws-cdk-aws-autoscaling": [ + "setuptools" + ], + "aws-cdk-aws-autoscaling-common": [ + "setuptools" + ], + "aws-cdk-aws-autoscaling-hooktargets": [ + "setuptools" + ], "aws-cdk-aws-batch-alpha": [ "setuptools" ], + "aws-cdk-aws-certificatemanager": [ + "setuptools" + ], + "aws-cdk-aws-cloudformation": [ + "setuptools" + ], + "aws-cdk-aws-cloudfront": [ + "setuptools" + ], + "aws-cdk-aws-cloudwatch": [ + "setuptools" + ], + "aws-cdk-aws-codebuild": [ + "setuptools" + ], + "aws-cdk-aws-codecommit": [ + "setuptools" + ], + "aws-cdk-aws-codeguruprofiler": [ + "setuptools" + ], + "aws-cdk-aws-codepipeline": [ + "setuptools" + ], + "aws-cdk-aws-codestarnotifications": [ + "setuptools" + ], + "aws-cdk-aws-cognito": [ + "setuptools" + ], + "aws-cdk-aws-ec2": [ + "setuptools" + ], + "aws-cdk-aws-ecr": [ + "setuptools" + ], + "aws-cdk-aws-ecr-assets": [ + "setuptools" + ], + "aws-cdk-aws-ecs": [ + "setuptools" + ], + "aws-cdk-aws-efs": [ + "setuptools" + ], + "aws-cdk-aws-elasticloadbalancing": [ + "setuptools" + ], + "aws-cdk-aws-elasticloadbalancingv2": [ + "setuptools" + ], + "aws-cdk-aws-events": [ + "setuptools" + ], + "aws-cdk-aws-events-targets": [ + "setuptools" + ], + "aws-cdk-aws-globalaccelerator": [ + "setuptools" + ], + "aws-cdk-aws-iam": [ + "setuptools" + ], + "aws-cdk-aws-kinesis": [ + "setuptools" + ], + "aws-cdk-aws-kinesisfirehose": [ + "setuptools" + ], + "aws-cdk-aws-kms": [ + "setuptools" + ], + "aws-cdk-aws-lambda": [ + "setuptools" + ], "aws-cdk-aws-lambda-python-alpha": [ "setuptools" ], + "aws-cdk-aws-logs": [ + "setuptools" + ], + "aws-cdk-aws-route53": [ + "setuptools" + ], + "aws-cdk-aws-route53-targets": [ + "setuptools" + ], + "aws-cdk-aws-s3": [ + "setuptools" + ], + "aws-cdk-aws-s3-assets": [ + "setuptools" + ], + "aws-cdk-aws-sam": [ + "setuptools" + ], + "aws-cdk-aws-secretsmanager": [ + "setuptools" + ], + "aws-cdk-aws-servicediscovery": [ + "setuptools" + ], + "aws-cdk-aws-signer": [ + "setuptools" + ], + "aws-cdk-aws-sns": [ + "setuptools" + ], + "aws-cdk-aws-sns-subscriptions": [ + "setuptools" + ], + "aws-cdk-aws-sqs": [ + "setuptools" + ], + "aws-cdk-aws-ssm": [ + "setuptools" + ], + "aws-cdk-aws-stepfunctions": [ + "setuptools" + ], + "aws-cdk-cloud-assembly-schema": [ + "setuptools" + ], + "aws-cdk-core": [ + "setuptools" + ], + "aws-cdk-custom-resources": [ + "setuptools" + ], + "aws-cdk-cx-api": [ + "setuptools" + ], "aws-cdk-lib": [ "setuptools" ], + "aws-cdk-region-info": [ + "setuptools" + ], "aws-error-utils": [ "poetry" ], "aws-lambda-builders": [ "setuptools" ], + "aws-lambda-context": [ + "setuptools" + ], "aws-sam-translator": [ "setuptools" ], + "aws-sso-lib": [ + "poetry" + ], + "aws-sso-util": [ + "poetry" + ], "aws-xray-sdk": [ "setuptools" ], @@ -1700,7 +1900,6 @@ "setuptools" ], "backoff": [ - "poetry", "poetry-core", "setuptools" ], @@ -1814,6 +2013,12 @@ "bbox": [ "setuptools" ], + "bc-detect-secrets": [ + "setuptools" + ], + "bc-jsonpath-ng": [ + "setuptools" + ], "bc-python-hcl2": [ "setuptools" ], @@ -1854,6 +2059,9 @@ "bellows": [ "setuptools" ], + "bencode-py": [ + "setuptools" + ], "beniget": [ "setuptools" ], @@ -2086,6 +2294,9 @@ "boltons": [ "setuptools" ], + "boltz-client": [ + "poetry" + ], "boltztrap2": [ "cython", "setuptools" @@ -2193,6 +2404,12 @@ "browser-cookie3": [ "setuptools" ], + "brunns-matchers": [ + "setuptools" + ], + "brunns-row": [ + "setuptools" + ], "brunt": [ "setuptools" ], @@ -2289,12 +2506,18 @@ "buildcatrust": [ "setuptools" ], + "builddsl": [ + "poetry" + ], "bumps": [ "setuptools" ], "bunch": [ "setuptools" ], + "bundlewrap": [ + "setuptools" + ], "bwapy": [ "setuptools" ], @@ -2387,6 +2610,12 @@ "case": [ "setuptools" ], + "casefy": [ + "hatchling" + ], + "cashu": [ + "poetry" + ], "cassandra-driver": [ "cython", "setuptools" @@ -2703,7 +2932,14 @@ "setuptools" ], "click-didyoumean": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.2.0" + }, + { + "buildSystem": "poetry", + "from": "0.2.0" + } ], "click-help-colors": [ "setuptools" @@ -2711,6 +2947,12 @@ "click-log": [ "setuptools" ], + "click-odoo": [ + "setuptools-scm" + ], + "click-odoo-contrib": [ + "setuptools" + ], "click-option-group": [ "setuptools" ], @@ -2762,7 +3004,8 @@ "setuptools" ], "clize": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "clldutils": [ "setuptools" @@ -2771,7 +3014,6 @@ "setuptools" ], "cloudflare-dyndns": [ - "poetry", "poetry-core", "setuptools" ], @@ -2876,6 +3118,7 @@ "setuptools" ], "colander": [ + "babel", "setuptools" ], "colanderalchemy": [ @@ -2885,6 +3128,9 @@ "poetry-core", "setuptools" ], + "color-operations": [ + "setuptools" + ], "colorama": [ { "buildSystem": "hatchling", @@ -3025,12 +3271,18 @@ "construct": [ "setuptools" ], + "construct-classes": [ + "poetry-core" + ], "constructs": [ "setuptools" ], "consul": [ "setuptools" ], + "consulate": [ + "setuptools" + ], "container-inspector": [ "setuptools", "setuptools-scm" @@ -3061,7 +3313,8 @@ "setuptools" ], "copier": [ - "poetry-core" + "poetry-core", + "poetry-dynamic-versioning" ], "coqpit": [ "setuptools" @@ -3229,6 +3482,10 @@ "cufflinks": [ "setuptools" ], + "cupy": [ + "cython", + "setuptools" + ], "curio": [ "setuptools" ], @@ -3367,6 +3624,15 @@ "databases": [ "setuptools" ], + "databind": [ + "poetry" + ], + "databind-core": [ + "poetry" + ], + "databind-json": [ + "poetry" + ], "databricks-cli": [ "setuptools" ], @@ -3398,6 +3664,9 @@ "datapoint": [ "setuptools" ], + "datargs": [ + "poetry" + ], "dataset": [ "setuptools" ], @@ -3576,6 +3845,9 @@ "deluge-client": [ "setuptools" ], + "demetriek": [ + "poetry-core" + ], "demjson3": [ "setuptools" ], @@ -3588,6 +3860,9 @@ "dependency-injector": [ "setuptools" ], + "deploykit": [ + "setuptools" + ], "deprecated": [ "setuptools" ], @@ -3698,6 +3973,94 @@ "diskcache": [ "setuptools" ], + "dissect": [ + "setuptools", + "setuptools-scm" + ], + "dissect-cim": [ + "setuptools", + "setuptools-scm" + ], + "dissect-clfs": [ + "setuptools", + "setuptools-scm" + ], + "dissect-cstruct": [ + "setuptools", + "setuptools-scm" + ], + "dissect-esedb": [ + "setuptools", + "setuptools-scm" + ], + "dissect-etl": [ + "setuptools", + "setuptools-scm" + ], + "dissect-eventlog": [ + "setuptools", + "setuptools-scm" + ], + "dissect-evidence": [ + "setuptools", + "setuptools-scm" + ], + "dissect-extfs": [ + "setuptools", + "setuptools-scm" + ], + "dissect-fat": [ + "setuptools", + "setuptools-scm" + ], + "dissect-ffs": [ + "setuptools", + "setuptools-scm" + ], + "dissect-hypervisor": [ + "setuptools", + "setuptools-scm" + ], + "dissect-ntfs": [ + "setuptools", + "setuptools-scm" + ], + "dissect-ole": [ + "setuptools", + "setuptools-scm" + ], + "dissect-regf": [ + "setuptools", + "setuptools-scm" + ], + "dissect-shellitem": [ + "setuptools", + "setuptools-scm" + ], + "dissect-sql": [ + "setuptools", + "setuptools-scm" + ], + "dissect-target": [ + "setuptools", + "setuptools-scm" + ], + "dissect-util": [ + "setuptools", + "setuptools-scm" + ], + "dissect-vmfs": [ + "setuptools", + "setuptools-scm" + ], + "dissect-volume": [ + "setuptools", + "setuptools-scm" + ], + "dissect-xfs": [ + "setuptools", + "setuptools-scm" + ], "dissononce": [ "setuptools" ], @@ -3725,6 +4088,9 @@ "dj-email-url": [ "setuptools" ], + "dj-inmemorystorage": [ + "setuptools" + ], "dj-rest-auth": [ "setuptools" ], @@ -3756,6 +4122,9 @@ "setuptools", "setuptools-scm" ], + "django-cache-memoize": [ + "setuptools" + ], "django-cache-url": [ "setuptools" ], @@ -3802,6 +4171,9 @@ "django-countries": [ "setuptools" ], + "django-coverage-plugin": [ + "setuptools" + ], "django-crispy-forms": [ "setuptools" ], @@ -3812,7 +4184,14 @@ "setuptools" ], "django-debug-toolbar": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "3.8.0" + }, + { + "buildSystem": "hatchling", + "from": "3.8.0" + } ], "django-discover-runner": [ "setuptools" @@ -3913,6 +4292,9 @@ "django-paintstore": [ "setuptools" ], + "django-permissionedforms": [ + "setuptools" + ], "django-pglocks": [ "setuptools" ], @@ -3947,9 +4329,15 @@ "django-rest-polymorphic": [ "setuptools" ], + "django-rest-swagger": [ + "setuptools" + ], "django-reversion": [ "setuptools" ], + "django-rosetta": [ + "setuptools" + ], "django-rq": [ "setuptools" ], @@ -4094,6 +4482,9 @@ "setuptools", "setuptools-scm" ], + "dnsq": [ + "setuptools" + ], "doc8": [ "pbr", "setuptools", @@ -4215,6 +4606,9 @@ "dpkt": [ "setuptools" ], + "draftjs-exporter": [ + "setuptools" + ], "dragonfly": [ "setuptools" ], @@ -4467,6 +4861,9 @@ "emailthreads": [ "setuptools" ], + "embit": [ + "setuptools" + ], "embrace": [ "setuptools" ], @@ -4674,7 +5071,6 @@ "flit-core", "flit-scm", "flitBuildHook", - "flit-scm", "setuptools" ], "exchangelib": [ @@ -4704,7 +5100,7 @@ "setuptools" ], "expecttest": [ - "poetry", + "poetry-core", "setuptools" ], "expiringdict": [ @@ -4800,14 +5196,20 @@ "hatchling", "setuptools" ], + "fastapi-csrf-protect": [ + "poetry-core" + ], "fastapi-mail": [ + "hatchling", "poetry-core", - "setuptools", - "hatchling" + "setuptools" ], "fastapi-restful": [ "poetry" ], + "fastapi-utils": [ + "poetry" + ], "fastavro": [ "cython", "setuptools" @@ -4860,6 +5262,7 @@ "setuptools" ], "fastrlock": [ + "cython", "setuptools" ], "fasttext": [ @@ -4921,12 +5324,26 @@ "setuptools" ], "filecheck": [ - "poetry", + "poetry-core", "setuptools" ], "filelock": [ - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools", + "until": "3.9.0" + }, + { + "buildSystem": "setuptools-scm", + "until": "3.9.0" + }, + { + "buildSystem": "hatchling", + "from": "3.9.0" + }, + { + "buildSystem": "hatch-vcs", + "from": "3.9.0" + } ], "filemagic": [ "setuptools" @@ -4957,7 +5374,14 @@ "setuptools" ], "fiona": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "1.9.0" + }, + { + "buildSystem": "cython", + "from": "1.9.0" + } ], "fipy": [ "setuptools" @@ -5017,12 +5441,27 @@ "flake8-length": [ "setuptools" ], + "flake8-noqa": [ + "setuptools" + ], + "flake8-plugin-utils": [ + "poetry" + ], "flake8-polyfill": [ "setuptools" ], "flake8-print": [ "poetry-core" ], + "flake8-pyprojecttoml": [ + "setuptools" + ], + "flake8-pytest-style": [ + "poetry-core" + ], + "flake8-simplify": [ + "setuptools" + ], "flaky": [ "setuptools" ], @@ -5032,6 +5471,9 @@ "flammkuchen": [ "setuptools" ], + "flanker": [ + "setuptools" + ], "flashtext": [ "setuptools" ], @@ -5111,6 +5553,10 @@ "flask-migrate": [ "setuptools" ], + "flask-minio": [ + "pytest-runner", + "setuptools" + ], "flask-mongoengine": [ "setuptools" ], @@ -5222,6 +5668,14 @@ "flit-core": [ "setuptools" ], + "flit-scm": [ + "flit-core", + "setuptools-scm" + ], + "flow-record": [ + "setuptools", + "setuptools-scm" + ], "flower": [ "setuptools" ], @@ -5419,6 +5873,10 @@ "futures": [ "setuptools" ], + "futurist": [ + "pbr", + "setuptools" + ], "fuzzyfinder": [ "setuptools" ], @@ -5682,7 +6140,18 @@ "setuptools" ], "gitlint-core": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.19" + }, + { + "buildSystem": "hatchling", + "from": "0.19" + }, + { + "buildSystem": "hatch-vcs", + "from": "0.19" + } ], "gitpython": [ "setuptools" @@ -5905,6 +6374,9 @@ "google-cloud-websecurityscanner": [ "setuptools" ], + "google-compute-engine": [ + "setuptools" + ], "google-crc32c": [ "setuptools" ], @@ -5983,6 +6455,9 @@ "gql": [ "setuptools" ], + "gqt": [ + "setuptools" + ], "gradient": [ "setuptools" ], @@ -6167,6 +6642,9 @@ "gyp": [ "setuptools" ], + "gypsum-dl": [ + "setuptools" + ], "h11": [ "setuptools" ], @@ -6217,6 +6695,9 @@ "halohome": [ "setuptools" ], + "hammett": [ + "setuptools" + ], "handout": [ "setuptools" ], @@ -6375,6 +6856,7 @@ "setuptools" ], "home-assistant-bluetooth": [ + "cython", "poetry-core", "setuptools" ], @@ -6527,8 +7009,22 @@ "setuptools" ], "humanize": [ - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools", + "until": "4.6.0" + }, + { + "buildSystem": "setuptools-scm", + "until": "4.6.0" + }, + { + "buildSystem": "hatchling", + "from": "4.6.0" + }, + { + "buildSystem": "hatch-vcs", + "from": "4.6.0" + } ], "humblewx": [ "setuptools" @@ -6541,7 +7037,14 @@ "setuptools" ], "hvac": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "1.0.0" + }, + { + "buildSystem": "poetry-core", + "from": "1.0.0" + } ], "hvplot": [ "setuptools" @@ -6586,7 +7089,7 @@ "setuptools" ], "hypothesis-auto": [ - "poetry", + "poetry-core", "setuptools" ], "hypothesis-graphql": [ @@ -6620,6 +7123,8 @@ "setuptools" ], "iaqualink": [ + "hatch-vcs", + "hatchling", "setuptools" ], "ibeacon-ble": [ @@ -6803,8 +7308,22 @@ "setuptools" ], "iniconfig": [ - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools", + "until": "2.0.0" + }, + { + "buildSystem": "setuptools-scm", + "until": "2.0.0" + }, + { + "buildSystem": "hatchling", + "from": "2.0.0" + }, + { + "buildSystem": "hatch-vcs", + "from": "2.0.0" + } ], "inifile": [ "setuptools" @@ -7129,7 +7648,7 @@ "setuptools" ], "jedi-language-server": [ - "poetry", + "poetry-core", "setuptools" ], "jeepney": [ @@ -7201,6 +7720,7 @@ "setuptools" ], "jq": [ + "cython", "setuptools" ], "js2py": [ @@ -7364,7 +7884,14 @@ "setuptools" ], "jupyter-console": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "6.6.0" + }, + { + "buildSystem": "hatchling", + "from": "6.6.0" + } ], "jupyter-core": [ { @@ -7376,6 +7903,9 @@ "until": "4.11.0" } ], + "jupyter-events": [ + "hatchling" + ], "jupyter-lsp": [ "setuptools" ], @@ -7396,16 +7926,28 @@ "from": "1.21.0" } ], + "jupyter-server-fileid": [ + "hatchling" + ], "jupyter-server-mathjax": [ "jupyter-packaging", "setuptools" ], + "jupyter-server-terminals": [ + "hatchling" + ], + "jupyter-server-ydoc": [ + "hatchling" + ], "jupyter-sphinx": [ "setuptools" ], "jupyter-telemetry": [ "setuptools" ], + "jupyter-ydoc": [ + "hatchling" + ], "jupyterhub": [ "setuptools" ], @@ -7630,12 +8172,18 @@ "korean-lunar-calendar": [ "setuptools" ], + "kraken-common": [ + "poetry" + ], "krakenex": [ "setuptools" ], "kubernetes": [ "setuptools" ], + "l18n": [ + "setuptools" + ], "labgrid": [ "setuptools", "setuptools-scm" @@ -7666,6 +8214,9 @@ "latexcodec": [ "setuptools" ], + "latexify-py": [ + "hatchling" + ], "launchpadlib": [ "setuptools" ], @@ -7865,6 +8416,12 @@ "lightning": [ "setuptools" ], + "lightning-cloud": [ + "setuptools" + ], + "lightning-utilities": [ + "setuptools" + ], "lightparam": [ "setuptools" ], @@ -7874,6 +8431,9 @@ "lightwave2": [ "setuptools" ], + "ligo-segments": [ + "setuptools" + ], "lima": [ "setuptools" ], @@ -7959,6 +8519,9 @@ "lmtpd": [ "setuptools" ], + "lnurl": [ + "setuptools" + ], "loca": [ "flitBuildHook", "setuptools" @@ -8159,9 +8722,30 @@ "managesieve": [ "setuptools" ], + "mangum": [ + "setuptools" + ], "manhole": [ "setuptools" ], + "manifestoo": [ + { + "buildSystem": "flit-core", + "until": "0.5" + }, + { + "buildSystem": "hatch-vcs", + "from": "0.5" + }, + { + "buildSystem": "hatchling", + "from": "0.5" + } + ], + "manifestoo-core": [ + "hatch-vcs", + "hatchling" + ], "manimpango": [ "cython", "setuptools" @@ -8288,6 +8872,9 @@ "mbddns": [ "setuptools" ], + "mbtest": [ + "setuptools" + ], "mccabe": [ "setuptools" ], @@ -8347,6 +8934,9 @@ "mediapy": [ "setuptools" ], + "meeko": [ + "setuptools" + ], "meilisearch": [ "setuptools" ], @@ -8410,6 +9000,7 @@ "setuptools" ], "metakernel": [ + "hatchling", "setuptools" ], "metar": [ @@ -8422,7 +9013,6 @@ "setuptools" ], "meteofrance-api": [ - "poetry", "poetry-core", "setuptools" ], @@ -8563,6 +9153,14 @@ "setuptools" ], "mkdocs-material": [ + { + "buildSystem": "hatchling", + "from": "8.5.3" + }, + { + "buildSystem": "hatch-nodejs-version", + "from": "8.5.3" + }, "setuptools" ], "mkdocs-material-extensions": [ @@ -8604,6 +9202,9 @@ "mlrose": [ "setuptools" ], + "mmcif-pdbx": [ + "setuptools" + ], "mmh3": [ "setuptools" ], @@ -8694,6 +9295,16 @@ "more-properties": [ "setuptools" ], + "morecantile": [ + { + "buildSystem": "setuptools", + "until": "3.2.0" + }, + { + "buildSystem": "flit-core", + "from": "3.2.0" + } + ], "morphys": [ "setuptools" ], @@ -8770,6 +9381,9 @@ "cython", "setuptools" ], + "msgpack-python": [ + "setuptools" + ], "msgpack-types": [ "poetry" ], @@ -8918,6 +9532,9 @@ "mypy-boto3-lambda": [ "setuptools" ], + "mypy-boto3-rds": [ + "setuptools" + ], "mypy-boto3-s3": [ "setuptools" ], @@ -8987,6 +9604,9 @@ "nampa": [ "setuptools" ], + "nanoid": [ + "setuptools" + ], "nanoleaf": [ "setuptools" ], @@ -9040,11 +9660,11 @@ "setuptools" ], "nbclient": [ - "setuptools", { "buildSystem": "hatchling", "from": "0.7.1" - } + }, + "setuptools" ], "nbconflux": [ "setuptools" @@ -9066,11 +9686,11 @@ "nbformat": [ { "buildSystem": "setuptools", - "until": "5.4.0" + "until": "5.5.0" }, { "buildSystem": "flit-core", - "from": "5.4.0", + "from": "5.5.0", "until": "5.6.0" }, { @@ -9199,6 +9819,9 @@ "cython", "setuptools" ], + "niaaml": [ + "poetry-core" + ], "niaarm": [ "poetry-core", "setuptools" @@ -9209,6 +9832,9 @@ "nibabel": [ "setuptools" ], + "nibe": [ + "setuptools" + ], "nicegui": [ "poetry-core" ], @@ -9328,7 +9954,6 @@ "setuptools" ], "notebook-shim": [ - "jupyter-packaging", { "buildSystem": "setuptools", "until": "0.2.0" @@ -9336,7 +9961,8 @@ { "buildSystem": "hatchling", "from": "0.2.0" - } + }, + "jupyter-packaging" ], "notedown": [ "setuptools" @@ -9371,12 +9997,24 @@ "poetry-core", "setuptools" ], + "nox": [ + "setuptools" + ], "nplusone": [ "setuptools" ], "npyscreen": [ "setuptools" ], + "nr-io-lexer": [ + "poetry" + ], + "nr-python-environment": [ + "poetry" + ], + "nr-util": [ + "poetry" + ], "nsapi": [ "setuptools" ], @@ -9579,7 +10217,11 @@ "openant": [ "setuptools" ], + "openapi-codec": [ + "setuptools" + ], "openapi-core": [ + "poetry-core", "setuptools" ], "openapi-python-client": [ @@ -9612,6 +10254,9 @@ "openidc-client": [ "setuptools" ], + "openmm": [ + "cython" + ], "openpaperwork-core": [ "setuptools" ], @@ -9665,6 +10310,26 @@ "from": "1.13.0" } ], + "opentelemetry-exporter-jaeger-proto-grpc": [ + { + "buildSystem": "setuptools", + "until": "1.13.0" + }, + { + "buildSystem": "hatchling", + "from": "1.13.0" + } + ], + "opentelemetry-exporter-jaeger-thrift": [ + { + "buildSystem": "setuptools", + "until": "1.13.0" + }, + { + "buildSystem": "hatchling", + "from": "1.13.0" + } + ], "opentelemetry-exporter-otlp-proto-http": [ { "buildSystem": "setuptools", @@ -9685,6 +10350,16 @@ "from": "0.34b0" } ], + "opentelemetry-instrumentation-asgi": [ + { + "buildSystem": "setuptools", + "until": "0.34b0" + }, + { + "buildSystem": "hatchling", + "from": "0.34b0" + } + ], "opentelemetry-instrumentation-asyncpg": [ { "buildSystem": "setuptools", @@ -9695,6 +10370,16 @@ "from": "0.34b0" } ], + "opentelemetry-instrumentation-fastapi": [ + { + "buildSystem": "setuptools", + "until": "0.34b0" + }, + { + "buildSystem": "hatchling", + "from": "0.34b0" + } + ], "opentelemetry-instrumentation-httpx": [ { "buildSystem": "setuptools", @@ -9735,6 +10420,16 @@ "from": "0.33b0" } ], + "opentelemetry-util-http": [ + { + "buildSystem": "setuptools", + "until": "0.34b0" + }, + { + "buildSystem": "hatchling", + "from": "0.33b0" + } + ], "opentimestamps": [ "setuptools" ], @@ -9762,9 +10457,15 @@ "optax": [ "setuptools" ], + "option": [ + "poetry-core" + ], "opuslib": [ "setuptools" ], + "oralb-ble": [ + "poetry-core" + ], "ordered-set": [ "flit-core", "setuptools" @@ -9895,8 +10596,8 @@ "setuptools" ], "packaging": [ - "setuptools", - "flit-core" + "flit-core", + "setuptools" ], "packbits": [ "setuptools" @@ -9944,6 +10645,9 @@ "panasonic-viera": [ "setuptools" ], + "pandarrallel": [ + "setuptools" + ], "pandas": [ "cython", "setuptools" @@ -9952,6 +10656,7 @@ "setuptools" ], "pandas-stubs": [ + "poetry-core", "setuptools" ], "pandoc-attributes": [ @@ -10097,7 +10802,14 @@ "setuptools-scm" ], "pathspec": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.11.0" + }, + { + "buildSystem": "flit-core", + "from": "0.11.0" + } ], "pathtools": [ "setuptools" @@ -10145,6 +10857,15 @@ "pcpp": [ "setuptools" ], + "pdb-tools": [ + "setuptools" + ], + "pdb2pqr": [ + "setuptools" + ], + "pdbtools": [ + "setuptools" + ], "pdf2image": [ "setuptools" ], @@ -10254,6 +10975,9 @@ "pescea": [ "setuptools" ], + "petname": [ + "setuptools" + ], "pex": [ "flit-core", "flitBuildHook", @@ -10265,6 +10989,9 @@ "pexpect": [ "setuptools" ], + "pg-activity": [ + "setuptools" + ], "pg8000": [ "setuptools" ], @@ -10401,7 +11128,7 @@ "setuptools" ], "pipenv-poetry-migrate": [ - "poetry", + "poetry-core", "setuptools" ], "pipx": [ @@ -10464,6 +11191,9 @@ "playsound": [ "setuptools" ], + "playwright": [ + "setuptools-scm" + ], "plexapi": [ "setuptools" ], @@ -10503,8 +11233,25 @@ "setuptools" ], "plumbum": [ - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools", + "until": "1.8.1" + }, + { + "buildSystem": "setuptools-scm", + "until": "1.8.1" + }, + { + "buildSystem": "hatch-vcs", + "from": "1.8.1" + }, + { + "buildSystem": "hatchling", + "from": "1.8.1" + } + ], + "pluralizer": [ + "setuptools" ], "plux": [ "pytest-runner", @@ -10548,7 +11295,6 @@ "setuptools" ], "poetry-plugin-export": [ - "poetry", "poetry-core" ], "poetry-semver": [ @@ -10712,8 +11458,22 @@ "setuptools" ], "prettytable": [ - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools", + "until": "3.5.0" + }, + { + "buildSystem": "setuptools-scm", + "until": "3.5.0" + }, + { + "buildSystem": "hatch-vcs", + "from": "3.5.0" + }, + { + "buildSystem": "hatchling", + "from": "3.5.0" + } ], "primecountpy": [ "cython", @@ -10771,6 +11531,9 @@ "property-manager": [ "setuptools" ], + "propka": [ + "setuptools" + ], "prospector": [ "poetry-core" ], @@ -10893,6 +11656,9 @@ "pulumi-aws": [ "setuptools" ], + "pulumi-azure-native": [ + "setuptools" + ], "pure-cdb": [ "setuptools" ], @@ -10978,6 +11744,9 @@ "py-eth-sig-utils": [ "setuptools" ], + "py-libzfs": [ + "cython" + ], "py-lru-cache": [ "setuptools" ], @@ -11072,7 +11841,7 @@ "setuptools" ], "pyairnow": [ - "poetry", + "poetry-core", "setuptools" ], "pyairvisual": [ @@ -11395,6 +12164,9 @@ "pydevd": [ "setuptools" ], + "pydevd-odoo": [ + "setuptools" + ], "pydexcom": [ "setuptools" ], @@ -11414,7 +12186,14 @@ "setuptools" ], "pydocstyle": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "6.2.0" + }, + { + "buildSystem": "poetry-core", + "from": "6.2.0" + } ], "pydocumentdb": [ "setuptools" @@ -11448,6 +12227,7 @@ "setuptools" ], "pydyf": [ + "flit-core", "setuptools" ], "pyeapi": [ @@ -11801,6 +12581,7 @@ "setuptools" ], "pyipp": [ + "poetry-core", "setuptools" ], "pyiqvia": [ @@ -11893,6 +12674,8 @@ "setuptools" ], "pylast": [ + "hatch-vcs", + "hatchling", "setuptools", "setuptools-scm" ], @@ -11930,6 +12713,9 @@ "pylibmc": [ "setuptools" ], + "pylightning": [ + "setuptools" + ], "pylink-square": [ "setuptools" ], @@ -11948,10 +12734,22 @@ "pylint-plugin-utils": [ "setuptools" ], + "pylint-venv": [ + "poetry-core" + ], "pylitterbot": [ "poetry-core", "setuptools" ], + "pyln-bolt7": [ + "poetry" + ], + "pyln-client": [ + "poetry" + ], + "pyln-proto": [ + "poetry" + ], "pylnk3": [ "setuptools" ], @@ -12327,6 +13125,9 @@ "pyperf": [ "setuptools" ], + "pypeul": [ + "poetry-core" + ], "pyphen": [ "flit", "setuptools" @@ -12383,12 +13184,18 @@ "pyproject-flake8": [ "flit-core" ], + "pyproject-hooks": [ + "flit-core" + ], "pyproject-metadata": [ "setuptools" ], "pyprosegur": [ "setuptools" ], + "pyprusalink": [ + "setuptools" + ], "pypsrp": [ "poetry-core", "setuptools" @@ -12429,6 +13236,9 @@ "pyqt5-with-qtwebkit": [ "setuptools" ], + "pyqt6": [ + "setuptools" + ], "pyqtgraph": [ "setuptools" ], @@ -12488,6 +13298,9 @@ "pyreadability": [ "setuptools" ], + "pyreadstat": [ + "cython" + ], "pyrect": [ "setuptools" ], @@ -12495,6 +13308,9 @@ "cython", "setuptools" ], + "pyrepl": [ + "setuptools" + ], "pyrevolve": [ "cython", "setuptools" @@ -12612,6 +13428,10 @@ "pysensors": [ "setuptools" ], + "pyserde": [ + "poetry", + "poetry-dynamic-versioning" + ], "pyserial": [ "setuptools" ], @@ -12769,8 +13589,10 @@ "pysnooper": [ "setuptools" ], + "pysnooz": [ + "poetry-core" + ], "pysnow": [ - "poetry", "poetry-core", "setuptools" ], @@ -12859,6 +13681,9 @@ "pysvn": [ "setuptools" ], + "pyswitchbee": [ + "setuptools" + ], "pyswitchbot": [ "setuptools" ], @@ -13030,6 +13855,9 @@ "pytest-fixture-config": [ "setuptools" ], + "pytest-flake8": [ + "setuptools" + ], "pytest-flakes": [ "setuptools" ], @@ -13044,6 +13872,9 @@ "pytest-freezegun": [ "setuptools" ], + "pytest-golden": [ + "poetry-core" + ], "pytest-helpers-namespace": [ "setuptools", "setuptools-scm" @@ -13112,6 +13943,9 @@ "pytest-order": [ "setuptools" ], + "pytest-ordering": [ + "setuptools" + ], "pytest-param-files": [ "flit-core", "flitBuildHook", @@ -13281,9 +14115,15 @@ "python-binance": [ "setuptools" ], + "python-bitcoinlib": [ + "setuptools" + ], "python-box": [ "setuptools" ], + "python-bsblan": [ + "poetry-core" + ], "python-cinderclient": [ "pbr", "setuptools" @@ -13336,6 +14176,9 @@ "python-dotenv": [ "setuptools" ], + "python-dxf": [ + "setuptools" + ], "python-ecobee-api": [ "setuptools" ], @@ -13393,6 +14236,9 @@ "poetry-core", "setuptools" ], + "python-hcl2": [ + "setuptools" + ], "python-heatclient": [ "pbr", "setuptools" @@ -13451,6 +14297,7 @@ "setuptools" ], "python-keycloak": [ + "poetry-core", "setuptools" ], "python-keyczar": [ @@ -13460,6 +14307,9 @@ "pbr", "setuptools" ], + "python-ldap": [ + "setuptools" + ], "python-ldap-test": [ "setuptools" ], @@ -13515,7 +14365,6 @@ "setuptools" ], "python-miio": [ - "poetry", "poetry-core", "setuptools" ], @@ -13713,7 +14562,8 @@ "setuptools" ], "python-ulid": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "python-unshare": [ "setuptools" @@ -14076,7 +14926,8 @@ "setuptools" ], "pyyaml-include": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "pyzbar": [ "setuptools" @@ -14107,6 +14958,9 @@ "qdldl": [ "setuptools" ], + "qdx": [ + "poetry" + ], "qiling": [ "setuptools" ], @@ -14258,9 +15112,9 @@ "setuptools" ], "rapidfuzz": [ - "setuptools", "packaging", - "scikit-build" + "scikit-build", + "setuptools" ], "rapidfuzz-capi": [ "setuptools" @@ -14287,6 +15141,9 @@ "rawkit": [ "setuptools" ], + "ray": [ + "cython" + ], "rbtools": [ "setuptools" ], @@ -14302,6 +15159,9 @@ "re-assert": [ "setuptools" ], + "reactivex": [ + "poetry-core" + ], "readability-lxml": [ "setuptools" ], @@ -14397,6 +15257,9 @@ "reparser": [ "setuptools" ], + "repeated-test": [ + "setuptools-scm" + ], "repocheck": [ "setuptools" ], @@ -14416,6 +15279,9 @@ "repoze-who": [ "setuptools" ], + "represent": [ + "setuptools" + ], "reproject": [ "cython", "setuptools", @@ -14493,6 +15359,9 @@ "cython", "setuptools" ], + "reserved": [ + "setuptools" + ], "resolvelib": [ "setuptools" ], @@ -14530,6 +15399,9 @@ "retrying": [ "setuptools" ], + "returns": [ + "poetry" + ], "retworkx": [ "setuptools" ], @@ -14542,6 +15414,10 @@ "rfc3986": [ "setuptools" ], + "rfc3986-validator": [ + "pytest-runner", + "setuptools" + ], "rfc3987": [ "setuptools" ], @@ -14568,7 +15444,14 @@ "setuptools" ], "rio-tiler": [ - "flit-core" + { + "buildSystem": "flit-core", + "until": "4.0.0" + }, + { + "buildSystem": "hatchling", + "from": "4.0.0" + } ], "ripe-atlas-cousteau": [ "setuptools" @@ -14658,7 +15541,6 @@ "setuptools" ], "rokuecp": [ - "poetry", "poetry-core", "setuptools" ], @@ -14688,6 +15570,9 @@ "ropper": [ "setuptools" ], + "roundrobin": [ + "setuptools" + ], "routes": [ "setuptools" ], @@ -14726,6 +15611,7 @@ "setuptools" ], "rpyc": [ + "hatchling", "setuptools" ], "rq": [ @@ -14742,6 +15628,9 @@ "rst2ansi": [ "setuptools" ], + "rst2pdf": [ + "setuptools" + ], "rstcheck": [ "poetry-core", "setuptools" @@ -14788,6 +15677,9 @@ "runway-python": [ "setuptools" ], + "ruuvitag-ble": [ + "hatchling" + ], "ruyaml": [ "setuptools", "setuptools-scm" @@ -14850,6 +15742,10 @@ "salmon-mail": [ "setuptools" ], + "salt-pepper": [ + "setuptools", + "setuptools-scm" + ], "sampledata": [ "setuptools" ], @@ -14903,7 +15799,11 @@ "setuptools" ], "sat-search": [ - "pytest-runner" + "pytest-runner", + "setuptools" + ], + "sat-stac": [ + "setuptools" ], "scales": [ "setuptools" @@ -15098,9 +15998,6 @@ "selectors2": [ "setuptools" ], - "selenium": [ - "setuptools" - ], "selinux": [ "setuptools" ], @@ -15369,6 +16266,9 @@ "poetry-core", "setuptools" ], + "singledispatch": [ + "setuptools" + ], "siobrultech-protocols": [ "setuptools" ], @@ -15688,6 +16588,9 @@ "sphinx-autodoc-typehints": [ "setuptools" ], + "sphinx-automodapi": [ + "cython" + ], "sphinx-basic-ng": [ "setuptools" ], @@ -15844,7 +16747,8 @@ "setuptools" ], "sphinxext-opengraph": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "spiderpy": [ "poetry-core", @@ -15881,6 +16785,9 @@ "cython", "setuptools" ], + "sqlalchemy-aio": [ + "setuptools" + ], "sqlalchemy-citext": [ "setuptools" ], @@ -15904,6 +16811,9 @@ "sqlalchemy-utils": [ "setuptools" ], + "sqlalchemy2-stubs": [ + "setuptools" + ], "sqlbag": [ "setuptools" ], @@ -15955,6 +16865,9 @@ "setuptools", "setuptools-scm" ], + "sse-starlette": [ + "setuptools" + ], "sseclient": [ "setuptools" ], @@ -15985,12 +16898,15 @@ "setuptools" ], "starlette": [ - "setuptools", - "hatchling" + "hatchling", + "setuptools" ], "starline": [ "setuptools" ], + "starsessions": [ + "poetry" + ], "stashy": [ "setuptools" ], @@ -16060,7 +16976,7 @@ "setuptools" ], "strawberry-graphql": [ - "poetry", + "poetry-core", "setuptools" ], "streamdeck": [ @@ -16102,10 +17018,10 @@ ], "structlog": [ "flitBuildHook", - "setuptools", - "hatchling", "hatch-fancy-pypi-readme", - "hatch-vcs" + "hatch-vcs", + "hatchling", + "setuptools" ], "structlog-sentry": [ "poetry-core" @@ -16269,6 +17185,10 @@ "setuptools-scm" ], "tabulate": [ + { + "buildSystem": "setuptools-scm", + "from": "0.9.0" + }, "setuptools" ], "tabview": [ @@ -16293,6 +17213,9 @@ "poetry-core", "setuptools" ], + "tan": [ + "setuptools" + ], "tank-utility": [ "setuptools" ], @@ -16314,6 +17237,9 @@ "taxi": [ "setuptools" ], + "tba-api-v3client": [ + "setuptools" + ], "tbats": [ "setuptools" ], @@ -16338,6 +17264,9 @@ "telegraph": [ "setuptools" ], + "telepath": [ + "setuptools" + ], "telethon": [ "setuptools" ], @@ -16805,6 +17734,9 @@ "setuptools", "setuptools-scm" ], + "tplink-omada-client": [ + "hatchling" + ], "tpm2-pytss": [ "setuptools", "setuptools-scm" @@ -16916,8 +17848,8 @@ "setuptools" ], "trove-classifiers": [ - "setuptools", - "calver" + "calver", + "setuptools" ], "trueskill": [ "setuptools" @@ -17052,6 +17984,9 @@ "txzmq": [ "setuptools" ], + "typeapi": [ + "poetry" + ], "typecode": [ "setuptools", "setuptools-scm" @@ -17059,6 +17994,9 @@ "typecode-libmagic": [ "setuptools" ], + "typed-argument-parser": [ + "setuptools" + ], "typed-ast": [ "setuptools" ], @@ -17088,15 +18026,36 @@ "types-aiobotocore-elbv2": [ "setuptools" ], + "types-aiobotocore-lambda": [ + "setuptools" + ], + "types-aiobotocore-organizations": [ + "setuptools" + ], "types-aiobotocore-resourcegroupstaggingapi": [ "setuptools" ], + "types-aiobotocore-secretsmanager": [ + "setuptools" + ], "types-aiobotocore-ssm": [ "setuptools" ], + "types-aiobotocore-stepfunctions": [ + "setuptools" + ], + "types-aiobotocore-sts": [ + "setuptools" + ], "types-awscrt": [ "poetry-core" ], + "types-backports": [ + "setuptools" + ], + "types-beautifulsoup4": [ + "setuptools" + ], "types-cachetools": [ "setuptools" ], @@ -17136,12 +18095,24 @@ "types-markdown": [ "setuptools" ], + "types-orjson": [ + "setuptools" + ], "types-pkg-resources": [ "setuptools" ], "types-protobuf": [ "setuptools" ], + "types-psutil": [ + "setuptools" + ], + "types-psycopg2": [ + "setuptools" + ], + "types-pygments": [ + "setuptools" + ], "types-python-dateutil": [ "setuptools" ], @@ -17169,6 +18140,9 @@ "types-tabulate": [ "setuptools" ], + "types-termcolor": [ + "setuptools" + ], "types-toml": [ "setuptools" ], @@ -17226,6 +18200,9 @@ "setuptools", "setuptools-scm" ], + "ubersmith": [ + "setuptools" + ], "uc-micro-py": [ "setuptools" ], @@ -17325,6 +18302,9 @@ "unify": [ "setuptools" ], + "unipath": [ + "setuptools" + ], "units": [ "setuptools" ], @@ -17433,6 +18413,9 @@ "us": [ "setuptools" ], + "usb-devices": [ + "poetry-core" + ], "usbrelay-py": [ "setuptools" ], @@ -17465,6 +18448,9 @@ "cython", "setuptools" ], + "uwsgidecorators": [ + "setuptools" + ], "vaa": [ "flit-core", "setuptools" @@ -17588,9 +18574,15 @@ "setuptools" ], "virtualenv": [ - "cython", - "setuptools", - "setuptools-scm" + { + "buildSystem": "setuptools-scm", + "until": " 20.18" + }, + { + "buildSystem": "hatch-vcs", + "from": " 20.18" + }, + "cython" ], "virtualenv-clone": [ "setuptools" @@ -17677,6 +18669,9 @@ "wadllib": [ "setuptools" ], + "wagtail": [ + "setuptools" + ], "waitress": [ "setuptools" ], @@ -17803,6 +18798,8 @@ "setuptools" ], "webdav4": [ + "hatch-vcs", + "hatchling", "setuptools", "setuptools-scm" ], @@ -17924,6 +18921,9 @@ "winsspi": [ "setuptools" ], + "withings-api": [ + "poetry-core" + ], "wktutils": [ "setuptools" ], @@ -17931,6 +18931,9 @@ "poetry-core", "setuptools" ], + "wmctrl": [ + "setuptools" + ], "woob": [ "setuptools" ], @@ -17997,12 +19000,18 @@ "wurlitzer": [ "setuptools" ], + "www-authenticate": [ + "setuptools" + ], "wxpython-4-0": [ "setuptools" ], "wxpython-4-1": [ "setuptools" ], + "wxpython-4-2": [ + "setuptools" + ], "x11-hash": [ "setuptools" ], @@ -18260,6 +19269,9 @@ "yoyo-migrations": [ "setuptools" ], + "ypy-websocket": [ + "hatchling" + ], "yq": [ "setuptools", "setuptools-scm" @@ -18275,7 +19287,8 @@ "setuptools" ], "ytmusicapi": [ - "setuptools" + "setuptools", + "setuptools-scm" ], "yubico-client": [ "setuptools" @@ -18296,6 +19309,9 @@ "zadnegoale": [ "setuptools" ], + "zamg": [ + "poetry-core" + ], "zarr": [ "setuptools", "setuptools-scm" @@ -18369,6 +19385,9 @@ "setuptools", "setuptools-scm" ], + "zipseeker": [ + "setuptools" + ], "zipstream": [ "setuptools" ], @@ -18378,6 +19397,9 @@ "zipstream-ng": [ "setuptools" ], + "zk": [ + "setuptools" + ], "zm-py": [ "setuptools" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 23a9accc7f65..bfe126758e74 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -27,7 +27,7 @@ let true; intendedBuildSystem = if attr.buildSystem == "cython" then - self.python.pythonForBuild.cython + self.python.pythonForBuild.pkgs.cython else self.${attr.buildSystem}; in @@ -99,7 +99,7 @@ lib.composeManyExtensions [ { automat = super.automat.overridePythonAttrs ( - old: { + old: lib.optionalAttrs (lib.versionOlder old.version "22.10.0") { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.m2r ]; } ); @@ -296,7 +296,7 @@ lib.composeManyExtensions [ old: { nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ]; buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; - prePatch = (old.prePatch or "") + lib.optionalString stdenv.isDarwin '' + prePatch = (old.prePatch or "") + lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' # Remove setup.py impurities substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" substituteInPlace setup.py --replace "'/usr/include/ffi'," "" @@ -382,6 +382,8 @@ lib.composeManyExtensions [ "38.0.1" = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; + "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; + "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; }.${version} or ( lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -397,7 +399,7 @@ lib.composeManyExtensions [ ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] + ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); @@ -443,6 +445,17 @@ lib.composeManyExtensions [ buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; }); + databricks-connect = super.databricks-connect.overridePythonAttrs (old: { + sourceRoot = "."; + }); + + dbt-extractor = super.dbt-extractor.overridePythonAttrs + ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cargo pkgs.rustc pkgs.maturin ]; + } + ); + dbus-python = super.dbus-python.overridePythonAttrs (old: { outputs = [ "out" "dev" ]; @@ -562,6 +575,14 @@ lib.composeManyExtensions [ ) ) else super.docutils; + duckdb = super.duckdb.overridePythonAttrs (old: { + postPatch = lib.optionalString (!(old.src.isWheel or false)) '' + substituteInPlace setup.py \ + --replace 'multiprocessing.cpu_count()' "$NIX_BUILD_CORES" \ + --replace 'setuptools_scm<7.0.0' 'setuptools_scm' + ''; + }); + # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; @@ -608,7 +629,7 @@ lib.composeManyExtensions [ fancycompleter = super.fancycompleter.overridePythonAttrs ( old: { - postPatch = '' + postPatch = lib.optionalString (!(old.src.isWheel or false)) '' substituteInPlace setup.py \ --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ --replace 'versioning="devcommit"' 'version="${old.version}"' @@ -636,11 +657,12 @@ lib.composeManyExtensions [ fiona = super.fiona.overridePythonAttrs ( old: { - format = "setuptools"; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ]; - nativeBuildInputs = [ - pkgs.gdal # for gdal-config - ]; + format = lib.optionalString (!(old.src.isWheel or false)) "setuptools"; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.gdal ]; + nativeBuildInputs = old.nativeBuildInputs or [ ] + ++ lib.optionals ((old.src.isWheel or false) && (!pkgs.stdenv.isDarwin)) [ pkgs.autoPatchelfHook ] + # for gdal-config + ++ [ pkgs.gdal ]; } ); @@ -648,14 +670,28 @@ lib.composeManyExtensions [ VERSION = old.version; }); - gdal = super.gdal.overridePythonAttrs ( - old: { - preBuild = (old.preBuild or "") + '' - substituteInPlace setup.cfg \ - --replace "../../apps/gdal-config" '${pkgs.gdal}/bin/gdal-config' - ''; - } - ); + gdal = + let + # Build gdal without python bindings to prevent version mixing + # We're only interested in the native libraries, not the python ones + # as we build that separately. + gdal = pkgs.gdal.overrideAttrs (old: { + doInstallCheck = false; + doCheck = false; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DBUILD_PYTHON_BINDINGS=OFF" + ]; + }); + in + super.gdal.overridePythonAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ gdal ]; + preBuild = (old.preBuild or "") + '' + substituteInPlace setup.cfg \ + --replace "../../apps/gdal-config" '${gdal}/bin/gdal-config' + ''; + } + ); grandalf = super.grandalf.overridePythonAttrs ( old: { @@ -664,6 +700,34 @@ lib.composeManyExtensions [ } ); + granian = + let + getRepoHash = version: { + "0.2.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; + "0.2.2" = "sha256-KWwefJ3CfOUGCgAm7AhFlIxRF9qxNEo3npGOxVJ23FY="; + "0.2.3" = "sha256-2JnyO0wxkV49R/0wzDb/PnUWWHi3ckwK4nVe7dWeH1k="; + "0.2.4" = "sha256-GdQJvVPsWgC1z7La9h11x2pRAP+L998yImhTFrFT5l8="; + "0.2.5" = "sha256-vMXMxss77rmXSjoB53eE8XN2jXyIEf03WoQiDfvhDmw="; + "0.2.6" = "sha256-l9W9+KDg/43mc0toEz1n1pqw+oQdiHdAxGlS+KLIGhw="; + }.${version}; + sha256 = getRepoHash super.granian.version; + in + super.granian.overridePythonAttrs (old: rec { + src = pkgs.fetchFromGitHub { + owner = "emmett-framework"; + repo = "granian"; + rev = "v${old.version}"; + inherit sha256; + }; + cargoDeps = pkgs.rustPlatform.importCargoLock { + lockFile = "${src.out}/Cargo.lock"; + }; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.rustPlatform.cargoSetupHook + pkgs.rustPlatform.maturinBuildHook + ]; + }); + gitpython = super.gitpython.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.typing-extensions ]; @@ -749,6 +813,18 @@ lib.composeManyExtensions [ } ); + hikari = super.hikari.overrideAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; + } + ); + + hikari-lightbulb = super.hikari-lightbulb.overrideAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; + } + ); + horovod = super.horovod.overridePythonAttrs ( old: { propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; @@ -864,6 +940,15 @@ lib.composeManyExtensions [ } ); + trio = super.trio.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) + ++ [ self.async-generator self.idna ]; + }); + + jeepney = super.jeepney.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.outcome self.trio ]; + }); + jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs ( old: { preBuild = (old.preBuild or "") + '' @@ -930,6 +1015,13 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools self.wheel ]; }); + jupyter-server = super.jupyter-server.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ [ self.hatchling ]; + buildInputs = (old.buildInputs or [ ]) + ++ [ self.hatch-jupyter-builder ]; + }); + jupyterlab-widgets = super.jupyterlab-widgets.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.jupyter-packaging ]; @@ -964,6 +1056,15 @@ lib.composeManyExtensions [ } ); + libarchive = super.libarchive.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; + + postPatch = '' + substituteInPlace libarchive/library.py --replace \ + "_FILEPATH = find_and_load_library()" "_FILEPATH = '${pkgs.libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }); + libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; propagatedBuildInputs = [ pkgs.libvirt ]; @@ -1078,10 +1179,12 @@ lib.composeManyExtensions [ buildInputs = old.buildInputs or [ ] ++ [ pkgs.which - ] ++ lib.optional enableGhostscript [ + ] ++ lib.optionals enableGhostscript [ pkgs.ghostscript - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa + ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.7.0") [ + self.pybind11 ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ @@ -1097,7 +1200,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config - ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [ + ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ self.setuptools-scm self.setuptools-scm-git-archive ]; @@ -1137,11 +1240,6 @@ lib.composeManyExtensions [ } ); - # Calls Cargo at build time for source builds and is really tricky to package - maturin = super.maturin.override { - preferWheel = true; - }; - mccabe = super.mccabe.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -1308,6 +1406,9 @@ lib.composeManyExtensions [ preBuild = '' ln -s ${cfg} site.cfg ''; + preConfigure = '' + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; passthru = old.passthru // { blas = blas; inherit blasImplementation cfg; @@ -1353,6 +1454,8 @@ lib.composeManyExtensions [ autoPatchelfIgnoreMissingDeps = true; }); + openbabel-wheel = super.openbabel-wheel.override { preferWheel = true; }; + # Overrides for building packages based on OpenCV # These flags are inspired by the opencv 4.x package in nixpkgs _opencv-python-override = @@ -1376,7 +1479,7 @@ lib.composeManyExtensions [ opencv-python = super.opencv-python.overridePythonAttrs self._opencv-python-override; - opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override; + opencv-python-headless = super.opencv-python-headless.overridePythonAttrs self._opencv-python-override; opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override; @@ -1409,6 +1512,10 @@ lib.composeManyExtensions [ "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; + "3.8.4" = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; + "3.8.5" = "sha256-JtUCJ3TP9EKGcddeyW1e/72k21uKneq9SnZJeLvn9Os="; + "3.8.6" = "sha256-8T//q6nQoZhh8oJWDCeQf3gYRew58dXAaxkYELY4CJM="; + "3.8.7" = "sha256-JBO8nl0sC+XIn17vI7hC8+nA1HYI9jfvZrl9nCE3k1s="; }.${version} or ( lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -1444,7 +1551,7 @@ lib.composeManyExtensions [ # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1"; echo "Adding $cpp_sdk to the setup.py common_include variable" substituteInPlace setup.py \ @@ -1509,13 +1616,27 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config self.pytest-runner ]; buildInputs = with pkgs; (old.buildInputs or [ ]) - ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] + ++ [ freetype libjpeg zlib libtiff libxcrypt libwebp tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ] ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ]; preConfigure = lib.optional (old.format != "wheel") preConfigure; } ); + pip-requirements-parser = super.pip-requirements-parser.overridePythonAttrs (old: { + dontConfigure = true; + }); + + pluralizer = super.pluralizer.overridePythonAttrs (old: { + preBuild = '' + export PYPI_VERSION="${old.version}" + ''; + }); + + poethepoet = super.poethepoet.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.poetry ]; + }); + poetry-core = super.poetry-core.overridePythonAttrs (old: let initFile = @@ -1600,7 +1721,7 @@ lib.composeManyExtensions [ ); pyarrow = - if lib.versionAtLeast super.pyarrow.version "0.16.0" then + if (!super.pyarrow.src.isWheel or false) && lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs ( old: @@ -1662,14 +1783,13 @@ lib.composeManyExtensions [ old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.meson + self.meson pkgs.ninja pkg-config ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cairo - pkgs.xlibsWrapper ]; mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; @@ -1869,6 +1989,18 @@ lib.composeManyExtensions [ } ); + python-snap7 = super.python-snap7.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ + pkgs.snap7 + ]; + + postPatch = (old.postPatch or "") + '' + echo "Patching find_library call." + substituteInPlace snap7/common.py \ + --replace "find_library('snap7')" "\"${pkgs.snap7}/lib/libsnap7.so\"" + ''; + }); + pytoml = super.pytoml.overridePythonAttrs ( old: { doCheck = false; @@ -2069,6 +2201,18 @@ lib.composeManyExtensions [ } ); + recommonmark = super.rich.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; + } + ); + + rich = super.rich.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; + } + ); + rockset = super.rockset.overridePythonAttrs ( old: { postPatch = '' @@ -2099,9 +2243,24 @@ lib.composeManyExtensions [ "-DPYBIND11_TEST=off" ]; doCheck = false; # Circular test dependency + + # Link include and share so it can be used by packages that use pybind11 through cmake + postInstall = '' + ln -s $out/${self.python.sitePackages}/pybind11/{include,share} $out/ + ''; } ); + rasterio = super.rasterio.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gdal ]; + }); + + rfc3986-validator = super.rfc3986-validator.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + self.pytest-runner + ]; + }); + rlp = super.rlp.overridePythonAttrs { preConfigure = '' substituteInPlace setup.py --replace \'setuptools-markdown\' "" @@ -2133,8 +2292,9 @@ lib.composeManyExtensions [ if old.format != "wheel" then { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ - lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; + lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ + lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; + dontUseMesonConfigure = true; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; @@ -2186,17 +2346,31 @@ lib.composeManyExtensions [ ''; }); + selenium = + let + v4orLater = lib.versionAtLeast super.selenium.version "4"; + selenium = super.selenium.override { + # Selenium >=4 is built with Bazel + preferWheel = v4orLater; + }; + in + selenium.overridePythonAttrs (old: { + # Selenium <4 can be installed from sources, with setuptools + buildInputs = old.buildInputs ++ (lib.optionals (!v4orLater) [ self.setuptools ]); + }); + shapely = super.shapely.overridePythonAttrs ( old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ]; - inherit (pkgs.python3.pkgs.shapely) GEOS_LIBRARY_PATH; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; + + GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${lib.getLib stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; # Fix library paths - postPatch = old.postPatch or "" + '' + postPatch = lib.optionalString (!(old.src.isWheel or false)) (old.postPatch or "" + '' ${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py - ''; + ''); } ); @@ -2411,7 +2585,7 @@ lib.composeManyExtensions [ # Stop infinite recursion by using bootstrapped pkg from nixpkgs bootstrapped-pip = super.bootstrapped-pip.override { - wheel = (pkgs.python3.pkgs.override { + wheel = ((if self.python.isPy2 then pkgs.python2 else pkgs.python3).pkgs.override { python = self.python; }).wheel; }; @@ -2484,27 +2658,15 @@ lib.composeManyExtensions [ } ); - wheel = - let - isWheel = super.wheel.src.isWheel or false; - # If "wheel" is a pre-built binary wheel - wheelPackage = super.buildPythonPackage { - inherit (super.wheel) pname name version src; - inherit (pkgs.python3.pkgs.wheel) meta; - format = "wheel"; - }; - # If "wheel" is built from source - sourcePackage = (( - pkgs.python3.pkgs.override { - python = self.python; - } - ).wheel.override { - inherit (self) buildPythonPackage bootstrapped-pip setuptools; - }).overrideAttrs (old: { - inherit (super.wheel) pname name version src; - }); - in - if isWheel then wheelPackage else sourcePackage; + wheel = (( + pkgs.python3.pkgs.override { + python = self.python; + } + ).wheel.override { + inherit (self) buildPythonPackage bootstrapped-pip setuptools; + }).overrideAttrs (old: { + inherit (super.wheel) pname name version src; + }); zipp = if super.zipp == null then null else super.zipp.overridePythonAttrs ( @@ -2603,6 +2765,13 @@ lib.composeManyExtensions [ } ); + minimal-snowplow-tracker = super.minimal-snowplow-tracker.overridePythonAttrs + ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ super.setuptools ]; + } + ); + # nixpkgs has setuptools_scm 4.1.2 # but newrelic has a seemingly unnecessary version constraint for <4 # So we patch that out @@ -2693,6 +2862,18 @@ lib.composeManyExtensions [ buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; }); + setuptools-scm = super.setuptools-scm.overridePythonAttrs (old: { + setupHook = pkgs.writeText "setuptools-scm-setup-hook.sh" '' + poetry2nix-setuptools-scm-hook() { + if [ -z "''${dontPretendSetuptoolsSCMVersion-}" ]; then + export SETUPTOOLS_SCM_PRETEND_VERSION="$version" + fi + } + + preBuildHooks+=(poetry2nix-setuptools-scm-hook) + ''; + }); + uwsgi = super.uwsgi.overridePythonAttrs (old: { @@ -2711,27 +2892,69 @@ lib.composeManyExtensions [ buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; }); - nbconvert = super.nbconvert.overridePythonAttrs (_: { - postPatch = lib.optionalString (lib.versionAtLeast self.nbconvert.version "6.5.0") '' - substituteInPlace \ - ./nbconvert/exporters/templateexporter.py \ - --replace \ - 'root_dirs.extend(jupyter_path())' \ - 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ - --subst-var out - '' + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") '' - substituteInPlace \ - ./hatch_build.py \ - --replace \ - 'if self.target_name not in ["wheel", "sdist"]:' \ - 'if True:' - ''; + nbconvert = + let + patchExporters = lib.optionalString (lib.versionAtLeast self.nbconvert.version "6.5.0") '' + substituteInPlace \ + ./nbconvert/exporters/templateexporter.py \ + --replace \ + 'root_dirs.extend(jupyter_path())' \ + 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ + --subst-var out + ''; + in + super.nbconvert.overridePythonAttrs (old: { + postPatch = lib.optionalString (!(old.src.isWheel or false)) ( + patchExporters + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") '' + substituteInPlace \ + ./hatch_build.py \ + --replace \ + 'if self.target_name not in ["wheel", "sdist"]:' \ + 'if True:' + '' + ); + postInstall = lib.optionalString (old.src.isWheel or false) '' + pushd $out/${self.python.sitePackages} + ${patchExporters} + popd + ''; + }); + + meson-python = super.meson-python.overridePythonAttrs (old: { + dontUseMesonConfigure = true; }); mkdocs = super.mkdocs.overridePythonAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ]; }); + + # patch mkdocstrings to fix jinja2 imports + mkdocstrings = + let + patchJinja2Imports = self.pkgs.fetchpatch { + name = "fix-jinja2-imports.patch"; + url = "https://github.com/mkdocstrings/mkdocstrings/commit/b37722716b1e0ed6393ec71308dfb0f85e142f3b.patch"; + hash = "sha256-DD1SjEvs5HBlSRLrqP3jhF/yoeWkF7F3VXCD1gyt5Fc="; + }; + in + super.mkdocstrings.overridePythonAttrs ( + old: lib.optionalAttrs + (lib.versionAtLeast old.version "0.17" && lib.versionOlder old.version "0.18") + { + patches = old.patches or [ ] ++ lib.optionals (!(old.src.isWheel or false)) [ patchJinja2Imports ]; + # strip the first two levels ("a/src/") when patching since we're in site-packages + # just above mkdocstrings + postInstall = lib.optionalString (old.src.isWheel or false) '' + pushd "$out/${self.python.sitePackages}" + patch -p2 < "${patchJinja2Imports}" + popd + ''; + } + ); + + y-py = super.y-py.override { + preferWheel = true; + }; } ) - ] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index 5883494466f3..1ef253365a9f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -19,10 +19,19 @@ let toWheelAttrs = str: let entries' = splitString "-" str; + el = builtins.length entries'; + entryAt = builtins.elemAt entries'; + # Hack: Remove version "suffixes" like 2.11.4-1 - # Some wheels have build tag with more than one digit - # like openvino-2022.1.0-7019-cp36-cp36m-manylinux_2_27_x86_64.whl - entries = builtins.filter (x: builtins.match "[0-9]*" x == null) entries'; + entries = + if el == 6 then [ + (entryAt 0) # name + (entryAt 1) # version + # build tag is skipped + (entryAt (el - 3)) # python version + (entryAt (el - 2)) # abi + (entryAt (el - 1)) # platform + ] else entries'; p = removeSuffix ".whl" (builtins.elemAt entries 4); in { @@ -106,7 +115,7 @@ let filtered = builtins.filter filterWheel filesWithoutSources; choose = files: let - osxMatches = [ "12_0" "11_0" "10_15" "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; + osxMatches = [ "12_0" "11_0" "10_15" "10_14" "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "manylinux_" "any" ]; chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); From 4a8c6e0982575eb9c2c09d104fe25fb268db2b05 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 23 Mar 2023 09:47:27 -0400 Subject: [PATCH 3/4] brave: 1.49.120 -> 1.49.128 https://community.brave.com/t/release-channel-1-49-128/478314/1 (cherry picked from commit 745329fc27e89a903518fa8c477ec960929d2bd1) --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 1580a996616c..f72219124f4a 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.49.120"; + version = "1.49.128"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-KSu6HaNKc7uVY1rSyzU+VZSE2dbIOOrsUx1RYKnz8yU="; + sha256 = "sha256-TXAPzhNRupv8R2rKj/mFdubAVjOrnmbdBtmasTnqfyU="; }; dontConfigure = true; From 93cdff67e5a3574cf7b429f9f617018c1e24f074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Mar 2023 10:07:23 +0000 Subject: [PATCH 4/4] wiki-js: 2.5.297 -> 2.5.298 (cherry picked from commit 8b2dd593fe5707e81bdbd844ad2ea543082ab19d) --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index cf1167798dd6..c17c3f7e95c9 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.297"; + version = "2.5.298"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-58TAlioeBjNYRk2Ku6kFxHLffcDq3HwlqklqBkEIhLM="; + sha256 = "sha256-O7KQ134zh9ullYyQZimmxfdRwXeHkD8aAhy/pRzIjxo="; }; sourceRoot = ".";