diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskeline/default.nix rename to pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.1.2.nix b/pkgs/development/libraries/haskell/haskeline/0.7.1.2.nix new file mode 100644 index 000000000000..83e49e746c63 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskeline/0.7.1.2.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, terminfo, transformers, utf8String }: + +cabal.mkDerivation (self: { + pname = "haskeline"; + version = "0.7.1.2"; + sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4"; + buildDepends = [ filepath terminfo transformers utf8String ]; + configureFlags = "-fterminfo"; + meta = { + homepage = "http://trac.haskell.org/haskeline"; + description = "A command-line interface for user input, written in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index fb326796f1f7..79979d324f04 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -34,6 +34,7 @@ haskellPlatform = self.haskellPlatform_2012_4_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + haskeline = self.haskeline_0_7_1_1; }; ghc741Prefs = @@ -41,6 +42,7 @@ haskellPlatform = self.haskellPlatform_2012_2_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + haskeline = self.haskeline_0_7_1_1; }; ghc722Prefs = @@ -60,6 +62,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc721Prefs = ghc722Prefs; @@ -82,6 +85,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc703Prefs = @@ -102,6 +106,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc702Prefs = ghc701Prefs; @@ -124,6 +129,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc6123Prefs = ghc6122Prefs; @@ -150,6 +156,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc6121Prefs = @@ -176,6 +183,7 @@ hspecExpectations = self.hspecExpectations.override { HUnit = self.HUnit_1_2_5_2; }; + haskeline = self.haskeline_0_7_1_1; }; ghc6104Prefs = @@ -196,6 +204,7 @@ mtl = self.mtl_2_1_2; HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; }; + haskeline = self.haskeline_0_7_1_1; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 677c4aa1c3e5..0428c705808c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1210,7 +1210,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; - haskeline = callPackage ../development/libraries/haskell/haskeline {}; + haskeline_0_7_1_1 = callPackage ../development/libraries/haskell/haskeline/0.7.1.1.nix {}; + haskeline_0_7_1_2 = callPackage ../development/libraries/haskell/haskeline/0.7.1.2.nix {}; + haskeline = self.haskeline_0_7_1_2; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};