diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2cea37b8256..886cda6033ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3938,13 +3938,9 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime { }; - himitsu = callPackage ../tools/security/himitsu { - inherit (harePackages) hare; - }; + himitsu = callPackage ../tools/security/himitsu { }; - himitsu-firefox = callPackage ../tools/security/himitsu-firefox { - inherit (harePackages) hare; - }; + himitsu-firefox = callPackage ../tools/security/himitsu-firefox { }; hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; @@ -9113,8 +9109,11 @@ with pkgs; llvmPackages = llvmPackages_16; }; - harePackages = recurseIntoAttrs (callPackage ./hare-packages.nix { }); - inherit (harePackages) hare harec; + hare = callPackage ../development/compilers/hare { }; + + harec = callPackage ../development/compilers/harec { }; + + hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); ham = pkgs.perlPackages.ham; diff --git a/pkgs/top-level/hare-packages.nix b/pkgs/top-level/hare-packages.nix deleted file mode 100644 index c40cce493090..000000000000 --- a/pkgs/top-level/hare-packages.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, newScope }: - -lib.makeScope newScope (self: -let - inherit (self) callPackage; -in -{ - harec = callPackage ../development/compilers/harec { }; - hare = callPackage ../development/compilers/hare { }; -}) diff --git a/pkgs/top-level/hare-third-party.nix b/pkgs/top-level/hare-third-party.nix new file mode 100644 index 000000000000..524df05659f4 --- /dev/null +++ b/pkgs/top-level/hare-third-party.nix @@ -0,0 +1,7 @@ +{ lib, newScope }: + +lib.makeScope newScope (self: +let + inherit (self) callPackage; +in +{ })