haskell-yi: update to 0.10.1

This commit is contained in:
Mateusz Kowalczyk 2014-10-15 00:49:23 +01:00
parent c549ac9c1a
commit 0d858ba4c0
2 changed files with 25 additions and 49 deletions

View File

@ -1,65 +1,43 @@
{ cabal, alex, binary, Cabal, cautiousFile, concreteTyperep # This file was auto-generated by cabal2nix. Please do NOT edit manually!
, dataDefault, derive, Diff, dlist, dyre, filepath, fingertree
, glib, gtk, hashable, hint, HUnit, lens, mtl, pango, parsec
, pointedlist, QuickCheck, random, regexBase, regexTdfa, safe
, split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase
, uniplate, unixCompat, unorderedContainers, utf8String, vty
, xdgBasedir
, withPango ? true
# User may need extra dependencies for their configuration file so we { cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist
# want to specify it here to have them available when wrapping the , dynamicState, dyre, filepath, glib, gtk, hashable, hint, HUnit
# produced binary. , lens, makeWrapper, mtl, ooPrototypes, pango, parsec, pointedlist
, extraDepends ? [ ] , QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split
, tagged, tasty, tastyHunit, tastyQuickcheck, text, time
, transformersBase, unixCompat, unorderedContainers, utf8String
, vty, wordTrie, xdgBasedir, yiLanguage, yiRope
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yi"; pname = "yi";
version = "0.8.2"; version = "0.10.1";
sha256 = "18rnyswsdzkh0jdcqfg8pr90mpm6xf11siv598svqkxg12d2qql9"; sha256 = "1vj4ndp43w7xlji4p2px79a8g90p64g54sr3hx4pzimwrlpmifk8";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
binary Cabal cautiousFile concreteTyperep dataDefault derive Diff binary Cabal cautiousFile dataDefault derive dlist dynamicState
dlist dyre filepath fingertree hashable hint lens mtl dyre filepath glib gtk hashable hint lens mtl ooPrototypes pango
parsec pointedlist QuickCheck random regexBase regexTdfa safe parsec pointedlist QuickCheck random regexBase regexTdfa safe
split time transformersBase uniplate unixCompat unorderedContainers semigroups split tagged text time transformersBase unixCompat
utf8String vty xdgBasedir unorderedContainers utf8String vty wordTrie xdgBasedir yiLanguage
] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends; yiRope
testDepends = [
filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck
]; ];
buildTools = [ alex ]; testDepends = [
configureFlags = if withPango then "-fpango" else "-f-pango"; filepath HUnit lens QuickCheck semigroups tasty tastyHunit
doCheck = false; tastyQuickcheck text yiLanguage yiRope
];
# https://ghc.haskell.org/trac/ghc/ticket/9170 buildTools = [ makeWrapper ];
noHaddock = self.ghc.version == "7.6.3"; configureFlags = "-fpango -fvty";
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8";
# Allows Yi to find the libraries it needs at runtime.
postInstall = '' postInstall = ''
mv $out/bin/yi $out/bin/.yi-wrapped wrapProgram $out/bin/yi --prefix GHC_PACKAGE_PATH : $out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:$GHC_PACKAGE_PATH
cat - > $out/bin/yi <<EOF
#! ${self.stdenv.shell}
# Trailing : is necessary for it to pick up Prelude &c.
export GHC_PACKAGE_PATH=$(${self.ghc.GHCGetPackages} ${self.ghc.version} \
| sed 's/-package-db\ //g' \
| sed 's/^\ //g' \
| sed 's/\ /:/g')\
:$out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:
eval exec $out/bin/.yi-wrapped "\$@"
EOF
chmod +x $out/bin/yi
''; '';
meta = { meta = {
homepage = "http://haskell.org/haskellwiki/Yi"; homepage = "http://haskell.org/haskellwiki/Yi";
description = "The Haskell-Scriptable Editor"; description = "The Haskell-Scriptable Editor";
license = self.stdenv.lib.licenses.gpl2; license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ];
broken = true;
}; };
}) })

View File

@ -3090,9 +3090,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
wordTrie = callPackage ../development/libraries/haskell/word-trie {}; wordTrie = callPackage ../development/libraries/haskell/word-trie {};
yi = callPackage ../applications/editors/yi/yi.nix { yi = callPackage ../applications/editors/yi/yi.nix { };
vty = self.vty_4_7_5;
};
yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {};