Update hackage-packages

Includes NixOS/cabal2nix#127
This commit is contained in:
Shea Levy 2015-01-13 08:55:02 -05:00
parent 8921a8f53b
commit 2ba3653ef6
4 changed files with 193 additions and 161 deletions

View file

@ -58,22 +58,6 @@ self: super: {
utf8-string = overrideCabal super.utf8-string (drv: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
});
options = overrideCabal super.options (drv: {
# edited cabal file simply makes a stricter base bound
editedCabalFile = null;
# See https://github.com/shlevy/haskell-options/tree/AMP. There is no
# official upstream bugtracker but I've emailed this patch to the maintainer
patches = [ ./patches/options-amp.patch ];
});
chell = overrideCabal super.chell (drv: {
# edited cabal file simply makes a stricter base bound
editedCabalFile = null;
# See https://github.com/shlevy/chell/tree/AMP. There is no
# official upstream bugtracker but I've emailed this patch to the maintainer
patches = [ ./patches/chell-amp.patch ];
});
# bos/attoparsec#92
attoparsec = dontCheck super.attoparsec;

View file

@ -4594,8 +4594,8 @@ self: {
}:
mkDerivation {
pname = "GLUtil";
version = "0.8.2";
sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3";
version = "0.8.3";
sha256 = "0r99nv60zkr88nhiz438wy0grcgqz6nwlzbp9aj4jv5bwdiph7j9";
buildDepends = [
array base bytestring containers cpphs directory filepath
JuicyPixels linear OpenGL OpenGLRaw transformers vector
@ -10461,6 +10461,7 @@ self: {
pname = "PBKDF2";
version = "0.3.1.5";
sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62";
editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e";
buildDepends = [ base binary bytestring Crypto random ];
description = "Make password-based security schemes more secure";
license = stdenv.lib.licenses.bsd3;
@ -14124,6 +14125,7 @@ self: {
pname = "X11-extras";
version = "0.4";
sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a";
editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c";
buildDepends = [ base X11 ];
extraLibraries = [ libX11 ];
description = "Missing bindings to the X11 graphics library";
@ -19958,25 +19960,27 @@ self: {
}) {};
"aws-kinesis-client" = callPackage
({ mkDerivation, aws, aws-general, aws-kinesis, base
, base-unicode-symbols, bytestring, conduit, data-carousel, either
, errors, hoist-error, http-conduit, kan-extensions, lens
, lens-action, lifted-async, lifted-base, monad-control, mtl
, optparse-applicative, random, resourcet, stm, stm-chans
, stm-conduit, stm-queue-extras, text, transformers
({ mkDerivation, aeson, aws, aws-general, aws-kinesis, base
, base-unicode-symbols, bytestring, conduit, containers
, data-carousel, either, errors, hoist-error, http-conduit
, kan-extensions, lens, lens-action, lifted-async, lifted-base
, monad-control, mtl, optparse-applicative, random, resourcet, stm
, stm-chans, stm-conduit, stm-queue-extras, text, transformers
, unordered-containers
}:
mkDerivation {
pname = "aws-kinesis-client";
version = "0.1.0.2";
sha256 = "1bdncmx9nrqqlk3czall9p2b82fz8yakjz3b79ba5adql6l1qlig";
version = "0.2.0.0";
sha256 = "0zyz84zwfqcwc95g8lwgzc5102wblc94f23sfgfgslk4w86489c9";
isLibrary = true;
isExecutable = true;
buildDepends = [
aws aws-general aws-kinesis base base-unicode-symbols bytestring
conduit data-carousel either errors hoist-error http-conduit
kan-extensions lens lens-action lifted-async lifted-base
monad-control mtl optparse-applicative random resourcet stm
stm-chans stm-conduit stm-queue-extras text transformers
aeson aws aws-general aws-kinesis base base-unicode-symbols
bytestring conduit containers data-carousel either errors
hoist-error http-conduit kan-extensions lens lens-action
lifted-async lifted-base monad-control mtl optparse-applicative
random resourcet stm stm-chans stm-conduit stm-queue-extras text
transformers unordered-containers
];
description = "A producer & consumer client library for AWS Kinesis";
license = stdenv.lib.licenses.asl20;
@ -24138,29 +24142,33 @@ self: {
}) {};
"buildwrapper" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
, cmdargs, containers, cpphs, deepseq, directory, dynamic-cabal
, filepath, ghc, ghc-paths, ghc-pkg-lib, haskell-src-exts, HTF
, HUnit, mtl, old-time, process, regex-tdfa, syb, text, time
, transformers, unordered-containers, utf8-string, vector
({ mkDerivation, aeson, async, attoparsec, base, bytestring, Cabal
, cmdargs, conduit, conduit-extra, containers, cpphs, deepseq
, directory, dynamic-cabal, filepath, ghc, ghc-paths, ghc-pkg-lib
, haskell-src-exts, HTF, HUnit, mtl, old-time, process, regex-tdfa
, syb, text, time, transformers, unordered-containers, utf8-string
, vector
}:
mkDerivation {
pname = "buildwrapper";
version = "0.8.11";
sha256 = "1jnjdqxhwclr3zs7vqd44gjbl208fb46a4sdwazmz6sr0f5fz8pr";
version = "0.9.0";
sha256 = "0hgl25rpcwhia3r8w34vxgi5llb87cmcpj5cxk58dh16nrx3mljw";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec base bytestring Cabal cmdargs containers cpphs
deepseq directory dynamic-cabal filepath ghc ghc-paths ghc-pkg-lib
haskell-src-exts mtl old-time process regex-tdfa syb text time
transformers unordered-containers utf8-string vector
aeson async attoparsec base bytestring Cabal cmdargs conduit
conduit-extra containers cpphs deepseq directory dynamic-cabal
filepath ghc ghc-paths ghc-pkg-lib haskell-src-exts mtl old-time
process regex-tdfa syb text time transformers unordered-containers
utf8-string vector
];
testDepends = [
aeson attoparsec base bytestring Cabal containers directory
dynamic-cabal filepath ghc-pkg-lib HTF HUnit mtl old-time process
text time transformers unordered-containers vector
aeson async attoparsec base bytestring Cabal conduit conduit-extra
containers directory dynamic-cabal filepath ghc-pkg-lib HTF HUnit
mtl old-time process text time transformers unordered-containers
vector
];
configureFlags = [ "-f-lib-werror" ];
homepage = "https://github.com/JPMoresmau/BuildWrapper";
description = "A library and an executable that provide an easy API for a Haskell IDE";
license = stdenv.lib.licenses.bsd3;
@ -27236,9 +27244,8 @@ self: {
}:
mkDerivation {
pname = "chell";
version = "0.4";
sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng";
editedCabalFile = "14853f792d3fab75efc50a9bc4e1493bf5afc8eaee06137f37adad8855ada3be";
version = "0.4.0.1";
sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
buildDepends = [
ansi-terminal base bytestring options patience random
template-haskell text transformers
@ -34617,8 +34624,8 @@ self: {
}:
mkDerivation {
pname = "dbus";
version = "0.10.9";
sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb";
version = "0.10.9.1";
sha256 = "08p1688yb3gjal20szida2x99wv2j6gkmmhwpl3qkzswifrz51ar";
buildDepends = [
base bytestring cereal containers libxml-sax network parsec random
text transformers unix vector xml-types
@ -38352,26 +38359,28 @@ self: {
"duplo" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, base64-bytestring, bytestring, containers, directory
, executable-path, filepath, filepather, fsnotify, hspec
, http-types, language-javascript, lens, MissingH, mtl, process
, QuickCheck, regex-compat, scotty, shake, system-fileio
, system-filepath, text, text-format, transformers
, unordered-containers, utf8-string, wai, warp
, executable-path, filepath, fsnotify, http-types, HUnit
, language-javascript, lens, MissingH, mtl, process, QuickCheck
, regex-compat, scotty, shake, system-fileio, system-filepath
, tasty, tasty-hunit, tasty-quickcheck, text, text-format
, transformers, unordered-containers, utf8-string, wai, warp
}:
mkDerivation {
pname = "duplo";
version = "1.6.18";
sha256 = "10nx7zg5y6yfj3kaadw3pc252s5p0dpklpb2by6vs504wg111cx4";
version = "1.6.19";
sha256 = "0flqkw140l0sn78qnq7x0gchgfdpmgx90d2g9cjvimj2w4gsnbk3";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aeson-pretty ansi-terminal base base64-bytestring bytestring
containers directory executable-path filepath filepather fsnotify
http-types language-javascript lens MissingH mtl process
regex-compat scotty shake system-fileio system-filepath text
text-format transformers unordered-containers utf8-string wai warp
containers directory executable-path filepath fsnotify http-types
language-javascript lens MissingH mtl process regex-compat scotty
shake system-fileio system-filepath text text-format transformers
unordered-containers utf8-string wai warp
];
testDepends = [
base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
];
testDepends = [ base hspec MissingH QuickCheck ];
description = "Frontend development build tool";
license = stdenv.lib.licenses.mit;
}) {};
@ -38543,12 +38552,13 @@ self: {
}:
mkDerivation {
pname = "dynamic-graph";
version = "0.1.0.4";
sha256 = "0wlrhyxql5f0ply6maz9ygy0959gdz64h47ff78kx67n3faymrm5";
version = "0.1.0.5";
sha256 = "002i8ck0xhgh6kd2z8hyw0c16d10sbc444n2kwgdb0mj4qsss8mn";
buildDepends = [
base bytestring cairo colour deepseq either GLFW-b GLUtil OpenGL
pango pipes transformers
];
homepage = "https://github.com/adamwalker/dynamic-graph";
description = "Draw and update graphs in real time with OpenGL";
license = stdenv.lib.licenses.bsd3;
}) {};
@ -41057,12 +41067,13 @@ self: {
}) {};
"exhaustive" = callPackage
({ mkDerivation, base, generics-sop, transformers }:
({ mkDerivation, base, generics-sop, template-haskell, transformers
}:
mkDerivation {
pname = "exhaustive";
version = "1.0.0";
sha256 = "07jh5dlvq8nc7gkwc08w0kzwngnjhbg1pfz604dks3ni47b2ivgv";
buildDepends = [ base generics-sop transformers ];
version = "1.1.0";
sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl";
buildDepends = [ base generics-sop template-haskell transformers ];
homepage = "http://github.com/ocharles/exhaustive";
description = "Compile time checks that a computation considers producing data through all possible constructors";
license = stdenv.lib.licenses.bsd3;
@ -41365,12 +41376,12 @@ self: {
}) {};
"extensible" = callPackage
({ mkDerivation, base, ghc-prim }:
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "extensible";
version = "0.2";
sha256 = "0lab6l9lgq8dw9wd4ib421l3dzhnwgrhvn6xhajydmfm3njranrz";
buildDepends = [ base ghc-prim ];
version = "0.2.2";
sha256 = "1m29jd3g1zkhjzhd6i9inmw54r2jvdw6014ni399gnzpfzgnk2qy";
buildDepends = [ base template-haskell ];
homepage = "https://github.com/fumieval/extensible";
description = "Poly-kinded, extensible ADTs";
license = stdenv.lib.licenses.bsd3;
@ -51253,6 +51264,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"hans-pfq" = callPackage
({ mkDerivation, base, bytestring, hans, pfq }:
mkDerivation {
pname = "hans-pfq";
version = "0.1.0.0";
sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
buildDepends = [ base bytestring hans pfq ];
homepage = "https://github.com/tolysz/hans-pfq";
description = "Driver for real ethernet devices for HaNS";
license = stdenv.lib.licenses.bsd3;
broken = true;
}) { pfq = null;};
"hapistrano" = callPackage
({ mkDerivation, base, either, filepath, lens, old-locale, process
, time, transformers
@ -68453,9 +68477,8 @@ self: {
}:
mkDerivation {
pname = "kan-extensions";
version = "4.2";
sha256 = "1bfz9azg6s1micw8drl6hj305731dnginx422ilqzb8pi317a9hx";
editedCabalFile = "9a79b987064b6cf73fba45b90f4a4eb843ebed8df0c99d5690b39bebf3d6ffe5";
version = "4.2.1";
sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl";
buildDepends = [
adjunctions array base comonad containers contravariant
distributive free mtl semigroupoids tagged transformers
@ -69514,6 +69537,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"lambdacms-core" = callPackage
({ mkDerivation, base, blaze-html, bytestring, containers
, data-default, esqueleto, file-embed, friendly-time, gravatar
, lists, mime-mail, old-locale, persistent, shakespeare
, template-haskell, text, time, uuid, wai, yesod, yesod-auth
, yesod-core, yesod-form
}:
mkDerivation {
pname = "lambdacms-core";
version = "0.0.7.2";
sha256 = "1b7x43bpi6nz8ff3dj4kj23zzzxb94kja7pyr3lzxmfjxbmgr3y6";
buildDepends = [
base blaze-html bytestring containers data-default esqueleto
file-embed friendly-time gravatar lists mime-mail old-locale
persistent shakespeare template-haskell text time uuid wai yesod
yesod-auth yesod-core yesod-form
];
homepage = "http://lambdacms.org";
description = "Core CMS extension for Yesod apps";
license = stdenv.lib.licenses.mit;
}) {};
"lambdacms-media" = callPackage
({ mkDerivation, base, directory, filepath, lambdacms-core
, persistent, shakespeare, text, time, yesod, yesod-form
}:
mkDerivation {
pname = "lambdacms-media";
version = "0.0.1";
sha256 = "1ga1k86h2azccq90216hx47xf4qh0wjp9wfvzdm8232dcb0d28y5";
buildDepends = [
base directory filepath lambdacms-core persistent shakespeare text
time yesod yesod-form
];
homepage = "http://lambdacms.org/media";
description = "Media CMS extension for Yesod apps";
license = stdenv.lib.licenses.mit;
}) {};
"lambdacube" = callPackage
({ mkDerivation, base, editline, mtl, pretty }:
mkDerivation {
@ -71803,8 +71865,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
version = "0.5.0.1";
sha256 = "1fs8fnznrbiy68s7q801587fdizign05jn1g9kqsdxjc6z6g96m8";
version = "0.6.0";
sha256 = "03m8nkcyv5hjcfrg58z1nj9908d6254g5abrgl4xg2f2mn8dcxpl";
buildDepends = [
async base constraints lifted-base monad-control transformers-base
];
@ -75165,8 +75227,8 @@ self: {
({ mkDerivation, base, bytestring, pcre, prednote, text }:
mkDerivation {
pname = "matchers";
version = "0.22.0.0";
sha256 = "1164a5ix7956vkn3ndsy5i1gczm8q7h0xz1n3ycwwlpmh92mymdv";
version = "0.24.0.0";
sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64";
buildDepends = [ base bytestring prednote text ];
extraLibraries = [ pcre ];
homepage = "http://www.github.com/massysett/matchers";
@ -77826,9 +77888,8 @@ self: {
}:
mkDerivation {
pname = "monoid-subclasses";
version = "0.4";
sha256 = "1v3jw9220cp4a4jg1px5p7dbrncjfllg3yamig4jqxpiv0pgyy2r";
editedCabalFile = "540ff0f4254a57cb8e1a5a64212f0cdb734cb9d6f4dfb5455c3bd82ffee996cb";
version = "0.4.0.1";
sha256 = "1gq1j5pq5764qxklhnpqi36vcacgqapjnzsfzcvivwxq564hky41";
buildDepends = [ base bytestring containers primes text vector ];
testDepends = [
base bytestring containers primes QuickCheck quickcheck-instances
@ -79035,8 +79096,8 @@ self: {
}:
mkDerivation {
pname = "mutable-containers";
version = "0.2.0.1";
sha256 = "0j51v08i7i37119yl9zg8bypdap8nhh58z6rhi6rjqx1x42bz9b0";
version = "0.2.1";
sha256 = "1ja0xy0kkpqdxgk5mkq8dasl8g5h2xyrs6w7zfanxvrnsy62mb4j";
buildDepends = [
base containers ghc-prim mono-traversable primitive vector
];
@ -82692,9 +82753,8 @@ self: {
}:
mkDerivation {
pname = "options";
version = "1.2.1";
sha256 = "1y9jpichzlslny4x6yxfsxs8kww1ynwpv7svxzd39xb9sg1lpy3m";
editedCabalFile = "e3a956d7492d4c4c114e63d69c10641f68190041cee3301fffacf422d35ca495";
version = "1.2.1.1";
sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
buildDepends = [ base containers monads-tf transformers ];
testDepends = [
base chell chell-quickcheck containers monads-tf transformers
@ -82718,6 +82778,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
"optparse-applicative_0_10_0" = callPackage
({ mkDerivation, ansi-wl-pprint, base, process, transformers
, transformers-compat
}:
mkDerivation {
pname = "optparse-applicative";
version = "0.10.0";
sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0";
buildDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
homepage = "https://github.com/pcapriotti/optparse-applicative";
description = "Utilities and combinators for parsing command line options";
license = stdenv.lib.licenses.bsd3;
}) {};
"optparse-applicative" = callPackage
({ mkDerivation, ansi-wl-pprint, base, process, transformers
, transformers-compat
@ -85443,6 +85520,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
"picoparsec" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, monoid-subclasses, QuickCheck, quickcheck-instances, scientific
, tasty, tasty-quickcheck, text
}:
mkDerivation {
pname = "picoparsec";
version = "0.1";
sha256 = "024j1iivy5vhpygn3bz48lrn06p84ncmax3p1g76xnszffklk6fh";
buildDepends = [
array base bytestring containers deepseq monoid-subclasses
scientific text
];
testDepends = [
base bytestring monoid-subclasses QuickCheck quickcheck-instances
tasty tasty-quickcheck text
];
configureFlags = [ "-f-developer" ];
homepage = "https://bitbucket.org/blamario/picoparsec";
description = "Fast combinator parsing for bytestrings and text";
license = stdenv.lib.licenses.bsd3;
}) {};
"picosat" = callPackage
({ mkDerivation, base }:
mkDerivation {
@ -85760,8 +85860,8 @@ self: {
({ mkDerivation, base, containers, pipes }:
mkDerivation {
pname = "pipes-interleave";
version = "0.2";
sha256 = "1hj6b19x5kslb2n8kkcv9ihxgrs3yicdxv995lih2n9lmcjwz7gs";
version = "0.2.1";
sha256 = "1xs48bxr4qjnwcmaajl3av4db87bxwm6nyffk3k5rks47lqmra3r";
buildDepends = [ base containers pipes ];
homepage = "http://github.com/bgamari/pipes-interleave";
description = "Interleave and merge streams of elements";
@ -87039,8 +87139,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "possible";
version = "0.1.0.4";
sha256 = "1m4dh12001avn47dn4kw3mrwvlk8fn1587qcbv9xn6za5dmiqi6j";
version = "0.1.0.5";
sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx";
buildDepends = [ base ];
homepage = "https://github.com/tolysz/possible";
description = "Three valued Data.Maybe";
@ -87425,8 +87525,8 @@ self: {
}:
mkDerivation {
pname = "prednote";
version = "0.28.0.0";
sha256 = "0d8cvpzi4916ak7y1i2n9db75nbskh357xyra2rd1c2r99xrrs6m";
version = "0.28.0.2";
sha256 = "19rapc6xv8d0qjdswhwvi1wawd6s30ah9y8gmzmwfhb3c3h0sqgp";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -92623,8 +92723,8 @@ self: {
}:
mkDerivation {
pname = "resolve-trivial-conflicts";
version = "0.2";
sha256 = "1ax6rg3av2mkqlijd1m44zk5fl0ll5b8w43lpikwidpci4vchv7v";
version = "0.2.0.1";
sha256 = "0bxjagilvjn21ph0lg2jrm3lbsinhjrp50cxf08rhyvjhdcngf1k";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -95302,8 +95402,8 @@ self: {
}:
mkDerivation {
pname = "scion-browser";
version = "0.4.2";
sha256 = "00h90qijqjrgizv6hq377yy6n6naf0d4z1xd9nyx6b5c6avyw3rb";
version = "0.4.3";
sha256 = "09kzg60q8m2dq43llm6gm866vqb8hvazwb452c9bly46n686bznl";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -97071,8 +97171,8 @@ self: {
}:
mkDerivation {
pname = "shake-language-c";
version = "0.6.3";
sha256 = "17s4k0ydwkjshvccbldfqxgqzwmzbkmhwwr33q71fawschz52hsm";
version = "0.6.4";
sha256 = "1wn491jcx78v748dyis7wg3jlg0kff0iv605a6f2ig3j7sxka1yz";
buildDepends = [
base data-default-class fclabels process shake split
unordered-containers
@ -98441,8 +98541,8 @@ self: {
({ mkDerivation, base, lens, taggy, taggy-lens, text }:
mkDerivation {
pname = "sitemap";
version = "0.1.1";
sha256 = "1nn5v9w9g4fiaiw67hpjbs4b7xpcf4cr1i2920q7dpwrgzvy7l04";
version = "0.1.2";
sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
buildDepends = [ base lens taggy taggy-lens text ];
homepage = "http://github.com/alpmestan/sitemap";
description = "Sitemap parser";
@ -104443,8 +104543,8 @@ self: {
}:
mkDerivation {
pname = "tables";
version = "0.4.1";
sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49";
version = "0.4.1.1";
sha256 = "1bv51i0bn0nlgi0zj8sjdch6m9dd8ncmnksz699fa28cn57ln64p";
buildDepends = [
base binary cereal comonad containers deepseq hashable lens
profunctors safecopy template-haskell transformers
@ -108462,6 +108562,7 @@ self: {
pname = "trace";
version = "0.1.0.4";
sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn";
editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef";
buildDepends = [
base containers either kan-extensions monad-control mtl profunctors
transformers transformers-base transformers-compat
@ -113178,8 +113279,8 @@ self: {
({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
mkDerivation {
pname = "vinyl";
version = "0.5";
sha256 = "0jm31cynhl8ggmi6ndj7lhfm85cqml67svxm4v3kc8mnw5gj3c59";
version = "0.5.1";
sha256 = "026h8lgz487d9xhfjscnfpykgv1ppk944hl8mb6z7y3c1vh4g63b";
buildDepends = [ base ghc-prim ];
testDepends = [ base doctest lens singletons ];
description = "Extensible Records";
@ -113193,8 +113294,8 @@ self: {
}:
mkDerivation {
pname = "vinyl-gl";
version = "0.2.1";
sha256 = "1i3hnsvk6zzrmsxmyzm0hyf5053czp85mc4ccy07kmz0wg4sd3w2";
version = "0.3.0.1";
sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a";
buildDepends = [
base containers GLUtil linear OpenGL tagged transformers vector
vinyl
@ -117067,6 +117168,7 @@ self: {
pname = "xmonad";
version = "0.11";
sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -1,20 +0,0 @@
commit 9ed27a3941b1d95833f0da403d90732c7ca7dad4
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jan 12 09:31:28 2015 -0500
Future-proof for the AMP
See https://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal
diff --git a/lib/Test/Chell.hs b/lib/Test/Chell.hs
index 85d601a..2a72e2e 100644
--- a/lib/Test/Chell.hs
+++ b/lib/Test/Chell.hs
@@ -118,6 +118,7 @@ module Test.Chell
, testOptionTimeout
) where
+import Prelude hiding (pure)
import qualified Control.Applicative
import qualified Control.Exception
import Control.Exception (Exception)

View file

@ -1,34 +0,0 @@
commit 1a2f65b97199bd69ef8f0cebcb8f58de5b26af1c
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jan 12 08:57:34 2015 -0500
Prepare for AMP
See https://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal
diff --git a/lib/Options/Tokenize.hs b/lib/Options/Tokenize.hs
index 2ead1ff..91998b6 100644
--- a/lib/Options/Tokenize.hs
+++ b/lib/Options/Tokenize.hs
@@ -11,6 +11,7 @@ module Options.Tokenize
, tokenize
) where
+import Control.Applicative (Applicative(..))
import Control.Monad.Error hiding (throwError)
import qualified Control.Monad.Error
import Control.Monad.State
@@ -53,6 +54,13 @@ data TokState = TokState
newtype Tok a = Tok { unTok :: ErrorT String (StateT TokState Identity) a }
+instance Functor Tok where
+ fmap = liftM
+
+instance Applicative Tok where
+ pure = return
+ (<*>) = ap
+
instance Monad Tok where
return = Tok . return
m >>= f = Tok (unTok m >>= unTok . f)