diff options
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/tinc/default.nix (renamed from pkgs/development/tools/misc/tinc-haskell/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 3 deletions
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/misc/tinc-haskell/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 4efdc909673d..44491fa0ef98 100644 --- a/pkgs/development/tools/misc/tinc-haskell/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -6,7 +6,7 @@ , ghc, cabal2nix, cabal-install, makeWrapper }: mkDerivation { - pname = "tinc-haskell"; + pname = "tinc"; version = "20160419"; src = fetchFromGitHub { owner = "sol"; 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 { }; |