diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-27 12:52:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-27 12:52:12 +0200 |
commit | 5c1f8cd19fdce40d2e0f1576b6dc744fab4837bf (patch) | |
tree | dcd7c7abea84063194658b23cf2476bac225467d /pkgs/top-level | |
parent | b240a774b33f3600910c757b861d9673ce1e3c54 (diff) | |
parent | f0cac4d2ba5b8c1f27b781d85af5f3645d1aa078 (diff) | |
download | nixlib-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')
-rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 174d2c721993..aabe31986566 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -328,6 +328,8 @@ mapAliases ({ fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 + ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; + ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; @@ -349,7 +351,6 @@ mapAliases ({ fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 - fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. 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 { }; |