From 9b7ecb76f320574094799d33e77df14fddc55782 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 5 Feb 2014 23:19:08 -0500 Subject: [PATCH] Use proper file and attribute names for tls packages Signed-off-by: Shea Levy --- .../libraries/haskell/tls/{1.1.x.nix => 1.1.5.nix} | 0 .../libraries/haskell/tls/{1.2.x.nix => 1.2.2.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/tls/{1.1.x.nix => 1.1.5.nix} (100%) rename pkgs/development/libraries/haskell/tls/{1.2.x.nix => 1.2.2.nix} (100%) diff --git a/pkgs/development/libraries/haskell/tls/1.1.x.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/tls/1.1.x.nix rename to pkgs/development/libraries/haskell/tls/1.1.5.nix diff --git a/pkgs/development/libraries/haskell/tls/1.2.x.nix b/pkgs/development/libraries/haskell/tls/1.2.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/tls/1.2.x.nix rename to pkgs/development/libraries/haskell/tls/1.2.2.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8cfd3fec62d..d9e8fbc958b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2348,12 +2348,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; - tls = callPackage ../development/libraries/haskell/tls/1.2.x.nix {}; - - tls_1_1_x = callPackage ../development/libraries/haskell/tls/1.1.x.nix {}; + tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; + tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; + tls = self.tls_1_2_2; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { - tls = self.tls_1_1_x; + tls = self.tls_1_1_5; }; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};