diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index e60c4dd5b4b..2af8ec1b022 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -31,6 +31,5 @@ cabal.mkDerivation (self: { description = "Functional Programming Language with Dependent Types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix new file mode 100644 index 00000000000..8486841a5f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/language-java/0.2.6.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/0.2.7.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-java/default.nix rename to pkgs/development/libraries/haskell/language-java/0.2.7.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 24f9ed0eca4..87d5f9f281a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1448,7 +1448,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in 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 {}; @@ -3025,6 +3027,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in idris_plain = callPackage ../development/compilers/idris { llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; + languageJava = self.languageJava_0_2_6; }; idris = callPackage ../development/compilers/idris/wrapper.nix {};