diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix index 9fe4ab882feb..373a2fb31115 100644 --- a/pkgs/by-name/gi/git-sim/package.nix +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -11,15 +11,9 @@ packageOverrides ? self: super: { }, }: let - defaultOverrides = [ - (self: super: { - av = self.av_13; - }) - ]; - python = python3.override { self = python; - packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); + packageOverrides = lib.composeManyExtensions [ packageOverrides ]; }; version = "0.3.5"; diff --git a/pkgs/by-name/ma/manim-slides/package.nix b/pkgs/by-name/ma/manim-slides/package.nix index ec66070ce3e4..5b37008c726a 100644 --- a/pkgs/by-name/ma/manim-slides/package.nix +++ b/pkgs/by-name/ma/manim-slides/package.nix @@ -1,14 +1,6 @@ { python3Packages, }: - -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - av = self.av_13; - } - ); -in -(pythonPackages.toPythonApplication pythonPackages.manim-slides).overridePythonAttrs (oldAttrs: { +(python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs (oldAttrs: { dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full; }) diff --git a/pkgs/by-name/ma/manim/package.nix b/pkgs/by-name/ma/manim/package.nix index 631cbbf2ffeb..1e42bcb75ff5 100644 --- a/pkgs/by-name/ma/manim/package.nix +++ b/pkgs/by-name/ma/manim/package.nix @@ -1,12 +1,4 @@ { python3Packages, }: - -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - av = self.av_13; - } - ); -in -pythonPackages.toPythonApplication pythonPackages.manim +python3Packages.toPythonApplication python3Packages.manim diff --git a/pkgs/development/python-modules/av_13/default.nix b/pkgs/development/python-modules/av_13/default.nix deleted file mode 100644 index 479385a05dba..000000000000 --- a/pkgs/development/python-modules/av_13/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - buildPythonPackage, - cython, - fetchFromGitHub, - fetchurl, - ffmpeg_7-headless, - lib, - linkFarm, - numpy, - pillow, - pkg-config, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "av"; - version = "13.1.0"; # nixpkgs-update: no auto update - pyproject = true; - - src = fetchFromGitHub { - owner = "PyAV-Org"; - repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; - }; - - build-system = [ - cython - setuptools - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ ffmpeg_7-headless ]; - - preCheck = - let - testSamples = linkFarm "pyav-test-samples" ( - lib.mapAttrs (_: fetchurl) (lib.importTOML ../av/test-samples.toml) - ); - in - '' - # ensure we import the built version - rm -r av - ln -s ${testSamples} tests/assets - ''; - - nativeCheckInputs = [ - numpy - pillow - pytestCheckHook - ]; - - __darwinAllowLocalNetworking = true; - - pythonImportsCheck = [ - "av" - "av.audio" - "av.buffer" - "av.bytesource" - "av.codec" - "av.container" - "av._core" - "av.datasets" - "av.descriptor" - "av.dictionary" - "av.error" - "av.filter" - "av.format" - "av.frame" - "av.logging" - "av.option" - "av.packet" - "av.plane" - "av.stream" - "av.subtitles" - "av.utils" - "av.video" - ]; - - passthru.skipBulkUpdate = true; - - meta = { - changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst"; - description = "Pythonic bindings for FFmpeg"; - homepage = "https://github.com/PyAV-Org/PyAV"; - license = lib.licenses.bsd2; - mainProgram = "pyav"; - maintainers = [ lib.maintainers.dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 3e5cdfc308b7..560975af90a0 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -188,13 +188,13 @@ in buildPythonPackage rec { pname = "manim"; pyproject = true; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; tag = "v${version}"; - hash = "sha256-VkMmIQNLUg6Epttze23vaAA8QOdlnAPQZ7UKpkFRzIk="; + hash = "sha256-sM2IQdrqWVopo5Yzjmv6/KTHkgb/7Fma+plAc+gGwaM="; }; build-system = [ @@ -236,6 +236,10 @@ buildPythonPackage rec { audioop-lts ]; + pythonRelaxDeps = [ + "skia-pathops" + ]; + optional-dependencies = { jupyterlab = [ jupyterlab @@ -270,8 +274,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim" ]; meta = { - # https://github.com/ManimCommunity/manim/pull/4037 - broken = lib.versionAtLeast av.version "14"; description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to @@ -283,6 +285,9 @@ buildPythonPackage rec { changelog = "https://github.com/ManimCommunity/manim/releases/tag/${src.tag}"; homepage = "https://github.com/ManimCommunity/manim"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ osbm ]; + maintainers = with lib.maintainers; [ + osbm + ivyfanchiang + ]; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 991a63bfb8ee..50e15531d8cc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -75,6 +75,7 @@ mapAliases { asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29 atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29 autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29 + av_13 = throw "'av_13' has been renamed to/replaced by 'av'"; # Added 2026-02-01 Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14 backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ba61a337860..563d2c9de32d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1258,8 +1258,6 @@ self: super: with self; { av = callPackage ../development/python-modules/av { }; - av_13 = callPackage ../development/python-modules/av_13 { }; - avahi = toPythonModule ( pkgs.avahi.override { inherit python;