From 9a2514d1182c0755830558fd12fd78a5ce4adbb9 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 1 Feb 2026 15:31:11 -0500 Subject: [PATCH] python3Packages.av_13: drop All uses of av_13 in nixpkgs introduced in #461602 have been updated to support latest av --- .../python-modules/av_13/default.nix | 92 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/development/python-modules/av_13/default.nix 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/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7035ea22f93a..fb23231b40dd 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 2ed24daec215..9bd5d4443075 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1252,8 +1252,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;