From eb7b5317fdfe79888695f9b7fc7086bdca890760 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Feb 2014 10:40:47 +0100 Subject: [PATCH] haskell-packages.nix: provide a consistent attribute name for llvmGeneral_3_4 --- pkgs/top-level/haskell-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c6776b913e3..058343267c9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1571,14 +1571,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3; }; - - llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix { + llvmGeneral_3_4 = callPackage ../development/libraries/haskell/llvm-general/3.4.nix { llvmConfig = pkgs.llvm; }; + llvmGeneral = self.llvmGeneral_3_4; llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { }; - - llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {}; + llvmGeneralPure_3_4 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4; lrucache = callPackage ../development/libraries/haskell/lrucache {};