Skip to content

Commit

Permalink
liquidsoap: 2.2.5 → 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
momeemt authored and vbgl committed Jan 20, 2025
1 parent be35633 commit f5998af
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/ffmpeg/base.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ lib, fetchFromGitHub }:

rec {
version = "1.1.11";
version = "1.2.1";

src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ffmpeg";
rev = "refs/tags/v${version}";
sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA=";
sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg=";
};

meta = with lib; {
Expand Down
19 changes: 16 additions & 3 deletions pkgs/tools/audio/liquidsoap/full.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
stdenv,
makeWrapper,
fetchFromGitHub,
fetchpatch,
which,
pkg-config,
libjpeg,
Expand All @@ -23,7 +24,7 @@

let
pname = "liquidsoap";
version = "2.2.5";
version = "2.3.0";
in
stdenv.mkDerivation {
inherit pname version;
Expand All @@ -32,9 +33,18 @@ stdenv.mkDerivation {
owner = "savonet";
repo = "liquidsoap";
rev = "refs/tags/v${version}";
hash = "sha256-o3P7oTizO2l2WkB4LormZ/Ses5jZOpgQ1r1zB1Y3Bjs=";
hash = "sha256-wNOENkIQw8LWfceI24aa8Ja3ZkePgTIGdIpGgqs/3Ss=";
};

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)"
Expand Down Expand Up @@ -88,18 +98,21 @@ stdenv.mkDerivation {
ocamlPackages.duppy
ocamlPackages.mm
ocamlPackages.ocurl
ocamlPackages.ocaml_pcre
ocamlPackages.re
ocamlPackages.cry
ocamlPackages.camomile
ocamlPackages.uri
ocamlPackages.fileutils
ocamlPackages.magic-mime
ocamlPackages.menhir # liquidsoap-lang
ocamlPackages.menhirLib
ocamlPackages.mem_usage
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

# Recommended dependencies
Expand Down

0 comments on commit f5998af

Please sign in to comment.