From 4517928069fed81eae1ecc31ef41604f8947f99a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:26:15 +0200 Subject: [PATCH] haskell-X11: update to version 1.6.0.1 --- .../libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix} | 8 +++----- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix} (69%) diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.nix b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix similarity index 69% rename from pkgs/development/libraries/haskell/X11/1.6.0.nix rename to pkgs/development/libraries/haskell/X11/1.6.0.1.nix index 6292f7eab5c..4a558d483a3 100644 --- a/pkgs/development/libraries/haskell/X11/1.6.0.nix +++ b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix @@ -1,11 +1,9 @@ -{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb -}: +{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }: cabal.mkDerivation (self: { pname = "X11"; - version = "1.6.0"; - sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j"; - buildDepends = [ syb ]; + version = "1.6.0.1"; + sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz"; extraLibraries = [ libX11 libXext libXinerama libXrandr libXrender ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1f75e397846..cacd2d3a66c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1602,8 +1602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; - X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {}; - X11 = self.X11_1_6_0; + X11_1_6_0_1 = callPackage ../development/libraries/haskell/X11/1.6.0.1.nix {}; + X11 = self.X11_1_6_0_1; X11Xft = callPackage ../development/libraries/haskell/X11-xft {};