Run formulou

Author: nficca

shell.nix

@@ -9,7 +9,7 @@
     gmp_static =
       gmp.overrideAttrs (old: { dontDisableStatic = true; });
     lzma_static =
-      lzma.overrideAttrs (old: { dontDisableStatic = true; });
+      xz.overrideAttrs (old: { dontDisableStatic = true; });
   in mkShell {
     nativeBuildInputs = [
         cabal-install
@@ -19,15 +19,16 @@
         haskellPackages.cabal-fmt
         hlint
         zlib.dev
-        zlib.static
         git
-        glibc.dev
-        glibc.static
         bzip2_static
         bzip2_static.dev
         libffi_static.dev
         gmp_static.dev
         lzma_static.dev
+    ] ++ lib.optionals stdenv.isLinux [
+        zlib.static
+        glibc.dev
+        glibc.static
     ];
     shellHook = ''
       export LANG=C.UTF-8

src/Strategy/Node/Npm/PackageLockV3.hs

@@ -360,35 +360,37 @@ buildGraph pkgLockV3 = run . evalGrapher $ do
   where
     -- Returns the set of all paths that are transitive to the given set of paths.
     collectAllTransitivePaths :: Set.Set PackagePath -> Set.Set PackagePath
-    collectAllTransitivePaths paths = 
+    collectAllTransitivePaths paths =
       let go visited toVisit
             | Set.null toVisit = visited
-            | otherwise = 
+            | otherwise =
                 let (current, rest) = Set.deleteFindMin toVisit
-                in if Set.member current visited 
-                   then go visited rest
-                   else 
-                     let newChildren = collectTransitivePaths current
-                         newVisited = Set.insert current visited
-                         newToVisit = rest `Set.union` (newChildren `Set.difference` newVisited)
-                     in go newVisited newToVisit
-      in go Set.empty paths
+                 in if Set.member current visited
+                      then go visited rest
+                      else
+                        let newChildren = collectTransitivePaths current
+                            newVisited = Set.insert current visited
+                            newToVisit = rest `Set.union` (newChildren `Set.difference` newVisited)
+                         in go newVisited newToVisit
+       in go Set.empty paths
 
     -- Returns the set of all transitive paths for given package path.
     collectTransitivePaths :: PackagePath -> Set.Set PackagePath
-    collectTransitivePaths pkgPath = 
+    collectTransitivePaths pkgPath =
       case Map.lookup pkgPath (packages pkgLockV3) of
         Nothing -> Set.empty
-        Just pkgMetadata -> 
+        Just pkgMetadata ->
           let vendorPrefix = case pkgPath of
                 PackageLockV3PathKey prefix pkgName -> prefix <> unPackageName pkgName
                 _ -> ""
-              directDeps = concatMap Map.keys 
-                [ plV3PkgDependencies pkgMetadata
-                , plV3PkgPeerDependencies pkgMetadata  
-                , plV3PkgOptionalDependencies pkgMetadata
-                ]
-          in Set.fromList $ map (vendoredPathElseTopLevelPath vendorPrefix) directDeps
+              directDeps =
+                concatMap
+                  Map.keys
+                  [ plV3PkgDependencies pkgMetadata
+                  , plV3PkgPeerDependencies pkgMetadata
+                  , plV3PkgOptionalDependencies pkgMetadata
+                  ]
+           in Set.fromList $ map (vendoredPathElseTopLevelPath vendorPrefix) directDeps
 
     -- Prefer resolution path in following order of precedent:
     --