diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-04-23 16:24:05 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-04-30 16:52:48 -0700 |
| commit | fe3590b5ba9002c1d1e71e19b79a7049c83f9698 (patch) | |
| tree | f695ba77b0d171e09171cbbc15ccfab0a3572d77 | |
| parent | dfd371de9b011e319be6ee1fb53ed0dfcfe10431 (diff) | |
| download | nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar.gz nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar.bz2 nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar.lz nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar.xz nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.tar.zst nixlib-fe3590b5ba9002c1d1e71e19b79a7049c83f9698.zip | |
remove ffmpeg_3_2 and ffmpeg_3_1
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.1.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.2.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 0 insertions, 32 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix deleted file mode 100644 index 8e79d1ad0e11..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, callPackage -# Darwin frameworks -, Cocoa, CoreMedia -, ... -}@args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.7"; - branch = "3.1"; - sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl"; - darwinFrameworks = [ Cocoa CoreMedia ]; - patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; -}) diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix deleted file mode 100644 index 17ed6fb0e4ba..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.2.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, callPackage -# Darwin frameworks -, Cocoa, CoreMedia -, ... -}@args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.4"; - branch = "3.2"; - sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0"; - darwinFrameworks = [ Cocoa CoreMedia ]; - patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b835dd1ca5..d654b146bdc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7461,12 +7461,6 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - }; - ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - }; ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; |