From 3e6ef50ecd2fa81afdd1e2a7cce05af878ed9a79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Mar 2014 23:11:10 +0100 Subject: [PATCH] cabal-install: update to version 1.18.0.3 --- .../cabal-install/{1.18.0.2.nix => 1.18.0.3.nix} | 7 ++----- pkgs/top-level/haskell-defaults.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 3 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/tools/package-management/cabal-install/{1.18.0.2.nix => 1.18.0.3.nix} (83%) diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix similarity index 83% rename from pkgs/tools/package-management/cabal-install/1.18.0.2.nix rename to pkgs/tools/package-management/cabal-install/1.18.0.3.nix index 3c1c6ddd133d..041cc471cab5 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.18.0.2"; - sha256 = "0ah9yzp486p3cvs9b7nid0jmf0a56fg65s3jx2r8lb84pi50d92c"; + version = "1.18.0.3"; + sha256 = "0h01mz6p4fwl8h6k2ybrlp598f0j3n2zasrr63fy0vjbjibmgf41"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; - patchPhase = '' - sed -i -e 's|array .*,|array,|' cabal-install.cabal - ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3034367c39e9..0856bf503780 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,8 +19,8 @@ self : self.haskellPlatformArgs_future self // { haskellPlatform = null; extensibleExceptions = self.extensibleExceptions_0_1_1_4; - cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; }; - cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; }; + cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; }; + cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; }; }; ghc763Prefs = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2bc148d84a3f..dc8655216e04 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vector = self.vector_0_10_9_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_18_0_2; + cabalInstall = self.cabalInstall_1_18_0_3; alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_3; @@ -2858,10 +2858,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; - cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix { + cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall = self.cabalInstall_1_18_0_2; + cabalInstall = self.cabalInstall_1_18_0_3; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};