diff options
| -rw-r--r-- | pkgs/applications/video/natron/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-sixel/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
5 files changed, 5 insertions, 61 deletions
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index ea8a801d1954..82eaa30bba3e 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -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 }; } diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix deleted file mode 100644 index daa03d0293a0..000000000000 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm -}: - -stdenv.mkDerivation { - - pname = "ffmpeg-sixel"; - version = "nightly-2.3.x"; - - src = fetchFromGitHub { - owner = "saitoha"; - repo = "FFmpeg-SIXEL"; - rev = "8566fdb8b7516b54aed58f329dc216e06fc10052"; - sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libsixel - yasm - ]; - - configurePhase = '' - ./configure --enable-libsixel --prefix=$out - ''; - - postInstall = '' - mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel - ''; - - meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics"; - homepage = "http://www.ffmpeg.org/"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ vrthra ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix deleted file mode 100644 index 25c0a12f731a..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ /dev/null @@ -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) 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 { }; |