movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-15 22:19:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages

Browse source
This commit is contained in:
Peter Simons 2016-04-24 20:12:23 +02:00
parent 9eb107dc52
commit cf4a69e2ec
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1006,4 +1006,8 @@ self: super: {
c2hs_0_27_1 = if pkgs.stdenv.isDarwin c2hs_0_27_1 = if pkgs.stdenv.isDarwin
then dontCheck super.c2hs_0_27_1 then dontCheck super.c2hs_0_27_1
else 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 {};
} }

2
pkgs/development/tools/misc/tinc-haskell/default.nix → pkgs/development/tools/haskell/tinc/default.nix
View file

@ -6,7 +6,7 @@
, ghc, cabal2nix, cabal-install, makeWrapper , ghc, cabal2nix, cabal-install, makeWrapper
}: }:
mkDerivation { mkDerivation {
pname = "tinc-haskell"; pname = "tinc";
version = "20160419"; version = "20160419";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sol"; owner = "sol";

2
pkgs/top-level/all-packages.nix
View file

@ -6306,8 +6306,6 @@ in
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };
tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { };
travis = callPackage ../development/tools/misc/travis { }; travis = callPackage ../development/tools/misc/travis { };
tweak = callPackage ../applications/editors/tweak { }; tweak = callPackage ../applications/editors/tweak { };