talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

liquidsoap: 2.2.5 → 2.3.0

Browse Source 
ocamlPackages.ffmpeg: 1.1.11 -> 1.2.1
Changelog: https://github.com/savonet/ocaml-ffmpeg/releases/tag/v1.2.1
Diff: https://github.com/savonet/ocaml-ffmpeg/compare/v1.1.11...v1.2.1
This commit is contained in:
Mutsuha Asada 2025-01-17 23:29:34 +09:00 committed by Vincent Laporte
parent ea2225cd69
commit bb136ef6dc
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/ffmpeg/base.nix
View File

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
rec { rec {
version = "1.1.11"; version = "1.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "savonet"; owner = "savonet";
repo = "ocaml-ffmpeg"; repo = "ocaml-ffmpeg";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA="; sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg=";
}; };
meta = with lib; { meta = with lib; {

19
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -3,6 +3,7 @@
stdenv, stdenv,
makeWrapper, makeWrapper,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
which, which,
pkg-config, pkg-config,
libjpeg, libjpeg,
@ -23,7 +24,7 @@
let let
pname = "liquidsoap"; pname = "liquidsoap";
version = "2.2.5"; version = "2.3.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
@ -32,9 +33,18 @@ stdenv.mkDerivation {
owner = "savonet"; owner = "savonet";
repo = "liquidsoap"; repo = "liquidsoap";
rev = "refs/tags/v${version}"; 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 = '' postPatch = ''
substituteInPlace src/lang/dune \ substituteInPlace src/lang/dune \
--replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" --replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
@ -88,7 +98,7 @@ stdenv.mkDerivation {
ocamlPackages.duppy ocamlPackages.duppy
ocamlPackages.mm ocamlPackages.mm
ocamlPackages.ocurl ocamlPackages.ocurl
ocamlPackages.ocaml_pcre ocamlPackages.re
ocamlPackages.cry ocamlPackages.cry
ocamlPackages.camomile ocamlPackages.camomile
ocamlPackages.uri ocamlPackages.uri
@ -96,10 +106,13 @@ stdenv.mkDerivation {
ocamlPackages.magic-mime ocamlPackages.magic-mime
ocamlPackages.menhir # liquidsoap-lang ocamlPackages.menhir # liquidsoap-lang
ocamlPackages.menhirLib ocamlPackages.menhirLib
ocamlPackages.mem_usage
ocamlPackages.metadata ocamlPackages.metadata
ocamlPackages.dune-build-info ocamlPackages.dune-build-info
ocamlPackages.re ocamlPackages.re
ocamlPackages.saturn_lockfree # liquidsoap-lang
ocamlPackages.sedlex # liquidsoap-lang ocamlPackages.sedlex # liquidsoap-lang
ocamlPackages.ppx_hash # liquidsoap-lang
ocamlPackages.ppx_string ocamlPackages.ppx_string
# Recommended dependencies # Recommended dependencies