Update haskell-llvm-* (and use full version numbers in their attribute names, like all other Haskell packages do)

This commit is contained in:
Peter Simons 2014-02-10 12:19:35 +01:00
parent 7d3cda336f
commit 27ea519caf
5 changed files with 13 additions and 13 deletions

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "llvm-general-pure";
version = "3.4.0.0";
sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1";
version = "3.4.1.0";
sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q";
buildDepends = [ mtl parsec setenv transformers ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "llvm-general";
version = "3.4.0.0";
sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b";
version = "3.4.1.0";
sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp";
buildDepends = [
llvmGeneralPure mtl parsec setenv transformers utf8String
];

View file

@ -1588,18 +1588,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
# Needed for idris for now
llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix {
llvmConfig = pkgs.llvm_33;
llvmGeneralPure = self.llvmGeneralPure_3_3;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
};
llvmGeneral_3_4 = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix {
llvmConfig = pkgs.llvm;
};
llvmGeneral = self.llvmGeneral_3_4;
llvmGeneral = self.llvmGeneral_3_4_1_0;
llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
llvmGeneralPure_3_4 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
llvmGeneralPure = self.llvmGeneralPure_3_4;
llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {};
llvmGeneralPure = self.llvmGeneralPure_3_4_1_0;
lrucache = callPackage ../development/libraries/haskell/lrucache {};
@ -2766,8 +2766,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
idris_plain = callPackage ../development/compilers/idris {
parsers = self.parsers_0_9;
trifecta = self.trifecta_1_1;
llvmGeneral = self.llvmGeneral_3_3;
llvmGeneralPure = self.llvmGeneralPure_3_3;
llvmGeneral = self.llvmGeneral_3_3_8_2;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
};
idris = callPackage ../development/compilers/idris/wrapper.nix {};