From df16451fa5577bd8ec3a93c48cb75fea566907ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 26 Nov 2014 00:56:24 +0300 Subject: [PATCH 1/2] c2hsc: move to development/tools --- pkgs/development/{libraries => tools}/haskell/c2hsc/default.nix | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/{libraries => tools}/haskell/c2hsc/default.nix (100%) diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/tools/haskell/c2hsc/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/c2hsc/default.nix rename to pkgs/development/tools/haskell/c2hsc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 497374e2ce75..5eae8f23b659 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -341,7 +341,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in c2hs = callPackage ../development/libraries/haskell/c2hs {}; - c2hsc = callPackage ../development/libraries/haskell/c2hsc {}; + c2hsc = callPackage ../development/tools/haskell/c2hsc {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; From 08748b4098f8ef8ff37f642c0d33a8eec2111916 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 26 Nov 2014 00:56:58 +0300 Subject: [PATCH 2/2] c2hs: update and move to development/tools --- pkgs/development/{libraries => tools}/haskell/c2hs/default.nix | 2 -- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/development/{libraries => tools}/haskell/c2hs/default.nix (95%) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix similarity index 95% rename from pkgs/development/libraries/haskell/c2hs/default.nix rename to 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 {};