MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

idris requires llvm-general-3.3 currently

Browse source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-02-02 20:40:29 -05:00
parent 134546bca2
commit 2cf7bc982b
3 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix Normal file
View file

@ -0,0 +1,20 @@
{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, transformers
}:
cabal.mkDerivation (self: {
pname = "llvm-general-pure";
version = "3.3.8.2";
sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
buildDepends = [ mtl parsec setenv transformers ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
doCheck = false;
meta = {
description = "Pure Haskell LLVM functionality (no FFI)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

24
pkgs/development/libraries/haskell/llvm-general/3.3.nix Normal file
View file

@ -0,0 +1,24 @@
{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
, QuickCheck, setenv, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "llvm-general";
version = "3.3.8.2";
sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
buildDepends = [
llvmGeneralPure mtl parsec setenv transformers utf8String
];
testDepends = [
HUnit llvmGeneralPure mtl QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2
];
buildTools = [ llvmConfig ];
doCheck = false;
meta = {
description = "General purpose LLVM bindings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

10
pkgs/top-level/haskell-packages.nix
View file

@ -1566,11 +1566,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
# Needed for idris for now
llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
llvmConfig = pkgs.llvm_33;
llvmGeneralPure = self.llvmGeneralPure_3_3;
};
llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
llvmConfig = pkgs.llvm; llvmConfig = pkgs.llvm;
inherit (pkgs) zlib ncurses; inherit (pkgs) zlib ncurses;
}; };
llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
lrucache = callPackage ../development/libraries/haskell/lrucache {}; lrucache = callPackage ../development/libraries/haskell/lrucache {};
@ -2713,6 +2721,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
idris_plain = callPackage ../development/compilers/idris { idris_plain = callPackage ../development/compilers/idris {
parsers = self.parsers_0_9; parsers = self.parsers_0_9;
trifecta = self.trifecta_1_1; trifecta = self.trifecta_1_1;
llvmGeneral = self.llvmGeneral_3_3;
llvmGeneralPure = self.llvmGeneralPure_3_3;
}; };
idris = callPackage ../development/compilers/idris/wrapper.nix {}; idris = callPackage ../development/compilers/idris/wrapper.nix {};