3535 ] ;
3636
3737 foldrAttrVals = f : z : attrs :
38- lib . foldr ( g : acc : g acc ) z ( lib . mapAttrsToList ( _name : f ) attrs ) ;
38+ lib . foldr f z ( builtins . attrValues attrs ) ;
3939
4040 foldComponents = tys : f : z : conf :
4141 let
9191 isExe componentId
9292 || isTest componentId
9393 || isBenchmark componentId ;
94- mayHaveExecutable = componentId :
95- isExecutableType componentId ;
94+ mayHaveExecutable = isExecutableType ;
9695
9796 # Was there a reference to the package source in the `cabal.project` or `stack.yaml` file.
9897 # This is used to make the default `packages` list for `shellFor`.
9998 isLocalPackage = p : p . isLocal or false ;
100- selectLocalPackages = ps : lib . filterAttrs ( n : p : p != null && isLocalPackage p ) ps ;
99+ selectLocalPackages = lib . filterAttrs ( n : p : p != null && isLocalPackage p ) ;
101100
102101 # if it's a project package it has a src attribute set with an origSubDir attribute.
103102 # project packages are a subset of localPackages
104103 isProjectPackage = p : p . isProject or false ;
105- selectProjectPackages = ps : lib . filterAttrs ( n : p : p != null && isLocalPackage p && isProjectPackage p ) ps ;
104+ selectProjectPackages = lib . filterAttrs ( n : p : p != null && isLocalPackage p && isProjectPackage p ) ;
106105
107106 # Format a componentId as it should appear as a target on the
108107 # command line of the setup script.
133132 ## flatLibDepends :: Component -> [Package]
134133 flatLibDepends = component :
135134 let
136- makePairs = map ( p : rec { key = val . name ; val = ( p . components . library or p ) ; } ) ;
135+ makePairs = map ( p : rec { key = val . name ; val = p . components . library or p ; } ) ;
137136 closure = builtins . genericClosure {
138137 startSet = makePairs component . depends ;
139138 operator = { val , ...} : makePairs val . config . depends ;
@@ -427,35 +426,24 @@ in {
427426 # Flake package names that are flat and match the cabal component names.
428427 mkFlakePackages = haskellPackages : builtins . listToAttrs (
429428 lib . concatLists ( lib . mapAttrsToList ( packageName : package :
430- lib . optional ( package . components library )
431- { name = "${ packageName } :lib:${ packageName } " ; value = package . components . library ; }
432- ++ lib . mapAttrsToList ( n : v :
433- { name = "${ packageName } :lib:${ n } " ; value = v ; } )
434- ( package . components . sublibs )
435- ++ lib . mapAttrsToList ( n : v :
436- { name = "${ packageName } :exe:${ n } " ; value = v ; } )
437- ( package . components . exes )
438- ++ lib . mapAttrsToList ( n : v :
439- { name = "${ packageName } :test:${ n } " ; value = v ; } )
440- ( package . components . tests )
441- ++ lib . mapAttrsToList ( n : v :
442- { name = "${ packageName } :bench:${ n } " ; value = v ; } )
443- ( package . components . benchmarks )
444- ) haskellPackages ) ) ;
429+ builtins . groupBy
430+ ( c : c . passthru . identifier . component-id )
431+ ( ( lib . optional ( package . components library ) package . components . library )
432+ ++ package . components . sublibs
433+ ++ package . components . exes
434+ ++ package . components . tests
435+ ++ package . components . benchmarks )
436+ ) haskellPackages ) ) ;
445437
446438 # Flake package names that are flat and match the cabal component names.
447439 mkFlakeApps = haskellPackages : builtins . listToAttrs (
448440 lib . concatLists ( lib . mapAttrsToList ( packageName : package :
449- lib . mapAttrsToList ( n : v :
450- { name = "${ packageName } :exe:${ n } " ; value = { type = "app" ; program = v . exePath ; } ; } )
451- ( package . components . exes )
452- ++ lib . mapAttrsToList ( n : v :
453- { name = "${ packageName } :test:${ n } " ; value = { type = "app" ; program = v . exePath ; } ; } )
454- ( package . components . tests )
455- ++ lib . mapAttrsToList ( n : v :
456- { name = "${ packageName } :benchmark:${ n } " ; value = { type = "app" ; program = v . exePath ; } ; } )
457- ( package . components . benchmarks )
458- ) haskellPackages ) ) ;
441+ builtins . groupBy
442+ ( c : c . passthru . identifier . component-id )
443+ ( package . components . exes
444+ ++ package . components . tests
445+ ++ package . components . benchmarks )
446+ ) haskellPackages ) ) ;
459447
460448 # Flatten the result of collectChecks or collectChecks' for use in flake `checks`
461449 mkFlakeChecks = allChecks : builtins . listToAttrs (
464452 lib . optionals ( lib . isAttrs checks ) (
465453 lib . mapAttrsToList ( n : v :
466454 { name = "${ packageName } :test:${ n } " ; value = v ; } )
467- ( lib . filterAttrs ( _ : v : lib . isDerivation v ) checks ) )
455+ ( lib . filterAttrs ( _ : lib . isDerivation ) checks ) )
468456 ) allChecks ) ) ;
469457
470458 removeRecurseForDerivations = x :
@@ -494,11 +482,11 @@ in {
494482 }
495483 # Build the plan-nix and check it if materialized
496484 // lib . optionalAttrs ( checkedProject ? plan-nix ) {
497- plan-nix = checkedProject . plan-nix ;
485+ inherit ( checkedProject ) plan-nix ;
498486 }
499487 # Build the stack-nix and check it if materialized
500488 // lib . optionalAttrs ( checkedProject ? stack-nix ) {
501- stack-nix = checkedProject . stack-nix ;
489+ inherit ( checkedProject ) stack-nix ;
502490 } ;
503491
504492 mkFlake = project : {
0 commit comments