diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix similarity index 64% rename from pkgs/tools/package-management/cabal-install/1.20.0.3.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.4.nix index 1a18222ed6bc..a709ebc236f4 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix @@ -1,35 +1,34 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck -, random, stm, testFramework, testFrameworkHunit +{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri +, QuickCheck, random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.3"; - sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; + version = "1.20.0.4"; + sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath HTTP mtl network random stm time zlib + Cabal filepath HTTP mtl network networkUri random stm time zlib ]; testDepends = [ Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib ]; + jailbreak = true; + 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 = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9edabc13037f..538686b73ac4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,13 +15,13 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; transformersCompat = super.transformersCompat_0_3_3; }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + 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; }; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51b53743e94f..9c5110e48433 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3148,11 +3148,8 @@ 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_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; + cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall = self.cabalInstall_1_20_0_4; codex = callPackage ../development/tools/haskell/codex {};