Unverified Commit 8a20dfad authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

Merge pull request #267817 from dali99/update_liquidsoap 

liquidsoap: 2.1.4 -> 2.2.2, update dependencies, clean up
parents 05882d1d dd625809

pkgs/development/ocaml-modules/cry/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -2,19 +2,21 @@ 


buildDunePackage rec {

  pname = "cry";

  version = "0.6.7";

  version = "1.0.1";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-cry";

    rev = "v${version}";

    sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ=";

    sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ=";

  };



  postPatch = ''

    substituteInPlace src/dune --replace bytes ""

  '';



  minimalOCamlVersion = "4.12";



  meta = with lib; {

    homepage = "https://github.com/savonet/ocaml-cry";

    description = "OCaml client for the various icecast & shoutcast source protocols";

pkgs/development/ocaml-modules/ffmpeg/base.nix

+2 −4
Original line number Diff line number Diff line 
{ 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; {

pkgs/development/ocaml-modules/ffmpeg/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ buildDunePackage { 


  minimalOCamlVersion = "4.08";



  inherit (ffmpeg-base) version src duneVersion;

  inherit (ffmpeg-base) version src;



  propagatedBuildInputs = [

    ffmpeg-avutil

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ]