cabal2nix 2.2 → 2.2.1

raw patch · 3 files changed

+3/−2 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

cabal2nix.cabal +1/−1
cabal2nix/Main.hs +1/−1
src/Distribution/Nixpkgs/Haskell/FromCabal.hs +1/−0

cabal2nix.cabal view

@@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack  name:           cabal2nix-version:        2.2+version:        2.2.1 synopsis:       Convert Cabal files into Nix build instructions. description:    Convert Cabal files into Nix build instructions. Users of Nix can install the latest version by running:                 .

cabal2nix/Main.hs view

@@ -114,7 +114,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do   Options {..} <- execParser pinfo -  pkg <- getPackage optHackageDb $ Source optUrl (fromMaybe "" optRevision) (maybe UnknownHash Guess optSha256) (fromMaybe "." optSubpath)+  pkg <- getPackage optHackageDb $ Source optUrl (fromMaybe "" optRevision) (maybe UnknownHash Guess optSha256) (fromMaybe "" optSubpath)    let       deriv :: Derivation

src/Distribution/Nixpkgs/Haskell/FromCabal.hs view

@@ -75,6 +75,7 @@     & enableSplitObjs .~ True     & enableLibraryProfiling .~ False     & enableExecutableProfiling .~ False+    & subpath .~ "."     & phaseOverrides .~ mempty     & editedCabalFile .~ (if xrev > 0                              then fromMaybe (error (display package ++ ": X-Cabal-File-Hash field is missing")) (lookup "X-Cabal-File-Hash" customFieldsPD)