dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

hare: refactor harePackages into hareThirdParty

Browse Source 
The name `harePackages` may give thet impression that programs written in
Hare should be added to its scope, which is not true: its purpose is to
encapsulate Hare third party libraries.

Thus, changing it to `hareThirdParty` makes it clear what its purpose
is --- just like renaming `hare-packages.nix` to `hare-third-party.nix`
on `pkgs/top-level`.

Moreover, remove the `hare` and `harec` packages from the newly renamed
`hareThirdParty` scope, since they are not Hare libraries.

Finally, remove the inheritance of `harePackages.hare` on `himitsu` and
`himitsu-firefox`, the two programs using `hare` on nixpkgs: both `hare`
and `harec` are directly accessible since 12449072[1], when they were
moved from `aliases.nix` to `all-packages.nix`, with the difference now
that they do not belong anymore to `harePackages` --- now `hareThirdParty`.

[1]: 1244907222
This commit is contained in:
Gustavo Coutinho de Souza 2023-11-25 13:11:50 -03:00
parent 94ef0a58a3
commit 444195a47e
No known key found for this signature in database
GPG Key ID: 87B914AD813AA7C7
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/all-packages.nix
View File

@ -3945,13 +3945,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;
@ -9126,8 +9122,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;

10
pkgs/top-level/hare-packages.nix
View File

@ -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 { };
})

7
pkgs/top-level/hare-third-party.nix Normal file
View File

@ -0,0 +1,7 @@
{ lib, newScope }:
lib.makeScope newScope (self:
let
inherit (self) callPackage;
in
{ })