From 4a097fdc3fa41d5213421041910692734b5cea19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Jan 2016 11:44:16 +0100 Subject: [PATCH] ffmpeg-2.2: remove this vulnerable branch Upstream doesn't maintain it anymore and it's unused in nixpkgs. /cc #12437. --- pkgs/development/libraries/ffmpeg/2.2.nix | 7 ------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/2.2.nix diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix deleted file mode 100644 index fbbb75cb8320..000000000000 --- a/pkgs/development/libraries/ffmpeg/2.2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.15"; - branch = "2.2"; - sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ceeea9ac64c..4a1285875bc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6408,9 +6408,6 @@ let ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; };