diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix deleted file mode 100644 index 14c29f36bed..00000000000 --- a/pkgs/development/libraries/ffmpeg/3.0.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.2"; - branch = "3.0"; - sha256 = "0dpx15001ha9p8h8vfg1lm9pggbc96kmb546hz88wdac5xycgqrh"; -}) diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix new file mode 100644 index 00000000000..25892e18684 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "3.1"; + sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f42e835303e..5fe1ee58b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7059,14 +7059,14 @@ in ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix { + ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; # Aliases ffmpeg_0 = self.ffmpeg_0_10; ffmpeg_1 = self.ffmpeg_1_2; ffmpeg_2 = self.ffmpeg_2_8; - ffmpeg_3 = self.ffmpeg_3_0; + ffmpeg_3 = self.ffmpeg_3_1; ffmpeg = self.ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {