packages feed

cabal2nix 2.11 → 2.11.1

raw patch · 5 files changed

+18/−8 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

cabal2nix.cabal view
@@ -1,5 +1,5 @@ name:               cabal2nix-version:            2.11+version:            2.11.1 synopsis:           Convert Cabal files into Nix build instructions. description:   Convert Cabal files into Nix build instructions. Users of Nix can install the latest@@ -74,7 +74,7 @@                     Александр Цамутали maintainer:         Peter Simons <simons@cryp.to> stability:          stable-tested-with:        GHC == 8.4.3+tested-with:        GHC == 8.4.3, GHC == 8.6.1 category:           Distribution, Nix homepage:           https://github.com/nixos/cabal2nix#readme bug-reports:        https://github.com/nixos/cabal2nix/issues
src/Distribution/Nixpkgs/Haskell/FromCabal.hs view
@@ -139,6 +139,7 @@       | i == "gtk2"                      = binding # (i, path # ["pkgs","gnome2","gtk"])       | i == "gtk3"                      = binding # (i, path # ["pkgs","gnome3","gtk"])       | i == "gtksourceview3"            = binding # (i, path # ["pkgs","gnome3","gtksourceview"])+      | i == "vte_291"                  = binding # (i, path # ["pkgs","gnome3","vte"])       | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p       | otherwise                        = bindNull i
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs view
@@ -56,7 +56,7 @@  | name == "snap-server"        = [enable "openssl"]  | name == "xmobar"             = [enable "with_alsa", enable "with_conduit", enable "with_datezone", enable "with_dbus", enable "with_inotify", enable "with_iwlib", enable "with_mpd", enable "with_mpris", enable "with_rtsopts", enable "with_threaded", enable "with_utf8", enable "with_uvmeter", enable "with_weather", enable "with_xft", enable "with_xpm"]  | name == "xmonad-extras"      = [disable "with_hlist", enable "with_split", enable "with_parsec"]- | name == "yaml"               = [enable "system-libyaml"]+ | name == "yaml"               = [("system-libyaml", version >= "0.10.1.1")]  | name == "yi"                 = [enable "pango", enable "vty"]  | otherwise                    = []
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs view
@@ -147,6 +147,7 @@ libNixName "tensorflow"                         = return "libtensorflow" libNixName "udev"                               = return "systemd"; libNixName "uuid"                               = return "libossp_uuid";+libNixName "vte-2.91"                           = return "vte_291" libNixName "wayland-client"                     = return "wayland" libNixName "wayland-cursor"                     = return "wayland" libNixName "wayland-egl"                        = return "libGL"@@ -171,6 +172,7 @@ libNixName "Xss"                                = return "libXScrnSaver" libNixName "Xtst"                               = return "libXtst" libNixName "Xxf86vm"                            = return "libXxf86vm"+libNixName "yaml"                               = return "libyaml" libNixName "yaml-0.1"                           = return "libyaml" libNixName "z"                                  = return "zlib" libNixName "zmq"                                = return "zeromq"
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs view
@@ -83,6 +83,7 @@   , ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [self "mtl", self "parsec"]))) -- https://github.com/haskell/cabal/issues/5391   , ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17   , ("cabal-install", set doCheck False . set phaseOverrides cabalInstallPostInstall)+  , ("cabal2nix > 2", cabal2nixOverrides)   , ("darcs", set phaseOverrides darcsInstallPostInstall . set doCheck False)   , ("dbus", set doCheck False) -- don't execute tests that try to access the network   , ("dns", set testTarget "spec")      -- don't execute tests that try to access the network@@ -170,7 +171,7 @@   , ("wxc", wxcHook)   , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)   , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))-  , ("xmonad", set phaseOverrides xmonadPostInstall)+  , ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)   , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))   , ("zip-archive >= 0.3.1 && < 0.3.2.3", over (testDepends . tool) (Set.union (Set.fromList [pkg "zip", pkg "unzip"])))   -- https://github.com/jgm/zip-archive/issues/35   ]@@ -281,10 +282,8 @@ xmonadPostInstall :: String xmonadPostInstall = unlines   [ "postInstall = ''"-  , "  shopt -s globstar"-  , "  mkdir -p $doc/share/man/man1"-  , "  mv \"$data/\"**\"/man/\"*[0-9] $doc/share/man/man1/"-  , "  rm \"$data/\"**\"/man/\"*"+  , "  install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"+  , "  install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"   , "'';"   ] @@ -356,3 +355,11 @@  hspecCoreOverrides :: Derivation -> Derivation   -- https://github.com/hspec/hspec/issues/330 hspecCoreOverrides = set phaseOverrides "testTarget = \"--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'\";"++cabal2nixOverrides :: Derivation -> Derivation+cabal2nixOverrides = set phaseOverrides $ unlines+  [ "preCheck = ''"+  , "  export PATH=\"$PWD/dist/build/cabal2nix:$PATH\""+  , "  export HOME=\"$TMPDIR/home\""+  , "'';"+  ]