diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index b810f46bc7ba..f70aea3e038f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.2.5"; + version = "1.2.8"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; tag = "v${version}"; - hash = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8="; + hash = "sha256-wQvpbvAAg4tybAFdGq0O9vfCc0v2iPFk04Q3zgTwa7Y="; }; meta = { @@ -18,6 +18,7 @@ rec { maintainers = with lib.maintainers; [ dandellion momeemt + juaningan ]; }; } diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index 54c460bb3afc..417cd3d3f364 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { pname = "ffmpeg"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 7e59b6402605..83b703bfffdf 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -12,7 +12,7 @@ buildDunePackage { pname = "ffmpeg-av"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 88d0d8fb1dae..14cbff80bc8b 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "ffmpeg-avcodec"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index dca995a11932..9d4179616ab0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "ffmpeg-avdevice"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 547c45286b12..d9b2d203da83 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "ffmpeg-avfilter"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index c3620bfcdf4e..e86530b81b0b 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "ffmpeg-avutil"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 46acde6eeedb..102099e08222 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -12,7 +12,7 @@ buildDunePackage { pname = "ffmpeg-swresample"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a52132475082..edc37669cb15 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -11,7 +11,7 @@ buildDunePackage { pname = "ffmpeg-swscale"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; inherit (ffmpeg-base) version src; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 054c489ec44e..52578b24191e 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -21,26 +21,22 @@ yt-dlp ], }: - -let +stdenv.mkDerivation (finalAttrs: { pname = "liquidsoap"; - version = "2.3.3"; -in -stdenv.mkDerivation { - inherit pname version; + version = "2.4.2"; src = fetchFromGitHub { owner = "savonet"; repo = "liquidsoap"; - tag = "v${version}"; - hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ViJlG+AUncL37mltlFFXVho98Up11qZI3wwSnrd9C8g="; }; postPatch = '' - substituteInPlace src/lang/dune \ + substituteInPlace src/lang/base/dune \ --replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" # Compatibility with camlimages 5.0.5 - substituteInPlace src/core/dune \ + substituteInPlace src/core/optionals/camlimages/dune \ --replace-warn camlimages.all_formats camlimages.core ''; @@ -141,6 +137,7 @@ stdenv.mkDerivation { ocamlPackages.shine ocamlPackages.soundtouch ocamlPackages.speex + ocamlPackages.ocaml_sqlite3 ocamlPackages.srt ocamlPackages.ssl ocamlPackages.taglib @@ -160,8 +157,9 @@ stdenv.mkDerivation { changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md"; maintainers = with lib.maintainers; [ dandellion + juaningan ]; license = lib.licenses.gpl2Plus; platforms = ocamlPackages.ocaml.meta.platforms or [ ]; }; -} +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a73509d8cd22..93228129e5f2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -626,25 +626,25 @@ let ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { - ffmpeg = pkgs.ffmpeg_6; + ffmpeg = pkgs.ffmpeg_8; }; fiber = callPackage ../development/ocaml-modules/fiber { };