This commit is contained in:
		
							
								
								
									
										43
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								flake.nix
									
									
									
									
									
								
							| @@ -52,31 +52,28 @@ | |||||||
|               lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope) |               lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope) | ||||||
|             ); |             ); | ||||||
|             workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages; |             workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages; | ||||||
|  |             # Disable for now | ||||||
|             recursePackageSets = |             # recursePackageSets = | ||||||
|               pkg: |             #   pkg: | ||||||
|               let |             #   let | ||||||
|                 isDrv = lib.isDerivation pkg; |             #     isDrv = lib.isDerivation pkg; | ||||||
|                 isAttrs = lib.isAttrs pkg; |             #     isAttrs = lib.isAttrs pkg; | ||||||
|                 isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg; |             #     isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg; | ||||||
|               in |             #   in | ||||||
|               if isDrv && isSameSystem then |             #   if isDrv && isSameSystem then | ||||||
|                 pkg |             #     pkg | ||||||
|               else if isAttrs then |             #   else if isAttrs then | ||||||
|                 lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg |             #     lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg | ||||||
|               else |             #   else | ||||||
|                 null; |             #     null; | ||||||
|  |             # | ||||||
|             # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now) |             # # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now) | ||||||
|             packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") ( |             # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") ( | ||||||
|               lib.mapAttrs (name: pkg: recursePackageSets pkg) scope |             #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope | ||||||
|             ); |             # ); | ||||||
|           in |           in | ||||||
|           { |           { | ||||||
|             inherit packageSets; |             packages = flatPackages; | ||||||
|             inherit flatPackages; |  | ||||||
|             inherit pkgs; |  | ||||||
|             packages = packageSets; |  | ||||||
|             checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages; |             checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages; | ||||||
|           } |           } | ||||||
|         ); |         ); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user