From c80a791dd52329d68f7ad4dcc2add4423ce9f21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 28 Mar 2017 09:59:41 +0200
Subject: [PATCH] Fix bad merge

---
 pkgs/top-level/all-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f82e02e0e0f6..4ded2dfb2f6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4713,9 +4713,11 @@ in
 
   all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
 
-  purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
+  haxe = callPackage ../development/compilers/haxe {
+    inherit (ocamlPackages) camlp4;
+  };
 
-  inherit (ocamlPackages) haxe;
+  purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
 
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
 
@@ -12702,6 +12704,8 @@ in
 
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
+  d4x = callPackage ../applications/misc/d4x { };
+
   darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
   });