cabal2nix 1.48 → 1.49

raw patch · 3 files changed

+6/−4 lines, 3 files

Files

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

@@ -1,5 +1,5 @@ Name:                   cabal2nix-Version:                1.48+Version:                1.49 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.48/cabal2nix.cabal-  > cabal2nix cabal://cabal2nix-1.48+  > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.49/cabal2nix.cabal+  > cabal2nix cabal://cabal2nix-1.49   .   If the @--sha256@ option has not been specified, cabal2nix calls   @nix-prefetch-url@ to determine the hash automatically. This causes

@@ -83,11 +83,12 @@   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, doCheck = optDoCheck cfg }+  let deriv  = (cabal2nix cabal) { sha256 = sha, runHaddock = optHaddock cfg }       deriv' = deriv { metaSection = (metaSection deriv)                                      { maintainers = optMaintainer cfg                                      , platforms   = optPlatform cfg                                      }+                     , doCheck = doCheck deriv && optDoCheck cfg                      }    putStr (show (disp (normalize deriv')))

@@ -28,6 +28,7 @@   | pname == "haskell-src-meta" = deriv { buildDepends = "uniplate":buildDepends }   | pname == "highlighting-kate"= highlightingKatePostProcessing deriv   | pname == "hmatrix"          = deriv { extraLibs = "gsl":"liblapack":"blas":extraLibs }+  | pname == "hspec"            = deriv { doCheck = False }   | pname == "idris"            = deriv { buildTools = "happy":buildTools }   | pname == "language-c-quote" = deriv { buildTools = "alex":"happy":buildTools }   | pname == "leksah-server"    = deriv { buildDepends = "process-leksah":buildDepends }