Skip to content

Better support for file: urls in repositories #1915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Better support for file: urls in repositories #1915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions nix-tools/lib/Cabal2Nix.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Distribution.Package
import qualified System.FilePath.Posix as FilePath.Posix
( joinPath, splitDirectories )
import Network.URI
( URI(uriAuthority, uriPath), URIAuth(..), parseURI )
( URI(uriAuthority, uriPath, uriScheme), URIAuth(..), parseURI )

import Distribution.Types.CondTree
import Distribution.Types.Library
Expand Down Expand Up @@ -221,14 +221,35 @@ toNixPackageDescription isLocal detailLevel pd = mkNonRecSet $
srcToNix :: PackageIdentifier -> Src -> NExpr
srcToNix _ (Path p) = mkRecSet [ "src" $= applyMkDefault (mkRelPath p) ]
srcToNix pi' (Repo url mHash)
= mkNonRecSet
[ "src" $= applyMkDefault (mkSym pkgs @. "fetchurl" @@ mkNonRecSet
[ "url" $= mkStr (fromString . show $ mkPrivateHackageUrl url pi')
, "sha256" $= case mHash of
Nothing -> mkSym "config" @. "sha256"
Just hash -> mkStr (fromString hash)
])
]
= let uri = mkPrivateHackageUrl url pi'
in if "file:" == uriScheme uri
then
-- It's a file: URL. In principle curl can fetch file URLs, but in
-- practice fetchurl can't. This is (I believe) because the Nix sandbox
-- is relaxed to allow fetchurl to access the internet, but _not_ to
-- let is access random files, even if it has a hash specified.
-- But builtins.path can do that, so we just use that instead.
mkNonRecSet
[ "src" $= applyMkDefault (mkSym "builtins" @. "path" @@ mkNonRecSet
[ "path" $= mkStr (fromString $ uriPath uri)
, "sha256" $= case mHash of
Nothing -> mkSym "config" @. "sha256"
Just hash -> mkStr (fromString hash)
-- needed for the hash to match what you would use for fetchurl
, "recursive" $= mkBool False
])
]
else
-- It's some other kind of URL, just use fetchurl and hope curl
-- can fetch it.
mkNonRecSet
[ "src" $= applyMkDefault (mkSym pkgs @. "fetchurl" @@ mkNonRecSet
[ "url" $= mkStr (fromString . show $ uri)
, "sha256" $= case mHash of
Nothing -> mkSym "config" @. "sha256"
Just hash -> mkStr (fromString hash)
])
]
srcToNix _ (Git url rev mbSha256 mbPath)
= mkNonRecSet $
[ "src" $= applyMkDefault (mkSym pkgs @. "fetchgit" @@ mkNonRecSet
Expand Down