From cf4a69e2ec73c5abf5812e20a558bf45b9646e56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Apr 2016 20:12:23 +0200
Subject: haskell-tinc: move the tool into the haskellPackages hierarchy like
 all other Haskell packages

---
 .../haskell-modules/configuration-common.nix       |  4 +++
 pkgs/development/tools/haskell/tinc/default.nix    | 41 ++++++++++++++++++++++
 .../tools/misc/tinc-haskell/default.nix            | 41 ----------------------
 pkgs/top-level/all-packages.nix                    |  2 --
 4 files changed, 45 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/tools/haskell/tinc/default.nix
 delete mode 100644 pkgs/development/tools/misc/tinc-haskell/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 90cef5e92a04..ecae4cb8eb61 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1006,4 +1006,8 @@ self: super: {
   c2hs_0_27_1 = if pkgs.stdenv.isDarwin
                 then dontCheck super.c2hs_0_27_1
                 else super.c2hs_0_27_1;
+
+  # tinc is a new build driver a la Stack that's not yet available from Hackage.
+  tinc = self.callPackage ../tools/haskell/tinc {};
+
 }
diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
new file mode 100644
index 000000000000..44491fa0ef98
--- /dev/null
+++ b/pkgs/development/tools/haskell/tinc/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation, aeson, base, bytestring, Cabal, containers
+, directory, exceptions, filelock, filepath, gitrev, graph-wrapper
+, hpack, hspec, HUnit, language-dot, mockery, parsec, process
+, QuickCheck, safe, stdenv, temporary, time, transformers, unix
+, unix-compat, with-location, yaml, fetchFromGitHub
+, ghc, cabal2nix, cabal-install, makeWrapper
+}:
+mkDerivation {
+  pname = "tinc";
+  version = "20160419";
+  src = fetchFromGitHub {
+    owner = "sol";
+    repo = "tinc";
+    rev = "b9f7cc1076098b1f99f20655052c9fd34598d891";
+    sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson base bytestring Cabal containers directory exceptions
+    filelock filepath gitrev graph-wrapper hpack language-dot parsec
+    process temporary time transformers unix-compat with-location yaml
+  ];
+  testHaskellDepends = [
+    aeson base bytestring Cabal containers directory exceptions
+    filelock filepath gitrev graph-wrapper hpack hspec HUnit
+    language-dot mockery parsec process QuickCheck safe temporary time
+    transformers unix unix-compat with-location yaml
+  ];
+  postInstall = ''
+    source ${makeWrapper}/nix-support/setup-hook
+    wrapProgram $out/bin/tinc \
+      --prefix PATH : '${ghc}/bin' \
+      --prefix PATH : '${cabal2nix}/bin' \
+      --prefix PATH : '${cabal-install}/bin'
+  '';
+  description = "A dependency manager for Haskell";
+  homepage = "https://github.com/sol/tinc#readme";
+  license = stdenv.lib.licenses.mit;
+  maintainers = [ stdenv.lib.maintainers.robbinch ];
+}
diff --git a/pkgs/development/tools/misc/tinc-haskell/default.nix b/pkgs/development/tools/misc/tinc-haskell/default.nix
deleted file mode 100644
index 4efdc909673d..000000000000
--- a/pkgs/development/tools/misc/tinc-haskell/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, Cabal, containers
-, directory, exceptions, filelock, filepath, gitrev, graph-wrapper
-, hpack, hspec, HUnit, language-dot, mockery, parsec, process
-, QuickCheck, safe, stdenv, temporary, time, transformers, unix
-, unix-compat, with-location, yaml, fetchFromGitHub
-, ghc, cabal2nix, cabal-install, makeWrapper
-}:
-mkDerivation {
-  pname = "tinc-haskell";
-  version = "20160419";
-  src = fetchFromGitHub {
-    owner = "sol";
-    repo = "tinc";
-    rev = "b9f7cc1076098b1f99f20655052c9fd34598d891";
-    sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson base bytestring Cabal containers directory exceptions
-    filelock filepath gitrev graph-wrapper hpack language-dot parsec
-    process temporary time transformers unix-compat with-location yaml
-  ];
-  testHaskellDepends = [
-    aeson base bytestring Cabal containers directory exceptions
-    filelock filepath gitrev graph-wrapper hpack hspec HUnit
-    language-dot mockery parsec process QuickCheck safe temporary time
-    transformers unix unix-compat with-location yaml
-  ];
-  postInstall = ''
-    source ${makeWrapper}/nix-support/setup-hook
-    wrapProgram $out/bin/tinc \
-      --prefix PATH : '${ghc}/bin' \
-      --prefix PATH : '${cabal2nix}/bin' \
-      --prefix PATH : '${cabal-install}/bin'
-  '';
-  description = "A dependency manager for Haskell";
-  homepage = "https://github.com/sol/tinc#readme";
-  license = stdenv.lib.licenses.mit;
-  maintainers = [ stdenv.lib.maintainers.robbinch ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ef9afe98ef8..f4de0702e2b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6306,8 +6306,6 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-  tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { };
-
   travis = callPackage ../development/tools/misc/travis { };
 
   tweak = callPackage ../applications/editors/tweak { };
-- 
cgit 1.4.1