File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -659,7 +659,7 @@ final: prev: {
659
659
hsPkgs . pkgsBuildBuild . ${ to-key by-id . ${ d } } . components . exes . ${ final . lib . removePrefix "exe:" by-id . ${ d } . component-name } ;
660
660
getComponents = cabal2nixComponents : hsPkgs : p :
661
661
let
662
- components = p . components or { ${ p . component-name } = { inherit ( p ) depends exe-depends ; } ; } ;
662
+ components = p . components or { ${ p . component-name or "lib" } = { inherit ( p ) depends exe-depends ; } ; } ;
663
663
componentsWithPrefix = collectionName : prefix :
664
664
final . lib . listToAttrs ( final . lib . concatLists ( final . lib . mapAttrsToList ( n : c :
665
665
final . lib . optional ( final . lib . hasPrefix "${ prefix } :" n ) (
@@ -749,6 +749,16 @@ final: prev: {
749
749
final . lib . concatMap ( p :
750
750
final . lib . optional ( p . type == "pre-existing" ) p . pkg-name ) plan-json . install-plan ;
751
751
}
752
+ ( { config , ...} : {
753
+ packages = final . lib . listToAttrs ( map ( p : {
754
+ name = to-key p ;
755
+ value . components = final . lib . optionalAttrs ( config . packages ? ${ p . pkg-name } ) (
756
+ builtins . mapAttrs ( _ : x : builtins . mapAttrs ( _ : x : final . lib . mkOverride 990 x )
757
+ ( builtins . removeAttrs x [ "buildable" "planned" "depends" "build-tools" ] ) )
758
+ ( final . lib . filterAttrs ( _ : x : x != null ) config . packages . ${ p . pkg-name } . components )
759
+ ) ;
760
+ } ) ( final . lib . filter ( p : to-key p != p . pkg-name ) plan-json . install-plan ) ) ;
761
+ } )
752
762
( { lib , ...} : {
753
763
packages = final . lib . listToAttrs ( map ( p :
754
764
let components =
You can’t perform that action at this time.
0 commit comments