cabal2nix 2.14.3 → 2.14.4

raw patch · 4 files changed

+5/−5 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• README.md +1/−1
• cabal2nix.cabal +1/−1
• src/Cabal2nix.hs +1/−1
• src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs +2/−2

@@ -31,7 +31,7 @@ utility with `--help` to see the complete list of supported command line flags.  Detailed instructions how to use those generated files with Nix can be found at-http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure.+https://nixos.org/nixpkgs/manual/#how-to-create-nix-builds-for-your-own-private-haskell-packages.  `cabal2nix` can also build derivations for projects from other sources than hackage. You only need to provide an URI that points to a cabal project. The

@@ -1,5 +1,5 @@ name:               cabal2nix-version:            2.14.3+version:            2.14.4 synopsis:           Convert Cabal files into Nix build instructions. description:   Convert Cabal files into Nix build instructions. Users of Nix can install the latest

@@ -193,7 +193,7 @@   cabal2nix =<< getArgs  hpackOverrides :: Derivation -> Derivation-hpackOverrides = over phaseOverrides (++ "preConfigure = \"hpack\";")+hpackOverrides = over phaseOverrides (++ "prePatch = \"hpack\";")                . set (libraryDepends . tool . contains (PP.pkg "hpack")) True  cabal2nix' :: Options -> IO (Either Doc Derivation)

@@ -291,8 +291,8 @@ xmonadPostInstall :: String xmonadPostInstall = unlines   [ "postInstall = ''"-  , "  install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"-  , "  install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"+  , "  install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1"+  , "  install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs"   , "'';"   ]