From 919da91d13aa2c32636e9336f8cd548667512344 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Oct 2014 15:26:00 +0200 Subject: [PATCH] cabal-install: jailbreak version 1.20.0.3 to fix build with latest version of 'random' and override 'network' to the old 2.5 version --- pkgs/tools/package-management/cabal-install/1.20.0.3.nix | 3 +++ pkgs/top-level/haskell-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix index 8c136dc9dbb0..1a18222ed6bc 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix @@ -22,6 +22,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|random .*1.1,|random,|' 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-packages.nix b/pkgs/top-level/haskell-packages.nix index d24cffe4a6c2..1ef16574dba3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3143,7 +3143,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in 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 { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { + HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; + Cabal = self.Cabal_1_20_0_2; + }; cabalInstall = self.cabalInstall_1_20_0_3; codex = callPackage ../development/tools/haskell/codex {};