From 8eeecd653d5d9c304884b71ca1c47adc1a9224fe Mon Sep 17 00:00:00 2001 From: Piotr Bogdan <ppbogdan@gmail.com> Date: Sun, 11 Nov 2018 01:25:04 +0000 Subject: [PATCH] ffmpeg_1: drop --- pkgs/development/libraries/ffmpeg/1.2.nix | 8 -------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/1.2.nix diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix deleted file mode 100644 index 312eb70fdf20..000000000000 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.12"; - branch = "1.2"; - sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; - patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1721716af90..4a41013f018a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9750,9 +9750,6 @@ in ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -9765,7 +9762,6 @@ in # Aliases ffmpeg_0 = ffmpeg_0_10; - ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3;