public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cabal-install: update to version 1.20.0.4

Browse Source 
The test suite had to be disabled because of https://github.com/haskell/cabal/issues/2285.
This commit is contained in:
Peter Simons 2014-12-18 18:36:49 +01:00
parent f7384b8c75
commit fa165e137d
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/package-management/cabal-install/1.20.0.3.nix → pkgs/tools/package-management/cabal-install/1.20.0.4.nix
View File

@ -1,35 +1,34 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually! # This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri
, random, stm, testFramework, testFrameworkHunit , QuickCheck, random, stm, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, time, zlib , testFrameworkQuickcheck2, time, zlib
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cabal-install"; pname = "cabal-install";
version = "1.20.0.3"; version = "1.20.0.4";
sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
Cabal filepath HTTP mtl network random stm time zlib Cabal filepath HTTP mtl network networkUri random stm time zlib
]; ];
testDepends = [ testDepends = [
Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
testFrameworkHunit testFrameworkQuickcheck2 time zlib testFrameworkHunit testFrameworkQuickcheck2 time zlib
]; ];
jailbreak = true;
doCheck = false;
postInstall = '' postInstall = ''
mkdir $out/etc mkdir $out/etc
mv bash-completion $out/etc/bash_completion.d mv bash-completion $out/etc/bash_completion.d
''; '';
patchPhase = ''
sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal
'';
meta = { meta = {
homepage = "http://www.haskell.org/cabal/"; homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage"; description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ]; maintainers = with self.stdenv.lib.maintainers; [ andres ];
}; };
}) })

4
pkgs/top-level/haskell-defaults.nix
View File

@ -15,13 +15,13 @@
# Older compilers inherit the overrides from newer ones. # Older compilers inherit the overrides from newer ones.
ghcHEADPrefs = self : super : super // { 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; mtl = self.mtl_2_2_1;
transformersCompat = super.transformersCompat_0_3_3; transformersCompat = super.transformersCompat_0_3_3;
}; };
ghc783Prefs = self : super : ghcHEADPrefs self super // { 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; }; }; 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 MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x
mtl = self.mtl_2_1_3_1; mtl = self.mtl_2_1_3_1;

7
pkgs/top-level/haskell-packages.nix
View File

@ -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_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_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 { cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; };
HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; cabalInstall = self.cabalInstall_1_20_0_4;
Cabal = self.Cabal_1_20_0_2;
};
cabalInstall = self.cabalInstall_1_20_0_3;
codex = callPackage ../development/tools/haskell/codex {}; codex = callPackage ../development/tools/haskell/codex {};