liquidsoap: 2.1.4 -> 2.2.2

Diff: https://github.com/savonet/liquidsoap/compare/v2.1.4...v2.2.2

Cleans up the depencies, and swaps out youtube-dl for yt-dlp

+65 -28
+65 -28
pkgs/tools/audio/liquidsoap/full.nix
··· 1 - { lib, stdenv, makeWrapper, fetchurl, which, pkg-config 1 + { lib, stdenv, makeWrapper, fetchFromGitHub, which, pkg-config 2 2 , libjpeg 3 3 , ocamlPackages 4 - , awscli2, curl, ffmpeg, youtube-dl 5 - , runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ] 4 + , awscli2, bubblewrap, curl, ffmpeg, yt-dlp 5 + , runtimePackages ? [ awscli2 bubblewrap curl ffmpeg yt-dlp ] 6 6 }: 7 7 8 8 let 9 9 pname = "liquidsoap"; 10 - version = "2.1.4"; 10 + version = "2.2.2"; 11 11 in 12 12 stdenv.mkDerivation { 13 13 inherit pname version; 14 14 15 - src = fetchurl { 16 - url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; 17 - sha256 = "sha256-GQuG7f9U+/HqPcuj6hnBoH5mWEhxSwWgBnkCuLqHTAc="; 15 + src = fetchFromGitHub { 16 + owner = "savonet"; 17 + repo = "liquidsoap"; 18 + rev = "refs/tags/v${version}"; 19 + hash = "sha256-t7rkWHSAd3DaTCXaGfL9NcIQYT+f4Od9D6huuZlwhWk="; 18 20 }; 19 21 20 - postFixup = '' 22 + postPatch = '' 23 + substituteInPlace src/lang/dune \ 24 + --replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" 25 + ''; 26 + 27 + dontConfigure = true; 28 + 29 + buildPhase = '' 30 + runHook preBuild 31 + 32 + dune build 33 + 34 + runHook postBuild 35 + ''; 36 + 37 + installPhase = '' 38 + runHook preInstall 39 + 40 + dune install --prefix "$out" 41 + 42 + runHook postInstall 43 + ''; 44 + 45 + fixupPhase = '' 46 + runHook preFixup 47 + 21 48 wrapProgram $out/bin/liquidsoap \ 22 49 --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \ 23 50 --prefix PATH : ${lib.makeBinPath runtimePackages} 51 + 52 + runHook postFixup 24 53 ''; 25 54 26 - 27 55 strictDeps = true; 28 56 29 - nativeBuildInputs = 30 - [ makeWrapper pkg-config which 31 - ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir 32 - ]; 57 + nativeBuildInputs = [ 58 + makeWrapper 59 + pkg-config 60 + which 61 + ocamlPackages.ocaml 62 + ocamlPackages.dune_3 63 + ocamlPackages.findlib 64 + ocamlPackages.menhir 65 + ]; 33 66 34 67 buildInputs = [ 35 68 libjpeg ··· 38 71 ocamlPackages.dtools 39 72 ocamlPackages.duppy 40 73 ocamlPackages.mm 41 - ocamlPackages.ocaml_pcre 42 - ocamlPackages.menhir ocamlPackages.menhirLib 43 - (ocamlPackages.camomile.override { version = "1.0.2"; }) 44 74 ocamlPackages.ocurl 75 + ocamlPackages.cry 76 + ocamlPackages.camomile 45 77 ocamlPackages.uri 46 - ocamlPackages.sedlex 78 + ocamlPackages.fileutils 79 + ocamlPackages.menhir # liquidsoap-lang 80 + ocamlPackages.menhirLib 81 + ocamlPackages.metadata 82 + ocamlPackages.dune-build-info 83 + ocamlPackages.re 84 + ocamlPackages.sedlex # liquidsoap-lang 85 + ocamlPackages.ppx_string 47 86 48 87 # Recommended dependencies 49 88 ocamlPackages.ffmpeg 50 89 51 90 # Optional dependencies 52 - ocamlPackages.camlimages 53 - ocamlPackages.gd4o 54 91 ocamlPackages.alsa 55 92 ocamlPackages.ao 56 93 ocamlPackages.bjack 57 - ocamlPackages.cry 94 + ocamlPackages.camlimages 58 95 ocamlPackages.dssi 59 96 ocamlPackages.faad 60 97 ocamlPackages.fdkaac 61 98 ocamlPackages.flac 62 99 ocamlPackages.frei0r 100 + ocamlPackages.gd4o 101 + ocamlPackages.graphics 63 102 ocamlPackages.gstreamer 103 + ocamlPackages.imagelib 64 104 ocamlPackages.inotify 65 105 ocamlPackages.ladspa 66 106 ocamlPackages.lame ··· 72 112 ocamlPackages.ogg 73 113 ocamlPackages.opus 74 114 ocamlPackages.portaudio 115 + ocamlPackages.posix-time2 75 116 ocamlPackages.pulseaudio 117 + ocamlPackages.samplerate 76 118 ocamlPackages.shine 77 - ocamlPackages.samplerate 78 119 ocamlPackages.soundtouch 79 120 ocamlPackages.speex 80 121 ocamlPackages.srt 81 122 ocamlPackages.ssl 82 123 ocamlPackages.taglib 83 124 ocamlPackages.theora 84 - ocamlPackages.vorbis 85 - ocamlPackages.xmlplaylist 86 - ocamlPackages.posix-time2 87 125 ocamlPackages.tsdl 88 126 ocamlPackages.tsdl-image 89 127 ocamlPackages.tsdl-ttf 90 - 91 - # Undocumented dependencies 92 - ocamlPackages.graphics 93 - ocamlPackages.cohttp-lwt-unix 128 + ocamlPackages.vorbis 129 + ocamlPackages.xmlplaylist 130 + ocamlPackages.yaml 94 131 ]; 95 132 96 133 meta = with lib; {