File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -775,7 +775,7 @@ final: prev: {
775
775
in if builtins . length versions != 1
776
776
then throw "Multiple versions for ${ packageName } ${ builtins . toJSON versions } "
777
777
else let
778
- components = builtins . listToAttrs ( map ( x : { name = x . component-name ; value = x . available ; } ) packageTargets ) ;
778
+ componentsByName = builtins . listToAttrs ( map ( x : { name = x . component-name ; value = x . available ; } ) packageTargets ) ;
779
779
lookupComponent = collectionName : name : available :
780
780
let attrPath =
781
781
if collectionName == ""
@@ -795,13 +795,17 @@ final: prev: {
795
795
name = final . lib . removePrefix "${ prefix } :" n ;
796
796
value = lookupComponent collectionName name available ;
797
797
in { inherit name value ; }
798
- ) ) components ) ) ;
799
- in {
800
- components =
798
+ ) ) componentsByName ) ) ;
799
+ in rec {
800
+ identifier = { name = packageName ; version = builtins . head versions ; } ;
801
+ components =
801
802
final . lib . mapAttrs componentsWithPrefix haskellLib . componentPrefix
802
- // final . lib . optionalAttrs ( components ? lib ) {
803
- library = lookupComponent "" "" components . lib ;
803
+ // final . lib . optionalAttrs ( componentsByName ? lib ) {
804
+ library = lookupComponent "" "" componentsByName . lib ;
804
805
} ;
806
+ checks = final . recurseIntoAttrs ( builtins . mapAttrs
807
+ ( _ : d : haskellLib . check d )
808
+ ( final . lib . filterAttrs ( _ : d : d . config . doCheck ) components . tests ) ) ;
805
809
} )
806
810
( builtins . groupBy ( x : x . pkg-name ) plan-json . targets ) ) config . preExistingPkgs ;
807
811
} )
You can’t perform that action at this time.
0 commit comments