Skip to content

Commit

Permalink
ocamlPackages.ffmpeg: 1.1.7 -> 1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
dali99 committed Nov 16, 2023
1 parent e855936 commit 64391b8
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 12 deletions.
6 changes: 2 additions & 4 deletions pkgs/development/ocaml-modules/ffmpeg/base.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{ lib, fetchFromGitHub }:

rec {
version = "1.1.7";

duneVersion = "3";
version = "1.1.8";

src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ffmpeg";
rev = "v${version}";
sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4=";
sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk=";
};

meta = with lib; {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

propagatedBuildInputs = [
ffmpeg-avutil
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildDunePackage {

minimalOCamlVersion = "4.08";

inherit (ffmpeg-base) version src duneVersion;
inherit (ffmpeg-base) version src;

nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
Expand Down

0 comments on commit 64391b8

Please sign in to comment.