git.iko.soy/typeable/cabal2nix
on master help sign in
distribution-nixpkgs: fix readNixpkgSet with non-absolute repository paths
48e0804Peter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/PackageMap.hs+1−1
@@ -26,7 +26,7 @@ readNixpkgPackageMap nixpkgs attrpath = fmap identifierSet2PackageMap (readNixpk
26readNixpkgSet :: FilePath -> Maybe Path -> IO (Set String)
26readNixpkgSet :: FilePath -> Maybe Path -> IO (Set String)
27readNixpkgSet nixpkgs attrpath = do
27readNixpkgSet nixpkgs attrpath = do
28 let extraArgs = maybe [] (\p -> ["-A", render (pPrint p)]) attrpath
28 let extraArgs = maybe [] (\p -> ["-A", render (pPrint p)]) attrpath
29− (_, Just h, _, _) <- createProcess (proc "nix-env" (["-qaP", "--json", "-f"++nixpkgs] ++ extraArgs))
29+ (_, Just h, _, _) <- createProcess (proc "nix-env" (["-qaP", "--json", "-f", nixpkgs] ++ extraArgs))
30 { std_out = CreatePipe, env = Nothing } -- TODO: ensure that overrides don't screw up our results
30 { std_out = CreatePipe, env = Nothing } -- TODO: ensure that overrides don't screw up our results
31 buf <- LBS.hGetContents h
31 buf <- LBS.hGetContents h
32 let pkgmap :: Either String (Map String JSON.Object)
32 let pkgmap :: Either String (Map String JSON.Object)