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

haskell-shelly: move version override to haskell-defaults.nix

Browse Source
This commit is contained in:
Peter Simons 2014-06-05 12:20:34 +02:00
parent 7c89fcc501
commit 9dd2b3c651
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@
haddock = self.haddock_2_11_0; haddock = self.haddock_2_11_0;
haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
scientific = self.scientific_0_2_0_2; scientific = self.scientific_0_2_0_2;
shelly = self.shelly_0_15_4_1;
}; };
ghc722Prefs = self : super : ghc742Prefs self super // { ghc722Prefs = self : super : ghc742Prefs self super // {

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

@ -1936,9 +1936,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {};
shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {};
shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") shelly = self.shelly_1_5_3_1;
then self.shelly_0_15_4_1
else self.shelly_1_5_3_1;
simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};