From 9b8ff2f5f2f3c371d91e88fc25c46b93c62114db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Jan 2015 20:57:15 +0100 Subject: [PATCH] Update Cabal to version 1.20.0.3 and cabal-install to version 1.20.0.6. --- .../haskell/Cabal/{1.20.0.2.nix => 1.20.0.3.nix} | 4 ++-- .../cabal-install/{1.20.0.4.nix => 1.20.0.6.nix} | 12 ++++-------- pkgs/top-level/haskell-defaults.nix | 8 ++++---- pkgs/top-level/haskell-packages.nix | 10 +++++----- 4 files changed, 15 insertions(+), 19 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.20.0.2.nix => 1.20.0.3.nix} (89%) rename pkgs/tools/package-management/cabal-install/{1.20.0.4.nix => 1.20.0.6.nix} (68%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix similarity index 89% rename from pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix rename to pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix index ac417de67a1..83e8f075f07 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.2"; - sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; + version = "1.20.0.3"; + sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.4.nix b/pkgs/tools/package-management/cabal-install/1.20.0.6.nix similarity index 68% rename from pkgs/tools/package-management/cabal-install/1.20.0.4.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.6.nix index a6222dfc688..adb2f24f5b2 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.4.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.6.nix @@ -7,30 +7,26 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.4"; - sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; + version = "1.20.0.6"; + sha256 = "1hc187yzl59518cswk25xzsabn9dvm4wqpq817hmclrvkf4zr3pl"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath HTTP mtl network networkUri random stm time zlib ]; testDepends = [ - Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework - testFrameworkHunit testFrameworkQuickcheck2 time zlib + Cabal filepath HTTP HUnit mtl network networkUri QuickCheck stm + testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib ]; doCheck = false; postInstall = '' 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"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3030c15d73f..9851a0fcdf3 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,7 +15,7 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; + cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = null; }; mtl = self.mtl_2_2_1; ghcjsBase = null; ghcjsDom = with self; super.ghcjsDom.override { @@ -29,9 +29,9 @@ }; ghc784Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; - jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = self.Cabal_1_20_0_3; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_3; }; }; + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_3; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6e8eec2c777..4f0b3437347 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -364,7 +364,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; + Cabal_1_20_0_3 = callPackage ../development/libraries/haskell/Cabal/1.20.0.3.nix {}; Cabal_HEAD = callPackage ../development/libraries/haskell/Cabal/head.nix {}; Cabal = null; # core package since forever @@ -3172,9 +3172,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = self.Cabal_1_20_0_2; + Cabal = self.Cabal_1_20_0_3; cabalLenses = self.cabalLenses.override { - Cabal = self.Cabal_1_20_0_2; + Cabal = self.Cabal_1_20_0_3; }; }; @@ -3188,9 +3188,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in 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_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall_1_20_0_6 = callPackage ../tools/package-management/cabal-install/1.20.0.6.nix { Cabal = self.Cabal_1_20_0_3; }; cabalInstall_HEAD = callPackage ../tools/package-management/cabal-install/head.nix { Cabal = self.Cabal_HEAD; }; - cabalInstall = self.cabalInstall_1_20_0_4; + cabalInstall = self.cabalInstall_1_20_0_6; codex = callPackage ../development/tools/haskell/codex {};