philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #4259 from MaxOw/master

Browse source 
Fixed broken package: idris.
This commit is contained in:
Peter Simons 2014-09-24 20:55:53 +02:00
commit d38b49ce9c
4 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/compilers/idris/default.nix
View file

@ -31,6 +31,5 @@ cabal.mkDerivation (self: {
description = "Functional Programming Language with Dependent Types"; description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
broken = true;
}; };
}) })

22
pkgs/development/libraries/haskell/language-java/0.2.6.nix Normal file
View file

@ -0,0 +1,22 @@
{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "language-java";
version = "0.2.6";
sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27";
buildDepends = [ cpphs parsec syb ];
testDepends = [
filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
buildTools = [ alex ];
doCheck = false;
meta = {
homepage = "http://github.com/vincenthz/language-java";
description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/language-java/default.nix → pkgs/development/libraries/haskell/language-java/0.2.7.nix
View file

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

@ -1448,7 +1448,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; languageGlsl = callPackage ../development/libraries/haskell/language-glsl {};
languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {};
languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {};
languageJava = self.languageJava_0_2_7;
languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
@ -3025,6 +3027,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
idris_plain = callPackage ../development/compilers/idris { idris_plain = callPackage ../development/compilers/idris {
llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneral = self.llvmGeneral_3_3_8_2;
llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
languageJava = self.languageJava_0_2_6;
}; };
idris = callPackage ../development/compilers/idris/wrapper.nix {}; idris = callPackage ../development/compilers/idris/wrapper.nix {};