From 769e14a4228093f999bf2cb932368d80f210a5c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 May 2017 09:24:46 +0200 Subject: [PATCH] multi-ghc-travis: update to latest git version and install both scripts We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which feels more in-line'ish with the Cabal file hvr is distributing. --- .../tools/haskell/multi-ghc-travis/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 71b363b2740..90b61ec4124 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,30 +2,27 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2016-10-23"; + version = "git-2017-05-18"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "03dd35f3801d6af4224906d45e982a748de9960e"; - sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi"; + rev = "3e1b3847583020f0e83c97fcf4bcfb7c90b78259"; + sha256 = "0hnwp9gsv2rnkxqiw4cg1vdi7wccajx0i9ryhw4lfr8nhkizbsww"; }; - patchPhase = '' - substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis" - ''; - installPhase = '' mkdir -p $out/bin - ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis + ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml + ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2 ''; meta = with stdenv.lib; { description = "Generate .travis.yml for multiple ghc versions"; homepage = "https://github.com/hvr/multi-ghc-travis"; - license = licenses.free; + license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; };