gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liquidsoap: 2.3.3 → 2.4.2

Browse Source
This commit is contained in:
Juanjo Presa
2026-01-24 11:53:23 +01:00
parent 6878e9ed91
commit 812f343e8a
11 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/ffmpeg/base.nix
+3 -2
View File
@@ -1,13 +1,13 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.2.5";
version = "1.2.8";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ffmpeg";
tag = "v${version}";
hash = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
hash = "sha256-wQvpbvAAg4tybAFdGq0O9vfCc0v2iPFk04Q3zgTwa7Y=";
};
meta = {
@@ -18,6 +18,7 @@ rec {
maintainers = with lib.maintainers; [
dandellion
momeemt
juaningan
];
};
}
pkgs/development/ocaml-modules/ffmpeg/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@
buildDunePackage {
pname = "ffmpeg";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
+1 -1
View File
@@ -12,7 +12,7 @@
buildDunePackage {
pname = "ffmpeg-av";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
+1 -1
View File
@@ -11,7 +11,7 @@
buildDunePackage {
pname = "ffmpeg-avcodec";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
+1 -1
View File
@@ -11,7 +11,7 @@
buildDunePackage {
pname = "ffmpeg-avdevice";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
+1 -1
View File
@@ -11,7 +11,7 @@
buildDunePackage {
pname = "ffmpeg-avfilter";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
+1 -1
View File
@@ -11,7 +11,7 @@
buildDunePackage {
pname = "ffmpeg-avutil";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
+1 -1
View File
@@ -12,7 +12,7 @@
buildDunePackage {
pname = "ffmpeg-swresample";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
+1 -1
View File
@@ -11,7 +11,7 @@
buildDunePackage {
pname = "ffmpeg-swscale";
minimalOCamlVersion = "4.08";
minimalOCamlVersion = "4.12";
inherit (ffmpeg-base) version src;
pkgs/tools/audio/liquidsoap/full.nix
+9 -11
View File
@@ -21,26 +21,22 @@
yt-dlp
],
}:
let
stdenv.mkDerivation (finalAttrs: {
pname = "liquidsoap";
version = "2.3.3";
in
stdenv.mkDerivation {
inherit pname version;
version = "2.4.2";
src = fetchFromGitHub {
owner = "savonet";
repo = "liquidsoap";
tag = "v${version}";
hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k=";
tag = "v${finalAttrs.version}";
hash = "sha256-ViJlG+AUncL37mltlFFXVho98Up11qZI3wwSnrd9C8g=";
};
postPatch = ''
substituteInPlace src/lang/dune \
substituteInPlace src/lang/base/dune \
--replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
# Compatibility with camlimages 5.0.5
substituteInPlace src/core/dune \
substituteInPlace src/core/optionals/camlimages/dune \
--replace-warn camlimages.all_formats camlimages.core
'';
@@ -141,6 +137,7 @@ stdenv.mkDerivation {
ocamlPackages.shine
ocamlPackages.soundtouch
ocamlPackages.speex
ocamlPackages.ocaml_sqlite3
ocamlPackages.srt
ocamlPackages.ssl
ocamlPackages.taglib
@@ -160,8 +157,9 @@ stdenv.mkDerivation {
changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md";
maintainers = with lib.maintainers; [
dandellion
juaningan
];
license = lib.licenses.gpl2Plus;
platforms = ocamlPackages.ocaml.meta.platforms or [ ];
};
}
})
pkgs/top-level/ocaml-packages.nix
+7 -7
View File
@@ -626,25 +626,25 @@ let
ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix {
ffmpeg = pkgs.ffmpeg_6;
ffmpeg = pkgs.ffmpeg_8;
};
fiber = callPackage ../development/ocaml-modules/fiber { };