about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-03-27 12:52:12 +0200
committerGitHub <noreply@github.com>2022-03-27 12:52:12 +0200
commit5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf (patch)
treedcd7c7abea84063194658b23cf2476bac225467d /pkgs/top-level/all-packages.nix
parentb240a774b33f3600910c757b861d9673ce1e3c54 (diff)
parentf0cac4d2ba5b8c1f27b781d85af5f3645d1aa078 (diff)
downloadnixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar.gz
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar.bz2
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar.lz
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar.xz
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.tar.zst
nixlib-5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf.zip
Merge pull request #163509 from NixOS/drop/ffmpeg_3
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fed09cd9f584..2044082af767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16748,9 +16748,6 @@ with pkgs;
 
   linbox = callPackage ../development/libraries/linbox { };
 
-  ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
-  };
   ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
   };
@@ -16759,7 +16756,6 @@ with pkgs;
   };
 
   # Aliases
-  ffmpeg_3 = ffmpeg_3_4;
   # Please make sure this is updated to the latest version on the next major
   # update to ffmpeg
   # Packages which use ffmpeg as a library, should pin to the relevant major
@@ -16784,8 +16780,6 @@ with pkgs;
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
 
-  ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { };
-
   ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { };
 
   ffms = callPackage ../development/libraries/ffms { };