haskell-yi: update to 0.10.1

+24 -48
+23 -45
pkgs/applications/editors/yi/yi.nix
··· 1 - { cabal, alex, binary, Cabal, cautiousFile, concreteTyperep 2 - , dataDefault, derive, Diff, dlist, dyre, filepath, fingertree 3 - , glib, gtk, hashable, hint, HUnit, lens, mtl, pango, parsec 4 - , pointedlist, QuickCheck, random, regexBase, regexTdfa, safe 5 - , split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase 6 - , uniplate, unixCompat, unorderedContainers, utf8String, vty 7 - , xdgBasedir 8 - , withPango ? true 1 + # This file was auto-generated by cabal2nix. Please do NOT edit manually! 9 2 10 - # User may need extra dependencies for their configuration file so we 11 - # want to specify it here to have them available when wrapping the 12 - # produced binary. 13 - , extraDepends ? [ ] 3 + { cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist 4 + , dynamicState, dyre, filepath, glib, gtk, hashable, hint, HUnit 5 + , lens, makeWrapper, mtl, ooPrototypes, pango, parsec, pointedlist 6 + , QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split 7 + , tagged, tasty, tastyHunit, tastyQuickcheck, text, time 8 + , transformersBase, unixCompat, unorderedContainers, utf8String 9 + , vty, wordTrie, xdgBasedir, yiLanguage, yiRope 14 10 }: 15 11 16 12 cabal.mkDerivation (self: { 17 13 pname = "yi"; 18 - version = "0.8.2"; 19 - sha256 = "18rnyswsdzkh0jdcqfg8pr90mpm6xf11siv598svqkxg12d2qql9"; 14 + version = "0.10.1"; 15 + sha256 = "1vj4ndp43w7xlji4p2px79a8g90p64g54sr3hx4pzimwrlpmifk8"; 20 16 isLibrary = true; 21 17 isExecutable = true; 22 18 buildDepends = [ 23 - binary Cabal cautiousFile concreteTyperep dataDefault derive Diff 24 - dlist dyre filepath fingertree hashable hint lens mtl 19 + binary Cabal cautiousFile dataDefault derive dlist dynamicState 20 + dyre filepath glib gtk hashable hint lens mtl ooPrototypes pango 25 21 parsec pointedlist QuickCheck random regexBase regexTdfa safe 26 - split time transformersBase uniplate unixCompat unorderedContainers 27 - utf8String vty xdgBasedir 28 - ] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends; 22 + semigroups split tagged text time transformersBase unixCompat 23 + unorderedContainers utf8String vty wordTrie xdgBasedir yiLanguage 24 + yiRope 25 + ]; 29 26 testDepends = [ 30 - filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck 27 + filepath HUnit lens QuickCheck semigroups tasty tastyHunit 28 + tastyQuickcheck text yiLanguage yiRope 31 29 ]; 32 - buildTools = [ alex ]; 33 - configureFlags = if withPango then "-fpango" else "-f-pango"; 34 - doCheck = false; 35 - 36 - # https://ghc.haskell.org/trac/ghc/ticket/9170 37 - noHaddock = self.ghc.version == "7.6.3"; 38 - 39 - # Allows Yi to find the libraries it needs at runtime. 30 + buildTools = [ makeWrapper ]; 31 + configureFlags = "-fpango -fvty"; 32 + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8"; 40 33 postInstall = '' 41 - mv $out/bin/yi $out/bin/.yi-wrapped 42 - cat - > $out/bin/yi <<EOF 43 - #! ${self.stdenv.shell} 44 - # Trailing : is necessary for it to pick up Prelude &c. 45 - export GHC_PACKAGE_PATH=$(${self.ghc.GHCGetPackages} ${self.ghc.version} \ 46 - | sed 's/-package-db\ //g' \ 47 - | sed 's/^\ //g' \ 48 - | sed 's/\ /:/g')\ 49 - :$out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf: 50 - 51 - eval exec $out/bin/.yi-wrapped "\$@" 52 - EOF 53 - chmod +x $out/bin/yi 34 + wrapProgram $out/bin/yi --prefix GHC_PACKAGE_PATH : $out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:$GHC_PACKAGE_PATH 54 35 ''; 55 - 56 36 meta = { 57 37 homepage = "http://haskell.org/haskellwiki/Yi"; 58 38 description = "The Haskell-Scriptable Editor"; 59 39 license = self.stdenv.lib.licenses.gpl2; 60 40 platforms = self.ghc.meta.platforms; 61 - hydraPlatforms = self.stdenv.lib.platforms.none; 62 - maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ]; 63 - broken = true; 41 + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; 64 42 }; 65 43 })
+1 -3
pkgs/top-level/haskell-packages.nix
··· 3090 3090 3091 3091 wordTrie = callPackage ../development/libraries/haskell/word-trie {}; 3092 3092 3093 - yi = callPackage ../applications/editors/yi/yi.nix { 3094 - vty = self.vty_4_7_5; 3095 - }; 3093 + yi = callPackage ../applications/editors/yi/yi.nix { }; 3096 3094 3097 3095 yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; 3098 3096