43220bd · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Merge pull request #338 from obsidiansystems/no-nix-prefetch-zip

Replace reference to obsolete nix-prefetch-zip with nix-prefetch-url --unpack

commit43220bd7b8576a7b23d394f21b588187717b30d1 authorPeter Simons <simons@cryp.to> dateThu 15 Mar 2018, 20:18 (9 years ago) parent7017487 88b8edb

1 file changed+1−1

unifiedsplit

src/Distribution/Nixpkgs/Fetch.hs+1−1

@@ -105,7 +105,7 @@ fetch f = runMaybeT . fetchers where

105105 localArchive :: FilePath -> MaybeT IO (DerivationSource, a)

106106 localArchive path = do

107107 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 ".")

109109 process (DerivationSource "" absolutePath "" "", unpacked)

110110

111111 process :: (DerivationSource, FilePath) -> MaybeT IO (DerivationSource, a)