cabal2nix 1.64 → 1.65

raw patch · 4 files changed

+12/−4 lines, 4 files

Files

cabal2nix.cabal +3/−3
src/Cabal2Nix/Flags.hs +1/−0
src/Cabal2Nix/PostProcess.hs +4/−0
src/Distribution/NixOS/Derivation/Cabal.hs +4/−1

cabal2nix.cabal view

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

src/Cabal2Nix/Flags.hs view

@@ -5,6 +5,7 @@  configureCabalFlags :: PackageIdentifier -> FlagAssignment configureCabalFlags (PackageIdentifier (PackageName name) _)+ | name == "arithmoi"           = [disable "llvm"]  | name == "accelerate-examples"= [disable "opencl"]  | name == "git-annex"          = [ enable "S3", enable "WebDAV", enable "Inotify"                                   , enable "Dbus", enable "Assistant", enable "Webapp"

src/Cabal2Nix/PostProcess.hs view

@@ -197,6 +197,10 @@   , "  mkdir -p $out/share/man/man1"   , "  mv \"$out/\"**\"/man/\"*.1 $out/share/man/man1/"   , "'';"+  , "patches = ["+  , "  # Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available)."+  , "  ./xmonad_ghc_var_0.11.patch"+  , "];"   ]  gitAnnexOverrides :: String

src/Distribution/NixOS/Derivation/Cabal.hs view

@@ -72,7 +72,10 @@   packageId deriv = PackageIdentifier (PackageName (pname deriv)) (version deriv)  renderDerivation :: Derivation -> Doc-renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat+renderDerivation deriv =+  text "# This file was auto-generated by cabal2nix. Please do NOT edit manually!" $$+  text "" $$+  funargs (map text ("cabal" : inputs)) $$ vcat   [ text ""   , text "cabal.mkDerivation" <+> lparen <> text "self" <> colon <+> lbrace   , nest 2 $ vcat