mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 03:03:37 +00:00
Merge remote-tracking branch 'origin/master' into stdenv-updates.
This commit is contained in:
commit
20b4ace946
@ -1,10 +1,10 @@
|
||||
{ cabal, aeson, syb }:
|
||||
{ cabal, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc-types";
|
||||
version = "1.12";
|
||||
sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj";
|
||||
buildDepends = [ aeson syb ];
|
||||
version = "1.10";
|
||||
sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
description = "Types for representing a structured document";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tagsoup";
|
||||
version = "0.13";
|
||||
sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
|
||||
version = "0.12.8";
|
||||
sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ text ];
|
||||
|
@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
|
||||
attoparsec Cabal filepath lens QuickCheck random
|
||||
systemPosixRedirect text time vectorSpace
|
||||
];
|
||||
check = false;
|
||||
meta = {
|
||||
homepage = "https://github.com/liyang/thyme";
|
||||
description = "A faster time library";
|
||||
|
@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
|
||||
version = "0.3.0.0";
|
||||
sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8";
|
||||
buildDepends = [ hashable unorderedContainers ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/HeinrichApfelmus/vault";
|
||||
description = "a persistent store for values of arbitrary types";
|
||||
|
Loading…
Reference in New Issue
Block a user