From 76625e41fbec2b75e5a943ce9465d9e4ec21ae59 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 17 Jan 2026 03:36:33 +0100 Subject: [PATCH] libbap: move to pkgs/by-name this shouldn't create any rebuilds --- .../default.nix => by-name/li/libbap/package.nix} | 13 ++++++------- pkgs/top-level/all-packages.nix | 10 ---------- 2 files changed, 6 insertions(+), 17 deletions(-) rename pkgs/{development/libraries/libbap/default.nix => by-name/li/libbap/package.nix} (88%) diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/by-name/li/libbap/package.nix similarity index 88% rename from pkgs/development/libraries/libbap/default.nix rename to pkgs/by-name/li/libbap/package.nix index 91957222f168..8b143e3c430b 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/by-name/li/libbap/package.nix @@ -2,13 +2,9 @@ lib, stdenv, fetchFromGitHub, - bap, - ocaml, - findlib, - ctypes, - ctypes-foreign, autoreconfHook, which, + ocaml-ng, }: stdenv.mkDerivation { @@ -25,10 +21,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook which + ] + ++ (with ocaml-ng.ocamlPackages_4_14; [ ocaml findlib - ]; - buildInputs = [ + ]); + + buildInputs = with ocaml-ng.ocamlPackages_4_14; [ bap ctypes ctypes-foreign diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa419238954..ae4b00cdb1d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7130,16 +7130,6 @@ with pkgs; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; - libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_14) - bap - ocaml - findlib - ctypes - ctypes-foreign - ; - }; - libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; libbassmidi = (callPackage ../development/libraries/audio/libbass { }).bassmidi;