diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-05 12:34:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-05 18:39:19 +0100 |
| commit | dc702444475a5b3c5dd3a2286c51fb499292db82 (patch) | |
| tree | eb85080a6ae3b404523360dbbf361913ef638136 /pkgs/top-level/haskell-packages.nix | |
| parent | a1c1be46e1afdb802d3b51ca14eac9686541c1a4 (diff) | |
| download | nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar.gz nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar.bz2 nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar.lz nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar.xz nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.tar.zst nixpkgs-dc702444475a5b3c5dd3a2286c51fb499292db82.zip | |
Update HEAD versions of Cabal and cabal-install version to 1.22.0.0.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be2b29317be..69716994837 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -365,7 +365,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_3 = callPackage ../development/libraries/haskell/Cabal/1.20.0.3.nix {}; - Cabal_HEAD = callPackage ../development/libraries/haskell/Cabal/head.nix {}; + Cabal_1_22_0_0 = callPackage ../development/libraries/haskell/Cabal/1.22.0.0.nix {}; Cabal = null; # core package since forever cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; @@ -957,8 +957,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; ghcjs = callPackage ../development/compilers/ghcjs { - Cabal = self.Cabal_HEAD; - cabalInstall = self.cabalInstall_HEAD; + Cabal = self.Cabal_1_22_0_0; + cabalInstall = self.cabalInstall_1_22_0_0; haddock = self.haddock.override { Cabal = null; }; @@ -3197,8 +3197,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_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_6; + cabalInstall_1_22_0_0 = callPackage ../tools/package-management/cabal-install/1.22.0.0.nix { Cabal = self.Cabal_1_22_0_0; }; + cabalInstall = self.cabalInstall_1_22_0_0; codex = callPackage ../development/tools/haskell/codex {}; |