diff options
author | Peter Simons <simons@cryp.to> | 2014-02-10 12:19:35 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-02-10 20:54:55 +0100 |
commit | 27ea519caf37570221c41c84ee15320831872ceb (patch) | |
tree | dccc25db46b197b9faa189230e5bc7019560b735 | |
parent | 7d3cda336f40c0fa2fa87dd2686eb16eed801cb5 (diff) | |
download | nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar.gz nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar.bz2 nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar.lz nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar.xz nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.tar.zst nixpkgs-27ea519caf37570221c41c84ee15320831872ceb.zip |
Update haskell-llvm-* (and use full version numbers in their attribute names, like all other Haskell packages do)
-rw-r--r-- | pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix (renamed from pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix (renamed from pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix (renamed from pkgs/development/libraries/haskell/llvm-general/3.3.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix (renamed from pkgs/development/libraries/haskell/llvm-general/3.4.nix) | 4 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 18 |
5 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix index 0a8f455d971..0a8f455d971 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix index 71947f00a23..200d8d00b44 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix index 2eb0a2c5d20..2eb0a2c5d20 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix index 7749c47689e..b86a65618cd 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix @@ -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 ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e7c4e892a9f..fd697471fa2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; |