diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/python-modules/altair/default.nix | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/altair/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/altair/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index 82a4fc9d7848..14d65a2e1af1 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -11,9 +11,10 @@ , typing-extensions , pandas , jinja2 -, importlib-metadata +, packaging # Build, dev and test dependencies +, anywidget , ipython , pytestCheckHook , vega_datasets @@ -22,15 +23,17 @@ buildPythonPackage rec { pname = "altair"; - version = "5.0.1"; + # current version, 5.0.1, is broken with jsonschema>=4.18 + # we use unstable version instead of patch due to many changes + version = "unstable-2023-08-12"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "altair-viz"; repo = "altair"; - rev = "refs/tags/v${version}"; - hash = "sha256-7bTrfryu4oaodVGNFNlVk9vXmDA5/9ahvCmvUGzZ5OQ="; + rev = "56b3b66daae7160c8d82777d2646131afcc3dab4"; + hash = "sha256-uVE3Bth1D1mIhaULB4IxEtOzhQd51Pscqyfdys65F6A="; }; nativeBuildInputs = [ @@ -41,12 +44,13 @@ buildPythonPackage rec { jinja2 jsonschema numpy + packaging pandas toolz - ] ++ lib.optional (pythonOlder "3.8") importlib-metadata - ++ lib.optional (pythonOlder "3.11") typing-extensions; + ] ++ lib.optional (pythonOlder "3.11") typing-extensions; nativeCheckInputs = [ + anywidget ipython sphinx vega_datasets @@ -62,6 +66,8 @@ buildPythonPackage rec { "tests/vegalite/v5/test_api.py" # avoid updating files and dependency on black "tests/test_toplevel.py" + # require vl-convert package + "tests/utils/test_compiler.py" ]; meta = with lib; { |