git.iko.soy/typeable/cabal2nix
on master help sign in
Replace reference to obsolete nix-prefetch-zip with nix-prefetch-url --unpack
88b8edbKen Micklas
src/Distribution/Nixpkgs/Fetch.hs+1−1
compare with master
unifiedsplit
@@ -105,7 +105,7 @@ fetch f = runMaybeT . fetchers where
105 localArchive :: FilePath -> MaybeT IO (DerivationSource, a)
105 localArchive :: FilePath -> MaybeT IO (DerivationSource, a)
106 localArchive path = do
106 localArchive path = do
107 absolutePath <- liftIO $ canonicalizePath path
107 absolutePath <- liftIO $ canonicalizePath path
108− unpacked <- snd <$> fetchWith (False, "zip", []) (Source ("file://" ++ absolutePath) "" UnknownHash ".")
108+ unpacked <- snd <$> fetchWith (False, "url", ["--unpack"]) (Source ("file://" ++ absolutePath) "" UnknownHash ".")
109 process (DerivationSource "" absolutePath "" "", unpacked)
109 process (DerivationSource "" absolutePath "" "", unpacked)
110
110
111 process :: (DerivationSource, FilePath) -> MaybeT IO (DerivationSource, a)
111 process :: (DerivationSource, FilePath) -> MaybeT IO (DerivationSource, a)