From 926314334a782ccc3ae88ea771d02d5c87d2a8d9 Mon Sep 17 00:00:00 2001 From: Niols Date: Wed, 7 Jun 2023 14:51:16 +0200 Subject: [PATCH] headache: move from ocamlPackages to top-level --- .../development/{ocaml-modules => tools}/headache/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/{ocaml-modules => tools}/headache/default.nix (89%) diff --git a/pkgs/development/ocaml-modules/headache/default.nix b/pkgs/development/tools/headache/default.nix similarity index 89% rename from pkgs/development/ocaml-modules/headache/default.nix rename to pkgs/development/tools/headache/default.nix index cb36d87f87f..f156c5950b0 100644 --- a/pkgs/development/ocaml-modules/headache/default.nix +++ b/pkgs/development/tools/headache/default.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, fetchFromGitHub, camomile }: +{ lib, fetchFromGitHub, ocamlPackages }: + +with ocamlPackages; buildDunePackage rec { pname = "headache"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a1411e6224..425d36fa3f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5199,6 +5199,8 @@ with pkgs; hdate = callPackage ../applications/misc/hdate { }; + headache = callPackage ../development/tools/headache { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hebcal = callPackage ../tools/misc/hebcal { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 124bf9f4cc5..d8c4a51505f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -628,8 +628,6 @@ let hashcons = callPackage ../development/ocaml-modules/hashcons { }; - headache = callPackage ../development/ocaml-modules/headache { }; - hex = callPackage ../development/ocaml-modules/hex { }; hidapi = callPackage ../development/ocaml-modules/hidapi { };