Merge remote-tracking branch 'origin/master' into stdenv-updates.
This commit is contained in:
Peter Simons
commit
9e68734d61
@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
|
||||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20121212";
|
||||
version = "3.20130212";
|
||||
|
||||
lib = stdenv.lib;
|
||||
in
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
|
||||
sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
||||
@ -49,7 +49,7 @@ rec {
|
||||
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
|
||||
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
|
||||
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
|
||||
SafeSemaphore networkPprotocolXmpp async dns DAV;
|
||||
SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
||||
@ -8,18 +8,18 @@
|
||||
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
|
||||
, transformers, transformersBase, utf8String, wai, waiLogger, warp
|
||||
, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
|
||||
, networkPprotocolXmpp, async, dns, DAV
|
||||
, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20130107";
|
||||
version = "3.20130216";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
|
||||
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
|
||||
sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
|
||||
transformers transformersBase utf8String wai waiLogger warp yesod
|
||||
yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
|
||||
async dns DAV ];
|
||||
async dns DAV uuid Glob ];
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
||||
14
pkgs/development/libraries/haskell/Glob/default.nix
Normal file
14
pkgs/development/libraries/haskell/Glob/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, dlist, filepath, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Glob";
|
||||
version = "0.7.2";
|
||||
sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i";
|
||||
buildDepends = [ dlist filepath transformers ];
|
||||
meta = {
|
||||
homepage = "http://iki.fi/matti.niemenmaa/glob/";
|
||||
description = "Globbing library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Graphalyze";
|
||||
version = "0.14.0.0";
|
||||
sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg";
|
||||
version = "0.14.0.1";
|
||||
sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x";
|
||||
buildDepends = [
|
||||
bktrees fgl filepath graphviz pandoc random text time
|
||||
];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-html";
|
||||
version = "0.5.1.3";
|
||||
sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w";
|
||||
version = "0.6.0.0";
|
||||
sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll";
|
||||
buildDepends = [ blazeBuilder blazeMarkup text ];
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/blaze";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude";
|
||||
version = "0.5.0";
|
||||
sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp";
|
||||
version = "0.5.1";
|
||||
sha256 = "0kgnffqvh13adadp85iw4ybbs5jpa5hwrr2dsi2aj9p8lvzac1jy";
|
||||
buildDepends = [
|
||||
basicPrelude hashable liftedBase systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ghc-mod";
|
||||
version = "1.11.3";
|
||||
sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2";
|
||||
version = "1.11.4";
|
||||
sha256 = "1bxmpvad415ayzwyijjm0zsck0z8aa1nfjixwb6l80i6lbxi4rfg";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
|
||||
description = "Haml-like template files that are compile-time checked";
|
||||
|
||||
@ -6,14 +6,15 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-server";
|
||||
version = "7.1.4";
|
||||
sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576";
|
||||
version = "7.1.5";
|
||||
sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
|
||||
html monadControl mtl network parsec sendfile syb systemFilepath
|
||||
text threads time timeCompat transformers transformersBase
|
||||
utf8String xhtml zlib
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://happstack.com";
|
||||
description = "Web related tools and services";
|
||||
|
||||
@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
|
||||
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||
unorderedContainers vector xmlhtml
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://snapframework.com/";
|
||||
description = "An Haskell template system supporting both HTML5 and XML";
|
||||
|
||||
@ -2,12 +2,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.5.3.5";
|
||||
sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3";
|
||||
version = "0.5.3.6";
|
||||
sha256 = "0ypgw56gaa2hvh05ks079lfcaaynki3da471g39f23m3scgkawlr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
|
||||
prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/jgm/highlighting-kate";
|
||||
description = "Syntax highlighting";
|
||||
|
||||
@ -19,6 +19,9 @@ cabal.mkDerivation (self: {
|
||||
shakespeareJs shakespeareText text time transformers wai waiExtra
|
||||
warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal
|
||||
'';
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hs-bibutils";
|
||||
version = "4.16";
|
||||
sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb";
|
||||
version = "4.17";
|
||||
sha256 = "0vv1qsxbwwb1nfwpvxvqacfjs3sswldrx3wimaxixmw9ynkkkwdg";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hxt-regex-xmlschema";
|
||||
version = "9.0.4";
|
||||
sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf";
|
||||
version = "9.1.0";
|
||||
sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr";
|
||||
buildDepends = [ hxtCharproperties parsec ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lambdabot-utils";
|
||||
version = "4.2.1";
|
||||
sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx";
|
||||
version = "4.2.2";
|
||||
sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
|
||||
buildDepends = [
|
||||
binary haskellSrc mtl network random regexCompat regexPosix syb
|
||||
tagsoup utf8String zlib
|
||||
|
||||
@ -3,19 +3,19 @@
|
||||
, MonadCatchIOTransformers, mtl, parallel, profunctorExtras
|
||||
, profunctors, reflection, semigroupoids, semigroups, split, tagged
|
||||
, text, transformers, transformersCompat, unorderedContainers
|
||||
, vector
|
||||
, vector, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lens";
|
||||
version = "3.8.5";
|
||||
sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn";
|
||||
version = "3.8.7.3";
|
||||
sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
|
||||
buildDepends = [
|
||||
bifunctors comonad comonadsFd comonadTransformers contravariant
|
||||
distributive filepath genericDeriving hashable
|
||||
MonadCatchIOTransformers mtl parallel profunctorExtras profunctors
|
||||
reflection semigroupoids semigroups split tagged text transformers
|
||||
transformersCompat unorderedContainers vector
|
||||
transformersCompat unorderedContainers vector void
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/lens/";
|
||||
|
||||
15
pkgs/development/libraries/haskell/maccatcher/default.nix
Normal file
15
pkgs/development/libraries/haskell/maccatcher/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, binary, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "maccatcher";
|
||||
version = "2.1.5";
|
||||
sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ binary parsec ];
|
||||
meta = {
|
||||
description = "Obtain the host MAC address on *NIX and Windows";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monad-par";
|
||||
version = "0.3";
|
||||
sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
|
||||
version = "0.3.4";
|
||||
sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k";
|
||||
buildDepends = [
|
||||
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
|
||||
parallel
|
||||
@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
|
||||
text time xml zipArchive zlib
|
||||
];
|
||||
configureFlags = "-fblaze_html_0_5";
|
||||
patchPhase = ''
|
||||
sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
description = "Conversion between markup formats";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-postgresql";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and";
|
||||
version = "1.1.3";
|
||||
sha256 = "0dxazkdck2l5wxiyd7lcgd4xj95c7ql067s5hi3w1k89jf1wcx12";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent postgresqlLibpq
|
||||
postgresqlSimple text time transformers
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-sqlite";
|
||||
version = "1.1.2";
|
||||
sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3";
|
||||
version = "1.1.3";
|
||||
sha256 = "0rhwq9s6w48y867dmy5c0kvgrh9ixy3sqwq1i2zfacak82r6kki1";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent text transformers
|
||||
];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "168cxlnpcgkm7m7kzl3zlcvpgdl9wz7vx3anw8z8pc50qjns8dy0";
|
||||
buildDepends = [ aeson monadControl persistent text transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.4";
|
||||
sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj";
|
||||
version = "1.1.5";
|
||||
sha256 = "0jk4vkisc4as6xi0glc0sdldqf4xdj3s5xvv2vwzgjliyalggxga";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ cabal, readline, ncurses } :
|
||||
{ cabal, readline, ncurses }:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "readline";
|
||||
version = "1.0.1.0";
|
||||
sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d";
|
||||
version = "1.0.3.0";
|
||||
sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
|
||||
propagatedBuildInputs = [ readline ncurses ];
|
||||
# experimentally link with ncursesw because ghci can't interpret ld scripts,
|
||||
# and ncurses sometimes seems to be a script pointing to ncursesw
|
||||
@ -14,8 +14,6 @@ cabal.mkDerivation (self : {
|
||||
description = "An interface to the GNU readline library";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
];
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "unix-time";
|
||||
version = "0.1.4";
|
||||
sha256 = "1a8z9r75jk4z4diyigk0qzljkjqirxm30vf3jp75plnc9irysnw5";
|
||||
version = "0.1.5";
|
||||
sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
|
||||
meta = {
|
||||
description = "Unix time parser/formatter and utilities";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
14
pkgs/development/libraries/haskell/uuid/default.nix
Normal file
14
pkgs/development/libraries/haskell/uuid/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, binary, cryptohash, maccatcher, random, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "uuid";
|
||||
version = "1.2.9";
|
||||
sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi";
|
||||
buildDepends = [ binary cryptohash maccatcher random time ];
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/uuid/";
|
||||
description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -6,15 +6,15 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-app-static";
|
||||
version = "1.3.1";
|
||||
sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk";
|
||||
version = "1.3.1.1";
|
||||
sha256 = "0zbkjh2l9qjm4s9z7cm327kdrf58rhasn764pv347ll2n7gphgqq";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
|
||||
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
|
||||
systemFileio systemFilepath text time transformers unixCompat wai
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/wai";
|
||||
homepage = "http://www.yesodweb.com/book/web-application-interface";
|
||||
description = "WAI application for static serving";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "1.3.2.1";
|
||||
sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7";
|
||||
version = "1.3.2.3";
|
||||
sha256 = "1xqx00s1y87ji8n092f0rq150b3ahl1p4xwas5cl01ayp106ywzs";
|
||||
buildDepends = [
|
||||
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit dataDefault dateCache fastLogger httpTypes network
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-test";
|
||||
version = "1.3.0.1";
|
||||
sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l";
|
||||
version = "1.3.0.2";
|
||||
sha256 = "0awr1wwhky0mbllfdan42shfckmnnf66dji5zx7rhwjdfqvbbhzn";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
|
||||
httpTypes HUnit text transformers wai
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/wai";
|
||||
homepage = "http://www.yesodweb.com/book/web-application-interface";
|
||||
description = "Unit test framework (built on HUnit) for WAI applications";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai";
|
||||
version = "1.3.0.2";
|
||||
sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc";
|
||||
version = "1.3.0.3";
|
||||
sha256 = "091qykycxfh9f1jysdjxkw4msdgxp796as3yzv9sgqsxvz58rv1n";
|
||||
buildDepends = [
|
||||
blazeBuilder conduit httpTypes network text transformers vault
|
||||
];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.7.2";
|
||||
sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6";
|
||||
version = "1.3.7.3";
|
||||
sha256 = "0k68dqnz0j9x5698sr2yqcxh1bd3ppv2qh2dn4919lrlpzn3xd93";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
||||
@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
|
||||
blazeHtml blazeMarkup conduit dataDefault failure monadControl
|
||||
resourcet systemFilepath text transformers xmlTypes
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/xml";
|
||||
description = "Pure-Haskell utilities for dealing with XML with the conduit package";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-hamlet";
|
||||
version = "0.4.0.3";
|
||||
sha256 = "1923c2jg162jab01mcbpy52xs1pzxkrgny6sq8v0p758n8hjazwc";
|
||||
version = "0.4.0.4";
|
||||
sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98";
|
||||
buildDepends = [ parsec shakespeare text xmlConduit ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
|
||||
@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "XML parser and renderer with HTML 5 quirks mode";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.8.2";
|
||||
sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8";
|
||||
version = "0.8.2.1";
|
||||
sha256 = "1p0hi9psm42bsmm14gfdkj4wrbcgzkishcih6rwc2bcvn2i0hyyw";
|
||||
buildDepends = [
|
||||
aeson attoparsec conduit resourcet text transformers
|
||||
unorderedContainers vector
|
||||
|
||||
@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
|
||||
transformers unorderedContainers wai yesodCore yesodForm yesodJson
|
||||
yesodPersistent
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Authentication for Yesod";
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.1.8";
|
||||
sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm";
|
||||
version = "1.1.8.1";
|
||||
sha256 = "1bkqh8k7wwyj5s8pyxmlc1lrz47rz1mj49mqmpbislkjk0p6hbks";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
|
||||
clientsession conduit cookie failure fastLogger hamlet httpTypes
|
||||
@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
|
||||
text time transformers transformersBase vector wai waiExtra
|
||||
yesodRoutes
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Creation of type-safe, RESTful web applications";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-default";
|
||||
version = "1.1.3";
|
||||
sha256 = "1g0hb6jl0bp2q50pw2cy3hkbww1l230al08s7vfpqir68n9infiy";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "16kxq93q5q6bz47s1rfgswrygyp1g090b8r11n56r8mnr24ix0mi";
|
||||
buildDepends = [
|
||||
dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
|
||||
text transformers unorderedContainers wai waiExtra warp yaml
|
||||
|
||||
@ -6,14 +6,15 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-form";
|
||||
version = "1.2.1.1";
|
||||
sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm";
|
||||
version = "1.2.1.2";
|
||||
sha256 = "121c6ln8y6l2f9n6pjs2nrghz7w94pb34vp12cj8fabc71vk029j";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
|
||||
dataDefault emailValidate hamlet network persistent shakespeareCss
|
||||
shakespeareJs text time transformers wai xssSanitize yesodCore
|
||||
yesodPersistent
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Form handling support for Yesod Web Framework";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-json";
|
||||
version = "1.1.2";
|
||||
sha256 = "0vbjg038vgdwd5a4w7r5261xgvylzzk4gikk4285ns471x8n0vrf";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "0vrhn3v26q7cqwds99hqyibq09vyxnviqzgyn7w5ldnl3ycg7dqd";
|
||||
buildDepends = [
|
||||
aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
|
||||
text transformers vector wai waiExtra yesodCore yesodRoutes
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-static";
|
||||
version = "1.1.2";
|
||||
sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "0hpab9sgm6pa0lw2nl1p6l4gl3ciscsc21q0d2cp3aa75gavyrjz";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
|
||||
httpTypes systemFilepath text transformers unixCompat wai
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-test";
|
||||
version = "0.3.3.1";
|
||||
sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1";
|
||||
version = "0.3.3.2";
|
||||
sha256 = "0skr710fqqnna17gywaj30kpj352px2d17fwwqb832j7mj92bmv5";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
|
||||
cookie hspec htmlConduit httpTypes HUnit monadControl network
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod";
|
||||
version = "1.1.8";
|
||||
sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1";
|
||||
version = "1.1.8.1";
|
||||
sha256 = "01s9b0pqqj7q760vm62ni95k5fqwccw8l6531kqav2vnfvi08ric";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -27,6 +27,7 @@ cabal.mkDerivation (self: {
|
||||
yesodAuth yesodCore yesodDefault yesodForm yesodJson
|
||||
yesodPersistent zlib
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "Creation of type-safe, RESTful web applications";
|
||||
|
||||
@ -1,17 +1,21 @@
|
||||
{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib }:
|
||||
{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtorrent-rasterbar-${version}";
|
||||
version = "0.15.8";
|
||||
version = "0.16.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm";
|
||||
sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0";
|
||||
};
|
||||
|
||||
buildInputs = [ boost pkgconfig openssl zlib ];
|
||||
buildInputs = [ boost pkgconfig openssl zlib python ];
|
||||
|
||||
configureFlags = [ "--with-boost=${boost}/include/boost" "--with-boost-libdir=${boost}/lib" ];
|
||||
configureFlags = [
|
||||
"--with-boost=${boost}/include/boost"
|
||||
"--with-boost-libdir=${boost}/lib"
|
||||
"--enable-python-binding"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.rasterbar.com/products/libtorrent/;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "SourceGraph";
|
||||
version = "0.7.0.4";
|
||||
sha256 = "1rxbanvw1dpdnpmrf5gpl12gn9796yq89dnmdxy56mb9qzsm7nm6";
|
||||
version = "0.7.0.5";
|
||||
sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
garbas = "Rok Garbas <rok@garbas.si>";
|
||||
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
|
||||
guibert = "David Guibert <david.guibert@gmail.com>";
|
||||
iElectric = "Domen Kozar <domen@dev.si>";
|
||||
jcumming = "Jack Cummings <jack@mudshark.org>";
|
||||
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
|
||||
ludo = "Ludovic Courtès <ludo@gnu.org>";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, zlib, gd, texinfo
|
||||
{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper
|
||||
, texLive ? null
|
||||
, lua ? null
|
||||
, emacs ? null
|
||||
@ -11,25 +11,36 @@
|
||||
, cairo ? null
|
||||
, pkgconfig ? null
|
||||
, readline
|
||||
, fontconfig ? null, gnused ? null, coreutils ? null
|
||||
}:
|
||||
|
||||
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnuplot-4.4.4";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
|
||||
sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j";
|
||||
};
|
||||
|
||||
configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
|
||||
|
||||
buildInputs =
|
||||
[ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
|
||||
wxGTK pango cairo pkgconfig
|
||||
wxGTK pango cairo pkgconfig makeWrapper
|
||||
];
|
||||
|
||||
configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
|
||||
|
||||
postInstall = stdenv.lib.optionalString (libX11 != null) ''
|
||||
wrapProgram $out/bin/gnuplot \
|
||||
--prefix PATH : '${gnused}/bin' \
|
||||
--prefix PATH : '${coreutils}/bin' \
|
||||
--prefix PATH : '${fontconfig}/bin' \
|
||||
--run '. ${./set-gdfontpath-from-fontconfig.sh}'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnuplot.info;
|
||||
homepage = "http://www.gnuplot.info";
|
||||
description = "A portable command-line driven graphing utility for many platforms";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) )
|
||||
IFS=:
|
||||
export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}"
|
||||
unset IFS p
|
||||
66
pkgs/tools/security/apg/default.nix
Normal file
66
pkgs/tools/security/apg/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ stdenv, fetchurl }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apg-2.2.3";
|
||||
src = fetchurl {
|
||||
url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz";
|
||||
sha256 = "1fkxpaifv925i385krsyslrig42ksws5y19hfq5asn1rwv6zmjb9";
|
||||
};
|
||||
configurePhase = ''
|
||||
substituteInPlace Makefile --replace /usr/local "$out"
|
||||
'';
|
||||
preInstall = ''
|
||||
export CHOWNPROG=true
|
||||
export CHGRPPROG=true
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A tool set for random password generation.";
|
||||
longDescription = ''
|
||||
APG (Automated Password Generator) is the tool set for random
|
||||
password generation.
|
||||
|
||||
Standalone version
|
||||
|
||||
Generates some random words of required type and prints them
|
||||
to standard output.
|
||||
|
||||
Network version
|
||||
|
||||
APG server: When client's request is arrived generates some
|
||||
random words of predefined type and send them to client over
|
||||
the network (according to RFC0972).
|
||||
|
||||
APG client: Sends the password generation request to the APG
|
||||
server, wait for generated Passwords arrival and then prints
|
||||
them to the standard output.
|
||||
|
||||
Advantages
|
||||
|
||||
* Built-in ANSI X9.17 RNG (Random Number Generator) (CAST/SHA1)
|
||||
* Built-in password quality checking system (it has support for
|
||||
Bloom filter for faster access)
|
||||
* Two Password Generation Algorithms:
|
||||
1. Pronounceable Password Generation Algorithm (according to
|
||||
NIST FIPS 181)
|
||||
2. Random Character Password Generation Algorithm with 35
|
||||
configurable modes of operation
|
||||
* Configurable password length parameters
|
||||
* Configurable amount of generated passwords
|
||||
* Ability to initialize RNG with user string
|
||||
* Support for /dev/random
|
||||
* Ability to crypt() generated passwords and print them as
|
||||
additional output
|
||||
* Special parameters to use APG in script
|
||||
* Ability to log password generation requests for network version
|
||||
* Ability to control APG service access using tcpd
|
||||
* Ability to use password generation service from any type of box
|
||||
(Mac, WinXX, etc.) that connected to network
|
||||
* Ability to enforce remote users to use only allowed type of
|
||||
password generation
|
||||
'';
|
||||
homepage = http://www.adel.nursat.kz/apg/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -427,6 +427,8 @@ let
|
||||
pkgs_i686 = pkgsi686Linux;
|
||||
};
|
||||
|
||||
apg = callPackage ../tools/security/apg { };
|
||||
|
||||
xcodeenv = callPackage ../development/mobile/xcodeenv { };
|
||||
|
||||
titaniumenv = import ../development/mobile/titaniumenv {
|
||||
|
||||
@ -874,6 +874,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
libc = pkgs.stdenv.gcc.libc;
|
||||
};
|
||||
|
||||
Glob = callPackage ../development/libraries/haskell/Glob {};
|
||||
|
||||
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
|
||||
|
||||
gloss = callPackage ../development/libraries/haskell/gloss {
|
||||
@ -1181,6 +1183,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
logict = callPackage ../development/libraries/haskell/logict {};
|
||||
|
||||
maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
|
||||
|
||||
mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
|
||||
|
||||
mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
|
||||
@ -1218,8 +1222,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
|
||||
|
||||
monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
|
||||
monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {};
|
||||
monadPar = self.monadPar_0_3;
|
||||
monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {};
|
||||
monadPar = self.monadPar_0_3_4;
|
||||
|
||||
monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
|
||||
|
||||
@ -1755,6 +1759,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
uulib = callPackage ../development/libraries/haskell/uulib {};
|
||||
|
||||
uuid = callPackage ../development/libraries/haskell/uuid {};
|
||||
|
||||
uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {};
|
||||
|
||||
vacuum = callPackage ../development/libraries/haskell/vacuum {};
|
||||
|
||||
@ -721,6 +721,60 @@ pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
deluge = buildPythonPackage rec {
|
||||
name = "deluge-1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.deluge-torrent.org/source/${name}.tar.gz";
|
||||
md5 = "fbf52593a85bfa7c8520834fa9177fba";
|
||||
};
|
||||
|
||||
# TODO: gui, procsettitle
|
||||
buildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
|
||||
propagatedBuildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ];
|
||||
|
||||
meta = {
|
||||
homepage = http://deluge-torrent.org;
|
||||
description = "Torrent client";
|
||||
license = "GPLv3";
|
||||
maintainers = [ stdenv.lib.maintainers.iElectric ];
|
||||
};
|
||||
};
|
||||
|
||||
pyxdg = buildPythonPackage rec {
|
||||
name = "pyxdg-0.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz";
|
||||
md5 = "bedcdb3a0ed85986d40044c87f23477c";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://freedesktop.org/wiki/Software/pyxdg;
|
||||
description = "Contains implementations of freedesktop.org standards";
|
||||
license = "LGPLv2";
|
||||
maintainers = [ stdenv.lib.maintainers.iElectric ];
|
||||
};
|
||||
};
|
||||
|
||||
chardet = buildPythonPackage rec {
|
||||
name = "chardet-2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz";
|
||||
md5 = "295367fd210d20f3febda615a88e1ef0";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/erikrose/chardet;
|
||||
description = "Universal encoding detector";
|
||||
license = "LGPLv2";
|
||||
maintainers = [ stdenv.lib.maintainers.iElectric ];
|
||||
};
|
||||
};
|
||||
|
||||
django = buildPythonPackage rec {
|
||||
name = "Django-${version}";
|
||||
@ -1383,6 +1437,43 @@ pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Mako = buildPythonPackage rec {
|
||||
name = "Mako-0.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
|
||||
md5 = "daf7cc50f997533b573f9b40193139a2";
|
||||
};
|
||||
|
||||
buildInputs = [ MarkupSafe nose ];
|
||||
propagatedBuildInputs = [ MarkupSafe ];
|
||||
|
||||
meta = {
|
||||
description = "Super-fast templating language.";
|
||||
homepage = http://www.makotemplates.org;
|
||||
license = "MIT";
|
||||
maintainers = [ stdenv.lib.maintainers.iElectric ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
MarkupSafe = buildPythonPackage rec {
|
||||
name = "MarkupSafe-0.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz";
|
||||
md5 = "4e7c4d965fe5e033fa2d7bb7746bb186";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Implements a XML/HTML/XHTML Markup safe string";
|
||||
homepage = http://dev.pocoo.org;
|
||||
license = "BSD";
|
||||
maintainers = [ stdenv.lib.maintainers.iElectric ];
|
||||
};
|
||||
};
|
||||
|
||||
manuel = buildPythonPackage rec {
|
||||
name = "manuel-${version}";
|
||||
version = "1.6.0";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user