From f88f27329177e1f94d47e0bdf54432a9e09d9618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Tue, 21 May 2024 07:38:49 +0200 Subject: [PATCH] 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 --- .../ocaml-modules/duppy/default.nix | 10 +++-- .../development/ocaml-modules/ffmpeg/base.nix | 6 +-- pkgs/development/ocaml-modules/gd/default.nix | 23 ++++++++++ .../ocaml-modules/gd4o/default.nix | 42 ------------------- .../ocaml-modules/lastfm/default.nix | 14 ++++--- .../development/ocaml-modules/mad/default.nix | 6 ++- .../ocaml-modules/tsdl-image/default.nix | 4 +- .../development/ocaml-modules/uri/default.nix | 4 +- pkgs/tools/audio/liquidsoap/full.nix | 6 ++- pkgs/top-level/ocaml-packages.nix | 3 +- 10 files changed, 54 insertions(+), 64 deletions(-) create mode 100644 pkgs/development/ocaml-modules/gd/default.nix delete mode 100644 pkgs/development/ocaml-modules/gd4o/default.nix diff --git a/pkgs/development/ocaml-modules/duppy/default.nix b/pkgs/development/ocaml-modules/duppy/default.nix index 6397b1e21e5a..bae9f62d26f1 100644 --- a/pkgs/development/ocaml-modules/duppy/default.nix +++ b/pkgs/development/ocaml-modules/duppy/default.nix @@ -1,17 +1,19 @@ -{ 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"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index e8bb6128db62..bf63c00378cc 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.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; { diff --git a/pkgs/development/ocaml-modules/gd/default.nix b/pkgs/development/ocaml-modules/gd/default.nix new file mode 100644 index 000000000000..86817f05abb7 --- /dev/null +++ b/pkgs/development/ocaml-modules/gd/default.nix @@ -0,0 +1,23 @@ +{ 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 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix deleted file mode 100644 index f3206c2385a3..000000000000 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ 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 ]; - }; -} diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix index 41bdac459b31..807589e19b57 100644 --- a/pkgs/development/ocaml-modules/lastfm/default.nix +++ b/pkgs/development/ocaml-modules/lastfm/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/mad/default.nix b/pkgs/development/ocaml-modules/mad/default.nix index 79e2fd035f5a..096987f737f8 100644 --- a/pkgs/development/ocaml-modules/mad/default.nix +++ b/pkgs/development/ocaml-modules/mad/default.nix @@ -2,13 +2,15 @@ buildDunePackage rec { pname = "mad"; - version = "0.5.2"; + version = "0.5.3"; + + minimalOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-mad"; rev = "v${version}"; - sha256 = "sha256-iJjANV2M68v3C3db1n9Y8V6yJKuDBDSjtMteamndN7U="; + sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix index 3b0895b7b2f6..008822459cc1 100644 --- a/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-image"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-khLhVJuiLNNWw76gTeg4W32v5XbkwAg11bIOWl67u2k="; + hash = "sha256-mgTFwkuFJVwJmHrzHSdNh8v4ehZIcWemK+eLqjglw5o="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 2c7ab1b6e506..a5c89c76db27 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -5,12 +5,12 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; pname = "uri"; - version = "4.2.0"; + version = "4.4.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 5d749f1a818d..a845f4677754 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace src/lang/dune \ - --replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" + --replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" ''; dontConfigure = true; @@ -72,6 +72,7 @@ stdenv.mkDerivation { ocamlPackages.duppy ocamlPackages.mm ocamlPackages.ocurl + ocamlPackages.ocaml_pcre ocamlPackages.cry ocamlPackages.camomile ocamlPackages.uri @@ -98,8 +99,9 @@ stdenv.mkDerivation { ocamlPackages.fdkaac ocamlPackages.flac ocamlPackages.frei0r - ocamlPackages.gd4o + ocamlPackages.gd ocamlPackages.graphics + # ocamlPackages.gstreamer # Broken but advertised feature ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 74661127c3d7..74aa545f2b85 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -566,7 +566,8 @@ let gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; - gd4o = callPackage ../development/ocaml-modules/gd4o { }; + gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; + gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; }; gen = callPackage ../development/ocaml-modules/gen { };