mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-29 16:24:10 +00:00
ffmpeg_3: drop
This commit is contained in:
parent
ec87404e71
commit
8f390037eb
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
|
||||
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
|
||||
poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio,
|
||||
poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio,
|
||||
qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
@ -74,7 +74,7 @@ let
|
||||
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL
|
||||
libpng ffmpeg openexr opencolorio_1 openimageio boost libGL
|
||||
seexpr libraw openjpeg libwebp
|
||||
];
|
||||
})
|
||||
@ -135,5 +135,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ maintainers.puffnfresh ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # Last evaluated on Hydra on 2021-05-18
|
||||
};
|
||||
}
|
||||
|
@ -1,15 +0,0 @@
|
||||
{ callPackage
|
||||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = branch;
|
||||
branch = "3.4.8";
|
||||
sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2021-30123"
|
||||
];
|
||||
} // args)
|
@ -323,6 +323,7 @@ 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_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";
|
||||
@ -344,7 +345,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.
|
||||
|
@ -16730,9 +16730,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;
|
||||
};
|
||||
@ -16741,7 +16738,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
|
||||
|
Loading…
Reference in New Issue
Block a user