diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
| commit | 6e2d3b98473523672b06ff5c90b5b387a029e566 (patch) | |
| tree | 4f53d0adf17553b40031d35fae3e6f263933fd93 /pkgs/top-level/haskell-packages.nix | |
| parent | fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 (diff) | |
| parent | 14a6a059f5863bfd9e7c69336baa8a918b41a86a (diff) | |
| download | nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.gz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.bz2 nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.lz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.xz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.zst nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0087aa59df3..ae55febf893 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -522,6 +522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; + adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; + aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {}; aeson = self.aeson_0_6_2_1; @@ -540,6 +542,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x amqp = callPackage ../development/libraries/haskell/amqp {}; + annotatedWlPprint = callPackage ../development/libraries/haskell/annotated-wl-pprint {}; + appar = callPackage ../development/libraries/haskell/appar {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -1888,6 +1892,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; + pqueue = callPackage ../development/libraries/haskell/pqueue {}; + prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; @@ -2328,8 +2334,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tls = callPackage ../development/libraries/haskell/tls {}; - tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; - transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null; @@ -2572,8 +2576,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; - yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {}; - yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {}; yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; |