Merge pull request #1209 from sigprof/jsonschema-4.18.0

Update overrides for `jsonschema` 4.18.0
This commit is contained in:
adisbladis 2023-07-07 23:25:35 +00:00 committed by GitHub
commit 3f9ccf9d76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 0 deletions

View file

@ -8069,6 +8069,10 @@
"jsonschema-spec": [
"poetry-core"
],
"jsonschema-specifications": [
"hatch-vcs",
"hatchling"
],
"jsonstreams": [
"setuptools"
],
@ -15613,6 +15617,10 @@
"cython",
"setuptools"
],
"referencing": [
"hatch-vcs",
"hatchling"
],
"reflink": [
"setuptools"
],

View file

@ -1022,9 +1022,18 @@ lib.composeManyExtensions [
super.jsonschema.overridePythonAttrs
(old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.importlib-resources ];
postPatch = old.postPatch or "" + lib.optionalString (lib.versionAtLeast super.jsonschema.version "4.18.0") ''
sed -i "/Topic :: File Formats :: JSON/d" pyproject.toml
'';
})
else super.jsonschema;
jsonschema-specifications = super.jsonschema-specifications.overridePythonAttrs (old: {
postPatch = old.postPatch or "" + ''
sed -i "/Topic :: File Formats :: JSON/d" pyproject.toml
'';
});
jupyter = super.jupyter.overridePythonAttrs (
old: {
# jupyter is a meta-package. Everything relevant comes from the
@ -2372,6 +2381,12 @@ lib.composeManyExtensions [
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gdal ];
});
referencing = super.referencing.overridePythonAttrs (old: {
postPatch = old.postPatch or "" + ''
sed -i "/Topic :: File Formats :: JSON/d" pyproject.toml
'';
});
rfc3986-validator = super.rfc3986-validator.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.pytest-runner
@ -2388,6 +2403,29 @@ lib.composeManyExtensions [
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
rpds-py =
let
getCargoHash = version: {
"0.8.8" = "sha256-jg9oos4wqewIHe31c3DixIp6fssk742kqt4taWyOq4U=";
}.${version} or (
lib.warn "Unknown rpds-py version: '${version}'. Please update getCargoHash." lib.fakeHash
);
in
super.rpds-py.overridePythonAttrs (old: {
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
inherit (old) src;
name = "${old.pname}-${old.version}";
hash = getCargoHash old.version;
};
buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [
pkgs.libiconv
];
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.rustPlatform.cargoSetupHook
pkgs.rustPlatform.maturinBuildHook
];
});
rtree = super.rtree.overridePythonAttrs (old: {
propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ];
postPatch = ''