File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -696,7 +696,12 @@ final: prev: {
696
696
pkgs = ( hackage : {
697
697
packages = final . lib . listToAttrs (
698
698
final . lib . concatMap ( p :
699
- final . lib . optional ( p . type == "pre-existing" || ( p . type == "configured" && ( p . style == "global" || p . style == "inplace" ) ) ) {
699
+ final . lib . optional ( p . type == "pre-existing" ) {
700
+ name = to-key p ;
701
+ value . revision = null ;
702
+ } ) plan-json . install-plan
703
+ ++ final . lib . concatMap ( p :
704
+ final . lib . optional ( p . type == "configured" && ( p . style == "global" || p . style == "inplace" ) ) {
700
705
name = to-key p ;
701
706
value . revision =
702
707
{ hsPkgs , ...} @args :
@@ -713,9 +718,8 @@ final: prev: {
713
718
} // {
714
719
flags = p . flags ;
715
720
components = getComponents cabal2nix . components hsPkgs p ;
716
- package = cabal2nix . package // final . lib . optionalAttrs ( p . type != "pre-existing" ) {
721
+ package = cabal2nix . package // {
717
722
identifier = { name = p . pkg-name ; version = p . pkg-version ; } ;
718
- } // {
719
723
isProject = false ;
720
724
setup-depends = map ( lookupDependency hsPkgs . pkgsBuildBuild ) ( p . components . setup . depends or [ ] ) ;
721
725
# TODO = map (lookupExeDependency hsPkgs.pkgsBuildBuild) (p.components.setup.exe-depends or []);
You can’t perform that action at this time.
0 commit comments