Unverified Commit f88f2732 authored by Daniel Løvbrøtte Olsen's avatar Daniel Løvbrøtte Olsen Committed by GitHub
Browse files

Update liquidsoap and its dependencies (#310112) 

* ocamlPackages.duppy: 0.9.3 -> 0.9.4

* ocamlPackages.ffmpeg: 1.1.8 -> 1.1.11

* ocamlPackages.lastfm: 0.3.3 -> 0.3.4

* ocamlPackages.uri: 4.2.0 -> 4.4.0

Diff: https://github.com/mirage/ocaml-uri/compare/None...v4.4.0

* ocamlPackages.gd4o: remove, ocamlPackages.gd: init at 1.1

* ocamlPackages.mad: 0.5.2 -> 0.5.3

Diff: https://github.com/savonet/ocaml-mad/compare/v0.5.2...v0.5.3

* ocamlPackages.tsdl-image: 0.5 -> 0.6

Diff: https://github.com/sanette/tsdl-image/compare/0.5...0.6

* liquidsoap: small package fixups

Diff: https://github.com/savonet/liquidsoap/compare/refs/tags/v2.2.4...v2.2.5
parent fc36ca08

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

+6 −4
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitHub, ocaml_pcre }:

{ lib, buildDunePackage, fetchFromGitHub, re }:



buildDunePackage rec {

  pname = "duppy";

  version = "0.9.3";

  version = "0.9.4";



  minimalOCamlVersion = "4.07";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-duppy";

    rev = "v${version}";

    sha256 = "sha256-5U/CNQ88Wi/AgJEoFeS9O0zTPiD9ysJNQohRVJdyH9w=";

    sha256 = "sha256-rVdfAMu26YgS/TZk2XPqaR6KTDLbh9Elkf8rjhSnNO4=";

  };



  propagatedBuildInputs = [ ocaml_pcre ];

  propagatedBuildInputs = [ re ];



  meta = with lib; {

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

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

+3 −3
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub }:



rec {

  version = "1.1.8";

  version = "1.1.11";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-ffmpeg";

    rev = "v${version}";

    sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk=";

    rev = "refs/tags/v${version}";

    sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA=";

  };



  meta = with lib; {

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, gd }:



buildDunePackage rec {

  pname = "gd";

  version = "1.1";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-gd";

    rev = "v${version}";

    sha256 = "sha256-78cqxVEappTybRLk7Y6vW1POvZKFIxtGNVcmkKq9GEE=";

  };



  buildInputs = [ dune-configurator ];

  propagatedBuildInputs = [ gd ];



  meta = with lib; {

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

    description = "OCaml bindings for gd";

    license = licenses.lgpl21Only;

    maintainers = with maintainers; [ dandellion ];

  };

}

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

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, ocaml, gd, freetype, findlib, zlib, libpng, libjpeg }:



lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

  "gd4o is not available for OCaml ${ocaml.version}"



stdenv.mkDerivation rec {

  pname = "ocaml${ocaml.version}-gd4o";

  version = "1.0a5";



  src = fetchurl {

    url = "mirror://sourceforge/gd4o/gd4o/1.0%20Alpha%205/gd4o-1.0a5.tar.gz";

    sha256 = "1vbyakz7byvxmqf3hj68rw15b4kb94ppcnhvmjv38rsyg05bc47s";

  };



  buildInputs = [ ocaml findlib libjpeg libpng ];

  propagatedBuildInputs = [ gd zlib freetype ];



  makeFlags = [

    "CC=${stdenv.cc.targetPrefix}cc"

  ];



  preInstall = ''

    mkdir -p $OCAMLFIND_DESTDIR/stublibs

  '';



  buildFlags = [ "all" "opt" ];



  checkPhase = ''

    runHook preCheck

    make test.opt

    runHook postCheck

  '';



  doCheck = true;



  meta = with lib; {

    homepage = "https://sourceforge.net/projects/gd4o/";

    description = "OCaml wrapper for the GD graphics library";

    license = licenses.lgpl21Only;

    maintainers = with maintainers; [ dandellion ];

  };

}

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

+8 −6
Original line number Diff line number Diff line
@@ -3,25 +3,27 @@ 
, fetchFromGitHub

, pkg-config

, dune-configurator

, re

, xmlplaylist

, ocaml_pcre

, ocamlnet

}:



buildDunePackage rec {

  pname = "lastfm";

  version = "0.3.3";

  version = "0.3.4";



  useDune2 = true;

  minimalOCamlVersion = "4.08";



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-lastfm";

    rev = "v${version}";

    sha256 = "1sz400ny9h7fs20k7600q475q164x49ba30ls3q9y35rhm3g2y2b";

    sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg=";

  };



  propagatedBuildInputs = [ xmlplaylist ocaml_pcre ocamlnet ];

  propagatedBuildInputs = [

    re

    xmlplaylist

  ];



  meta = with lib; {

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