cabal2nix 1.70 → 1.71
raw patch · 5 files changed
+17/−5 lines, 5 files
Files
- cabal2nix.cabal +3/−3
- src/Cabal2Nix/Flags.hs +3/−1
- src/Cabal2Nix/Name.hs +2/−0
- src/Cabal2Nix/PostProcess.hs +8/−1
- src/hackage4nix.hs +1/−0
cabal2nix.cabal view
@@ -1,5 +1,5 @@ Name: cabal2nix-Version: 1.70+Version: 1.71 Copyright: Peter Simons, Andres Loeh License: BSD3 License-File: LICENSE@@ -38,8 +38,8 @@ . The only required argument is the path to the cabal file. For example: .- > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.70/cabal2nix.cabal- > cabal2nix cabal://cabal2nix-1.70+ > cabal2nix http://hackage.haskell.org/packages/archive/cabal2nix/1.71/cabal2nix.cabal+ > cabal2nix cabal://cabal2nix-1.71 . 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
@@ -10,7 +10,9 @@ | name == "folds" = [disable "test-hlint"] | name == "git-annex" = [enable "Assistant" , enable "Production"] | name == "haskeline" = [enable "terminfo"]+ | name == "haste-compiler" = [enable "portable"] | name == "hslua" = [enable "system-lua"]+ | name == "hxt" = [enable "network-uri"] | name == "idris" = [enable "llvm", enable "gmp", enable "ffi"] | name == "io-streams" = [enable "NoInteractiveTests"] | name == "pandoc" = [enable "https", enable "make-pandoc-man-pages"]@@ -18,7 +20,7 @@ | name == "snap-server" = [enable "openssl"] | name == "xmobar" = [enable "all_extensions"] | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]- | name == "yi" = [enable "pango"]+ | name == "yi" = [enable "pango", enable "vty"] | otherwise = [] enable :: String -> (FlagName,Bool)
src/Cabal2Nix/Name.hs view
@@ -73,6 +73,7 @@ libNixName "pcre" = return "pcre" libNixName "png" = return "libpng" libNixName "poppler-glib" = return "popplerGlib"+libNixName "portaudio-2.0" = return "portaudio" libNixName "pq" = return "postgresql" libNixName "pthread" = [] libNixName "sdl2" = return "SDL2"@@ -86,6 +87,7 @@ libNixName "xft" = return "libXft" libNixName "Xi" = return "libXi" libNixName "xml2" = return "libxml2"+libNixName "Xpm" = return "libXpm" libNixName "Xrandr" = return "libXrandr" libNixName "Xss" = return "libXScrnSaver" libNixName "Xtst" = return "libXtst"
src/Cabal2Nix/PostProcess.hs view
@@ -40,6 +40,7 @@ | pname == "glib" = deriv { extraLibs = "pkgconfig":"libc":extraLibs } | pname == "gloss-raster" = deriv { extraLibs = "llvm":extraLibs } | pname == "GLUT" = deriv { extraLibs = "glut":"libSM":"libICE":"libXmu":"libXi":"mesa":extraLibs }+ | pname == "graphviz" = deriv { testDepends = "systemGraphviz":testDepends } | pname == "gtk" = deriv { extraLibs = "pkgconfig":"libc":extraLibs } | pname == "gtkglext" = deriv { pkgConfDeps = "pangox_compat":pkgConfDeps } | pname == "gtk2hs-buildtools"= deriv { buildDepends = "hashtables":buildDepends }@@ -57,6 +58,7 @@ | pname == "hlibgit2" = deriv { testDepends = "git":testDepends } | pname == "HList" = deriv { buildTools = "diffutils":buildTools } | pname == "hmatrix" = deriv { extraLibs = "liblapack":"blas": filter (/= "lapack") extraLibs }+ | pname == "hmatrix-special" = deriv { extraLibs = "gsl":extraLibs } | pname == "hoogle" = deriv { testTarget = "--test-option=--no-net" } | pname == "hspec" = deriv { doCheck = False } | pname == "hsyslog" = deriv { phaseOverrides = hsyslogNoHaddock }@@ -108,6 +110,7 @@ = deriv { runHaddock = True, phaseOverrides = transformersNoHaddock } | pname == "tz" = deriv { extraFunctionArgs = ["pkgs_tzdata"], phaseOverrides = "preConfigure = \"export TZDIR=${pkgs_tzdata}/share/zoneinfo\";" } | pname == "vacuum" = deriv { extraLibs = "ghcPaths":extraLibs }+ | pname == "vector" = deriv { configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 \"--ghc-options=-msse2\"}":configureFlags } | pname == "wxc" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs, phaseOverrides = wxcPostInstall } | pname == "wxcore" = deriv { extraLibs = "wxGTK":"mesa":"libX11":extraLibs } | pname == "X11" && version >= Version [1,6] []@@ -117,6 +120,7 @@ , configureFlags = "--extra-include-dirs=${freetype}/include/freetype2":configureFlags } | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }+ | pname == "yi" = deriv { runHaddock = True, phaseOverrides = yiFixHaddock } | otherwise = deriv cudaConfigurePhase :: String@@ -205,6 +209,9 @@ , "];" ] +yiFixHaddock :: String+yiFixHaddock = "noHaddock = self.stdenv.lib.versionOlder self.ghc.version \"7.8\";"+ gitAnnexOverrides :: String gitAnnexOverrides = unlines [ "preConfigure = \"export HOME=$TEMPDIR\";"@@ -251,7 +258,7 @@ doctestNoHaddock = markdownUnlitNoHaddock cabal2nixDoCheckHook :: String-cabal2nixDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.6\" self.ghc.version;"+cabal2nixDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.8\" self.ghc.version;" cookieDoCheckHook :: String cookieDoCheckHook = "doCheck = self.stdenv.lib.versionOlder \"7.8\" self.ghc.version;"
src/hackage4nix.hs view
@@ -255,4 +255,5 @@ , "pkgs/development/tools/haskell/cabal-delete/default.nix" , "pkgs/tools/networking/sproxy-web/default.nix" , "pkgs/tools/networking/sproxy/default.nix"+ , "pkgs/applications/editors/yi/yi-custom.nix" ]