diff options
author | robbinch <robbinch33@gmail.com> | 2016-04-25 00:32:16 +0800 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-24 18:32:16 +0200 |
commit | bd9d37e6759e3bc3d778e67fe538a87736a230ca (patch) | |
tree | d57d2f2a79b46658c0e060232662d0e7db5798b0 /pkgs | |
parent | f583efea44fd0fb432bbeed2ae5093e288961d08 (diff) | |
download | nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar.gz nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar.bz2 nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar.lz nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar.xz nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.tar.zst nixpkgs-bd9d37e6759e3bc3d778e67fe538a87736a230ca.zip |
tinc-haskell: Rename package name to avoid conflict (#14952)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/tinc-haskell/default.nix (renamed from pkgs/development/tools/misc/tinc/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/tinc/default.nix b/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 { }; |