diff options
| author | Peter Simons <simons@cryp.to> | 2014-11-26 14:33:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-11-26 14:33:36 +0100 |
| commit | fd27bc85bee699bc40435d7a99b60ddfd2287f44 (patch) | |
| tree | 42397eead5fb966d7ce68d56e54fdb2be897c0c2 | |
| parent | a5dafe774665904501051c62af14a1713f240e26 (diff) | |
| parent | 08748b4098f8ef8ff37f642c0d33a8eec2111916 (diff) | |
| download | nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar.gz nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar.bz2 nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar.lz nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar.xz nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.tar.zst nixlib-fd27bc85bee699bc40435d7a99b60ddfd2287f44.zip | |
Merge pull request #5128 from abbradar/c2hs
Move c2hs/c2hsc into tools, update
| -rw-r--r-- | pkgs/development/tools/haskell/c2hs/default.nix (renamed from pkgs/development/libraries/haskell/c2hs/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/c2hsc/default.nix (renamed from pkgs/development/libraries/haskell/c2hsc/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
3 files changed, 2 insertions, 4 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/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/tools/haskell/c2hsc/default.nix index cf56c0bf545f..cf56c0bf545f 100644 --- a/pkgs/development/libraries/haskell/c2hsc/default.nix +++ b/pkgs/development/tools/haskell/c2hsc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a951e89c4e6..7ebbdd80ef62 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -339,9 +339,9 @@ 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/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 {}; |