@@ -712,6 +712,7 @@ final: prev: {
712
712
flags = p . flags ;
713
713
components = getComponents cabal2nix . components hsPkgs p ;
714
714
package = cabal2nix . package // {
715
+ identifier = { name = p . pkg-name ; version = p . pkg-version ; } ;
715
716
isProject = false ;
716
717
setup-depends = map ( lookupDependency hsPkgs . pkgsBuildBuild ) ( p . components . setup . depends or [ ] ) ;
717
718
# TODO = map (lookupExeDependency hsPkgs.pkgsBuildBuild) (p.components.setup.exe-depends or []);
@@ -738,6 +739,7 @@ final: prev: {
738
739
flags = p . flags ;
739
740
components = getComponents cabal2nix . components hsPkgs p ;
740
741
package = cabal2nix . package // {
742
+ identifier = { name = p . pkg-name ; version = p . pkg-version ; } ;
741
743
isProject = true ;
742
744
setup-depends = map ( lookupDependency hsPkgs . pkgsBuildBuild ) ( p . components . setup . depends or [ ] ) ;
743
745
# TODO = map (lookupExeDependency hsPkgs.pkgsBuildBuild) (p.components.setup.exe-depends or []);
@@ -767,9 +769,9 @@ final: prev: {
767
769
library = mapOptions components . library ;
768
770
} // final . lib . optionalAttrs ( components . setup or null != null ) {
769
771
setup = mapOptions components . setup ;
770
- } // builtins . mapAttrs ( ctype : cs : builtins . mapAttrs ( cname : c : __trace " ${ ctype } ${ cname } " mapOptions c ) cs ) ( builtins . removeAttrs components [ "library" "setup" ] ) ) ;
772
+ } // builtins . mapAttrs ( ctype : cs : builtins . mapAttrs ( cname : c : mapOptions c ) cs ) ( builtins . removeAttrs components [ "library" "setup" ] ) ) ;
771
773
} // builtins . mapAttrs ( n : _ :
772
- final . lib . mkIf ( config . packages ? ${ p . pkg-name } ) ( final . lib . mkOverride ( if n == "src" then 90 else 995 ) config . packages . ${ p . pkg-name } . ${ n } ) )
774
+ final . lib . mkIf ( config . packages ? ${ p . pkg-name } ) ( final . lib . mkOverride ( if n == "src" then ( if config . packages . ${ p . pkg-name } . src != null then 90 else 10000 ) else 995 ) config . packages . ${ p . pkg-name } . ${ n } ) )
773
775
( ( import ../modules/package-options.nix { inherit haskellLib ; inherit ( final ) lib ; } ) . options // { src = { } ; } ) ;
774
776
} ) ( final . lib . filter ( p : to-key p != p . pkg-name ) plan-json . install-plan ) ) ;
775
777
} )
0 commit comments