diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/python-modules/schema-salad | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/schema-salad')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/schema-salad/default.nix | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 2e617fa8c3fc..86a1ba65598d 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -2,29 +2,30 @@ , black , buildPythonPackage , cachecontrol -, fetchPypi +, fetchFromGitHub , importlib-resources -, lockfile , mistune -, mypy +, mypy-extensions , pytestCheckHook , pythonOlder , rdflib +, requests , ruamel-yaml -, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.5.20231201181309"; + version = "8.5.20240102191336.dev7+g8e95468"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-q4djcBt+8PEUekWNKlivKnDXrJBAUKGZ1252ym/E4bI="; + src = fetchFromGitHub { + owner = "common-workflow-language"; + repo = "schema_salad"; + rev = "8e954684b08d222d54b7eff680eaa4d4e65920a9"; + hash = "sha256-VoFFKe6XHDytj5UlmsN14RevKcgpl+DSDMGDVS2Ols4="; }; nativeBuildInputs = [ @@ -33,14 +34,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ cachecontrol - importlib-resources - lockfile mistune - mypy + mypy-extensions rdflib + requests ruamel-yaml - setuptools # needs pkg_resources at runtime - ] ++ cachecontrol.optional-dependencies.filecache; + ] ++ cachecontrol.optional-dependencies.filecache + ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; nativeCheckInputs = [ pytestCheckHook @@ -51,6 +53,7 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_load_by_yaml_metaschema" # Setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" @@ -75,7 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; - # https://github.com/common-workflow-language/schema_salad/issues/721 - broken = versionAtLeast mistune.version "2.1"; }; } |