diff options
author | Peter Simons <simons@cryp.to> | 2012-01-02 14:51:23 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-01-02 14:51:23 +0000 |
commit | e195f5b35863e56aafe37954cbe71621172f5337 (patch) | |
tree | 205dd08acc86f5aab1484c4ef0e9288464009c57 | |
parent | b21a827d2a1c1e15d1b1bfdf4d5bb84da6d84cca (diff) | |
download | nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar.gz nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar.bz2 nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar.lz nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar.xz nixlib-e195f5b35863e56aafe37954cbe71621172f5337.tar.zst nixlib-e195f5b35863e56aafe37954cbe71621172f5337.zip |
monad-control: use consistent naming scheme for all supported versions
svn path=/nixpkgs/trunk/; revision=31211
-rw-r--r-- | pkgs/development/libraries/haskell/monad-control/0.3.1.nix (renamed from pkgs/development/libraries/haskell/monad-control/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix index bf4ca6d00423..bf4ca6d00423 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5e1fef0215f0..dc5e772df0f0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -933,9 +933,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; - monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; - monadControl2 = self.monadControl_OBSOLETE; - monadControl = callPackage ../development/libraries/haskell/monad-control {}; + monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; + monadControl_0_3_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.nix {}; + monadControl = self.monadControl_0_3_1; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; @@ -948,7 +948,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; mongoDB = callPackage ../development/libraries/haskell/mongoDB { - monadControl = self.monadControl2; + monadControl = self.monadControl_0_2_0_3; }; mpppc = callPackage ../development/libraries/haskell/mpppc {}; |