cabal2nix 1.47 → 1.48
raw patch · 4 files changed
+7/−7 lines, 4 files
Files
- cabal2nix.cabal +3/−3
- src/Cabal2Nix.hs +1/−1
- src/Cabal2Nix/PostProcess.hs +2/−2
- src/Hackage4Nix.hs +1/−1
cabal2nix.cabal view
@@ -1,5 +1,5 @@ Name: cabal2nix-Version: 1.47+Version: 1.48 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.47/cabal2nix.cabal- > cabal2nix cabal://cabal2nix-1.47+ > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.48/cabal2nix.cabal+ > cabal2nix cabal://cabal2nix-1.48 . If the @--sha256@ option has not been specified, cabal2nix calls @nix-prefetch-url@ to determine the hash automatically. This causes
src/Cabal2Nix.hs view
@@ -83,7 +83,7 @@ let packageId = package (packageDescription cabal) sha <- if null (optSha256 cfg) then hashPackage packageId else return (optSha256 cfg) - let deriv = (cabal2nix cabal) { sha256 = sha, runHaddock = optHaddock cfg }+ let deriv = (cabal2nix cabal) { sha256 = sha, runHaddock = optHaddock cfg, doCheck = optDoCheck cfg } deriv' = deriv { metaSection = (metaSection deriv) { maintainers = optMaintainer cfg , platforms = optPlatform cfg
src/Cabal2Nix/PostProcess.hs view
@@ -8,7 +8,7 @@ postProcess :: Derivation -> Derivation postProcess deriv@(MkDerivation {..}) | pname == "alex" = deriv { buildTools = "perl":buildTools }- | pname == "cabal-install" && version >= (Version [0,14] [])+ | pname == "cabal-install" && version >= Version [0,14] [] = deriv { phaseOverrides = cabalInstallPostInstall } | pname == "cairo" = deriv { extraLibs = "pkgconfig":"libc":"cairo":"zlib":extraLibs } | pname == "cuda" = deriv { phaseOverrides = cudaConfigurePhase, extraLibs = "cudatoolkit":"nvidia_x11":"self.stdenv.gcc":extraLibs }@@ -48,7 +48,7 @@ | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs } | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs } | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall }- | pname == "X11" && version >= (Version [1,6] [])+ | pname == "X11" && version >= Version [1,6] [] = deriv { extraLibs = "libXinerama":"libXext":"libXrender":extraLibs } | pname == "X11" = deriv { extraLibs = "libXinerama":"libXext":extraLibs } | pname == "X11-xft" = deriv { extraLibs = "pkgconfig":"freetype":"fontconfig":extraLibs
src/Hackage4Nix.hs view
@@ -204,7 +204,7 @@ badPackagePaths :: [FilePath] badPackagePaths = [ "haskell-platform/2011.2.0.1.nix", "haskell-platform/2011.4.0.0.nix" , "haskell-platform/2012.2.0.0.nix", "haskell-platform/2012.4.0.0.nix"- , "top-level/all-packages.nix"+ , "top-level/all-packages.nix", "top-level/haskell-packages.nix" ] -- Packages that we cannot regenerate automatically yet. This list