cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2255 from jwiegley/timeparsers

Browse source 
The timeparsers library requires convertible == 1.0.*
This commit is contained in:
Peter Simons 2014-04-16 20:59:54 +02:00
commit 2fcc5da447
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/haskell/convertible/1.0.11.1.nix Normal file
View file

@ -0,0 +1,17 @@
{ cabal, mtl, text, time }:
cabal.mkDerivation (self: {
pname = "convertible";
version = "1.0.11.1";
sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl text time ];
meta = {
homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
description = "Typeclasses and instances for converting between types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

0
pkgs/development/libraries/haskell/convertible/default.nix → pkgs/development/libraries/haskell/convertible/1.1.0.0.nix
View file

8
pkgs/top-level/haskell-packages.nix
View file

@ -835,7 +835,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {};
convertible = callPackage ../development/libraries/haskell/convertible {};
convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {};
convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {};
convertible = self.convertible_1_1_0_0;
continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
@ -2540,7 +2542,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
# pass it explicitly in rare circumstances.
time = null;
timeparsers = callPackage ../development/libraries/haskell/timeparsers {};
timeparsers = callPackage ../development/libraries/haskell/timeparsers {
convertible = self.convertible_1_0_11_1;
};
timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {};