colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #269946 from onemoresuza/hare-third-party

Browse Source 
hare: refactor `harePackages` into `hareThirdParty`
This commit is contained in:
Peder Bergebakken Sundt 2023-12-01 04:16:34 +01:00 committed by GitHub
commit d2f2945795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -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;

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