diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d23010bbb6..85a672c350f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1784,9 +1784,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; - X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; - X11_1_6_0_2 = callPackage ../development/libraries/haskell/X11/1.6.0.2.nix {}; - X11 = self.X11_1_6_0_2; + X11 = callPackage ../development/libraries/haskell/X11 {}; X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; @@ -1960,18 +1958,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm = self.stm_2_3; }; - xmonad = callPackage ../applications/window-managers/xmonad { - X11 = self.X11_1_5_0_1; - }; + xmonad = callPackage ../applications/window-managers/xmonad {}; - xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix { - X11 = self.X11_1_5_0_1; - X11Xft = self.X11Xft.override { X11 = self.X11_1_5_0_1; }; - }; + xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {}; - xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix { - X11 = self.X11_1_5_0_1; - }; + xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {}; # Tools. @@ -1983,7 +1974,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tar = self.tar_0_3_2_0; }; - cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {}; cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; |