summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2014-11-26 00:56:58 +0300
committerNikolay Amiantov <ab@fmap.me>2014-11-26 01:27:07 +0300
commit08748b4098f8ef8ff37f642c0d33a8eec2111916 (patch)
tree633a8f17afd8541c641e860311857d37e7334777
parentdf16451fa5577bd8ec3a93c48cb75fea566907ba (diff)
downloadnixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar.gz
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar.bz2
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar.lz
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar.xz
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.tar.zst
nixlib-08748b4098f8ef8ff37f642c0d33a8eec2111916.zip
c2hs: update and move to development/tools
-rw-r--r--pkgs/development/tools/haskell/c2hs/default.nix (renamed from pkgs/development/libraries/haskell/c2hs/default.nix)2
-rw-r--r--pkgs/top-level/haskell-packages.nix2
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix
index a464b6224246..fe8992e9989f 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/tools/haskell/c2hs/default.nix
@@ -15,8 +15,6 @@ cabal.mkDerivation (self: {
     filepath HUnit shelly testFramework testFrameworkHunit text
     transformers
   ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5eae8f23b659..544c0eb6ee21 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -339,7 +339,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bzlib = callPackage ../development/libraries/haskell/bzlib {};
 
-  c2hs = callPackage ../development/libraries/haskell/c2hs {};
+  c2hs = callPackage ../development/tools/haskell/c2hs {};
 
   c2hsc = callPackage ../development/tools/haskell/c2hsc {};