From 8646483b76ee79c64157944ca8efcc359ba7c290 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 27 Aug 2025 20:15:23 +0200 Subject: [PATCH] =?UTF-8?q?liquidsoap:=202.3.0=20=E2=86=92=202.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.ogg: 0.7.4 → 1.0.0 ocamlPackages.flac: 0.5.1 → 1.0.0 ocamlPackages.opus: 0.2.2 → 1.0.0 ocamlPackages.speex: 0.4.1 → 1.0.0 ocamlPackages.theora: 0.4.1 → 1.0.0 ocamlPackages.vorbis: 0.8.0 → 1.0.0 --- pkgs/development/ocaml-modules/flac/default.nix | 9 +-------- pkgs/development/ocaml-modules/ogg/default.nix | 8 ++++---- pkgs/development/ocaml-modules/opus/default.nix | 13 ++----------- .../development/ocaml-modules/speex/default.nix | 13 ++----------- .../ocaml-modules/theora/default.nix | 13 ++----------- .../ocaml-modules/vorbis/default.nix | 13 ++----------- pkgs/tools/audio/liquidsoap/full.nix | 17 +++-------------- 7 files changed, 16 insertions(+), 70 deletions(-) diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index 16283af681ea..3ba28f702a47 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -10,14 +10,7 @@ buildDunePackage rec { pname = "flac"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "savonet"; - repo = "ocaml-flac"; - rev = "v${version}"; - sha256 = "sha256-68zunpRIX4lrRsKJhDF3Sre6Rp3g+ntP19ObFqG57jE="; - }; + inherit (ogg) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix index b815923bb911..397584afa126 100644 --- a/pkgs/development/ocaml-modules/ogg/default.nix +++ b/pkgs/development/ocaml-modules/ogg/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "ogg"; - version = "0.7.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "savonet"; - repo = "ocaml-ogg"; - rev = "v${version}"; - sha256 = "sha256-S6rJw90c//a9d63weCLuOBoQwNqbpTb+lRytvHUOZuc="; + repo = "ocaml-xiph"; + tag = "v${version}"; + hash = "sha256-mVMuPPjQRfwtQqpoUaEtTilMcGO0MJ4xiOd0D7ucOEQ="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix index 693426fb2356..443b03c74a32 100644 --- a/pkgs/development/ocaml-modules/opus/default.nix +++ b/pkgs/development/ocaml-modules/opus/default.nix @@ -8,18 +8,9 @@ libopus, }: -buildDunePackage rec { +buildDunePackage { pname = "opus"; - version = "0.2.2"; - - duneVersion = "3"; - - src = fetchFromGitHub { - owner = "savonet"; - repo = "ocaml-opus"; - rev = "v${version}"; - hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; - }; + inherit (ogg) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/speex/default.nix b/pkgs/development/ocaml-modules/speex/default.nix index e0e8da318dd9..817ff4cd78f8 100644 --- a/pkgs/development/ocaml-modules/speex/default.nix +++ b/pkgs/development/ocaml-modules/speex/default.nix @@ -7,18 +7,9 @@ speex, }: -buildDunePackage rec { +buildDunePackage { pname = "speex"; - version = "0.4.1"; - - useDune2 = true; - - src = fetchFromGitHub { - owner = "savonet"; - repo = "ocaml-speex"; - rev = "v${version}"; - sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab"; - }; + inherit (ogg) version src; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix index e0aa39107f8b..e0e96710aafb 100644 --- a/pkgs/development/ocaml-modules/theora/default.nix +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -7,18 +7,9 @@ libtheora, }: -buildDunePackage rec { +buildDunePackage { pname = "theora"; - version = "0.4.1"; - - duneVersion = "3"; - - src = fetchFromGitHub { - owner = "savonet"; - repo = "ocaml-theora"; - rev = "v${version}"; - hash = "sha256-2FXB5BOBRQhnpEmdlYBdZZXuXW9K+1cu7akJQDuDAMc="; - }; + inherit (ogg) version src; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix index 968c51f5e373..500494448462 100644 --- a/pkgs/development/ocaml-modules/vorbis/default.nix +++ b/pkgs/development/ocaml-modules/vorbis/default.nix @@ -7,18 +7,9 @@ libvorbis, }: -buildDunePackage rec { +buildDunePackage { pname = "vorbis"; - version = "0.8.0"; - - duneVersion = "3"; - - src = fetchFromGitHub { - owner = "savonet"; - repo = "ocaml-vorbis"; - rev = "v${version}"; - hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk="; - }; + inherit (ogg) version src; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index cd3163bdb4bc..9e1d921b3541 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -3,7 +3,6 @@ stdenv, makeWrapper, fetchFromGitHub, - fetchpatch, which, pkg-config, libjpeg, @@ -24,7 +23,7 @@ let pname = "liquidsoap"; - version = "2.3.0"; + version = "2.3.3"; in stdenv.mkDerivation { inherit pname version; @@ -33,18 +32,9 @@ stdenv.mkDerivation { owner = "savonet"; repo = "liquidsoap"; rev = "refs/tags/v${version}"; - hash = "sha256-wNOENkIQw8LWfceI24aa8Ja3ZkePgTIGdIpGgqs/3Ss="; + hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k="; }; - patches = [ - # Compatibility with saturn_lockfree 0.5.0 - (fetchpatch { - url = "https://github.com/savonet/liquidsoap/commit/3d6d2d9cd1c7750f2e97449516235a692b28bf56.patch"; - includes = [ "src/*" ]; - hash = "sha256-pmC3gwmkv+Hat61aulNkTKS4xMz+4D94OCMtzhzNfT4="; - }) - ]; - postPatch = '' substituteInPlace src/lang/dune \ --replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" @@ -113,10 +103,10 @@ stdenv.mkDerivation { ocamlPackages.metadata ocamlPackages.dune-build-info ocamlPackages.re - ocamlPackages.saturn_lockfree # liquidsoap-lang ocamlPackages.sedlex # liquidsoap-lang ocamlPackages.ppx_hash # liquidsoap-lang ocamlPackages.ppx_string + ocamlPackages.xml-light # liquidsoap-lang # Recommended dependencies ocamlPackages.ffmpeg @@ -133,7 +123,6 @@ stdenv.mkDerivation { ocamlPackages.frei0r ocamlPackages.gd ocamlPackages.graphics - # ocamlPackages.gstreamer # Broken but advertised feature ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa