From bd9d37e6759e3bc3d778e67fe538a87736a230ca Mon Sep 17 00:00:00 2001 From: robbinch Date: Mon, 25 Apr 2016 00:32:16 +0800 Subject: [PATCH] tinc-haskell: Rename package name to avoid conflict (#14952) --- pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix (98%) diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc-haskell/default.nix similarity index 98% rename from pkgs/development/tools/misc/tinc/default.nix rename to pkgs/development/tools/misc/tinc-haskell/default.nix index 44491fa0ef9..4efdc909673 100644 --- a/pkgs/development/tools/misc/tinc/default.nix +++ b/pkgs/development/tools/misc/tinc-haskell/default.nix @@ -6,7 +6,7 @@ , ghc, cabal2nix, cabal-install, makeWrapper }: mkDerivation { - pname = "tinc"; + pname = "tinc-haskell"; version = "20160419"; src = fetchFromGitHub { owner = "sol"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0956dcf680c..2ef9afe98ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6306,7 +6306,7 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; - tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc { }; + tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { }; travis = callPackage ../development/tools/misc/travis { };