cabal2nix 1.45 → 1.46

raw patch · 2 files changed

+3/−7 lines, 2 files

Files

• cabal2nix.cabal +3/−3
• src/Cabal2Nix/PostProcess.hs +0/−4

@@ -1,5 +1,5 @@ Name:                   cabal2nix-Version:                1.45+Version:                1.46 Copyright:              Peter Simons, Andres Loeh License:                BSD3 License-File:           LICENSE@@ -33,8 +33,8 @@   .   The only required argument is the path to the cabal file. For example:   .-  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.45/cabal2nix.cabal-  > cabal2nix cabal://cabal2nix-1.45+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.46/cabal2nix.cabal+  > cabal2nix cabal://cabal2nix-1.46   .   If the @--sha256@ option has not been specified, cabal2nix calls   @nix-prefetch-url@ to determine the hash automatically. This causes

@@ -65,14 +65,11 @@   , "# library. GHC's linker fails if the wrong version is found first."   , "# We solve this by eliminating lib64 from the path on 32-bit"   , "# platforms and putting lib64 first on 64-bit platforms."-  , ""   , "libPaths = if self.stdenv.is64bit then \"lib64 lib\" else \"lib\";"-  , ""   , "configurePhase = ''"   , "  for i in Setup.hs Setup.lhs; do"   , "    test -f $i && ghc --make $i"   , "  done"-  , ""   , "  for p in $extraBuildInputs $propagatedBuildNativeInputs; do"   , "    if [ -d \"$p/include\" ]; then"   , "      extraLibDirs=\"$extraLibDirs --extra-include-dir=$p/include\""@@ -83,7 +80,6 @@   , "      fi"   , "    done"   , "  done"-  , ""   , "  ./Setup configure --verbose --prefix=\"$out\" $libraryProfiling $extraLibDirs $configureFlags"   , "'';"   ]