From df17e07ade611342f8df0efb61983c5ab0e6a278 Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Sun, 7 Jun 2026 16:02:36 -0700 Subject: [PATCH] blucontrol: migrate to by-name --- .../wrapper.nix => by-name/bl/blucontrol/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/blucontrol/wrapper.nix => by-name/bl/blucontrol/package.nix} (90%) diff --git a/pkgs/applications/misc/blucontrol/wrapper.nix b/pkgs/by-name/bl/blucontrol/package.nix similarity index 90% rename from pkgs/applications/misc/blucontrol/wrapper.nix rename to pkgs/by-name/bl/blucontrol/package.nix index eb004835ae20..dfa595a6a1cb 100644 --- a/pkgs/applications/misc/blucontrol/wrapper.nix +++ b/pkgs/by-name/bl/blucontrol/package.nix @@ -2,11 +2,11 @@ stdenv, lib, makeWrapper, - ghcWithPackages, + haskellPackages, packages ? (_: [ ]), }: let - blucontrolEnv = ghcWithPackages (self: [ self.blucontrol ] ++ packages self); + blucontrolEnv = haskellPackages.ghcWithPackages (self: [ self.blucontrol ] ++ packages self); in stdenv.mkDerivation { pname = "blucontrol-with-packages"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4510c6f1be..82fc3ac9432e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8760,10 +8760,6 @@ with pkgs; bitwig-studio = bitwig-studio6; - blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { - inherit (haskellPackages) ghcWithPackages; - }; - breezy = with python3Packages; toPythonApplication breezy; # calico-felix and calico-node have not been packaged due to libbpf, linking issues