From dba8bc3acdedb914ce7cf1893785e79b7954f398 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 02:08:57 +0100 Subject: [PATCH] liquidsoap: move to pkgs/by-name this shouldn't create any rebuilds --- .../full.nix => by-name/li/liquidsoap/package.nix} | 9 ++++++--- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{tools/audio/liquidsoap/full.nix => by-name/li/liquidsoap/package.nix} (97%) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/by-name/li/liquidsoap/package.nix similarity index 97% rename from pkgs/tools/audio/liquidsoap/full.nix rename to pkgs/by-name/li/liquidsoap/package.nix index 52578b24191e..5eec38b5de54 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/by-name/li/liquidsoap/package.nix @@ -6,21 +6,24 @@ which, pkg-config, libjpeg, - ocamlPackages, + ocaml-ng, awscli2, bubblewrap, curl, dune, - ffmpeg, + ffmpeg_6-full, yt-dlp, runtimePackages ? [ awscli2 bubblewrap curl - ffmpeg + ffmpeg_6-full yt-dlp ], }: +let + ocamlPackages = ocaml-ng.ocamlPackages_4_14; +in stdenv.mkDerivation (finalAttrs: { pname = "liquidsoap"; version = "2.4.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f22f19b1feea..3787e8e17938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2841,11 +2841,6 @@ with pkgs; limine-full = limine.override { enableAll = true; }; - liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_6-full; - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; - loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { }; logstash7 = callPackage ../tools/misc/logstash/7.x.nix {