From e195f5b35863e56aafe37954cbe71621172f5337 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jan 2012 14:51:23 +0000 Subject: [PATCH] monad-control: use consistent naming scheme for all supported versions svn path=/nixpkgs/trunk/; revision=31211 --- .../haskell/monad-control/{default.nix => 0.3.1.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-control/{default.nix => 0.3.1.nix} (100%) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/monad-control/default.nix rename to 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 5e1fef0215f..dc5e772df0f 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 {};