diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index fa392c4e43c..4a6797f9010 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; name = "audacity-${version}"; src = fetchurl { url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; - sha256 = "1k4bbxhpfl80vm3gm3jxqly0syqjij5kwziy4xyq2c8aj2miwj1f"; + sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index bdb7c2a565a..0dcb585e12e 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib +, alsaLib, cairo , withX ? true }: @@ -14,41 +14,51 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; + url = "mirror://gnu/emacs/${name}.tar.xz"; sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; }; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX [ - x11 libXaw Xaw3d libXpm libpng libjpeg libungif - libtiff librsvg libXft imagemagick gtk - ]; + ++ stdenv.lib.optionals withX + [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gtk ] + ++ stdenv.lib.optional stdenv.isDarwin cairo; configureFlags = - (if withX then - [ "--with-x-toolkit=gtk" "--with-xft"] - else - [ "--with-x=no --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no" ]) + ( if withX then + [ "--with-x-toolkit=gtk" "--with-xft"] + else + [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ] ) # On NixOS, help Emacs find `crt*.o'. ++ stdenv.lib.optional (stdenv ? glibc) [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) + "-I${cairo}/include/cairo"; + postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el < +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.001 +Problem: Character classes such as [a-z] to not react to 'ignorecase'. + Breaks man page highlighting. (Mario Grgic) +Solution: Add separate items for classes that react to 'ignorecase'. Clean + up logic handling character classes. Add more tests. +Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok + + +*** ../vim-7.4.000/src/regexp_nfa.c 2013-08-01 18:27:51.000000000 +0200 +--- src/regexp_nfa.c 2013-08-14 11:49:50.000000000 +0200 +*************** +*** 29,34 **** +--- 29,37 ---- + # define NFA_REGEXP_DEBUG_LOG "nfa_regexp_debug.log" + #endif + ++ /* Added to NFA_ANY - NFA_NUPPER_IC to include a NL. */ ++ #define NFA_ADD_NL 31 ++ + enum + { + NFA_SPLIT = -1024, +*************** +*** 183,188 **** +--- 186,198 ---- + NFA_NLOWER, /* Match non-lowercase char */ + NFA_UPPER, /* Match uppercase char */ + NFA_NUPPER, /* Match non-uppercase char */ ++ NFA_LOWER_IC, /* Match [a-z] */ ++ NFA_NLOWER_IC, /* Match [^a-z] */ ++ NFA_UPPER_IC, /* Match [A-Z] */ ++ NFA_NUPPER_IC, /* Match [^A-Z] */ ++ ++ NFA_FIRST_NL = NFA_ANY + NFA_ADD_NL, ++ NFA_LAST_NL = NFA_NUPPER_IC + NFA_ADD_NL, + + NFA_CURSOR, /* Match cursor pos */ + NFA_LNUM, /* Match line number */ +*************** +*** 199,207 **** + NFA_MARK_LT, /* Match < mark */ + NFA_VISUAL, /* Match Visual area */ + +- NFA_FIRST_NL = NFA_ANY + ADD_NL, +- NFA_LAST_NL = NFA_NUPPER + ADD_NL, +- + /* Character classes [:alnum:] etc */ + NFA_CLASS_ALNUM, + NFA_CLASS_ALPHA, +--- 209,214 ---- +*************** +*** 578,583 **** +--- 585,592 ---- + * On failure, return 0 (=FAIL) + * Start points to the first char of the range, while end should point + * to the closing brace. ++ * Keep in mind that 'ignorecase' applies at execution time, thus [a-z] may ++ * need to be interpreted as [a-zA-Z]. + */ + static int + nfa_recognize_char_class(start, end, extra_newl) +*************** +*** 681,687 **** + return FAIL; + + if (newl == TRUE) +! extra_newl = ADD_NL; + + switch (config) + { +--- 690,696 ---- + return FAIL; + + if (newl == TRUE) +! extra_newl = NFA_ADD_NL; + + switch (config) + { +*************** +*** 710,722 **** + case CLASS_not | CLASS_az | CLASS_AZ: + return extra_newl + NFA_NALPHA; + case CLASS_az: +! return extra_newl + NFA_LOWER; + case CLASS_not | CLASS_az: +! return extra_newl + NFA_NLOWER; + case CLASS_AZ: +! return extra_newl + NFA_UPPER; + case CLASS_not | CLASS_AZ: +! return extra_newl + NFA_NUPPER; + } + return FAIL; + } +--- 719,731 ---- + case CLASS_not | CLASS_az | CLASS_AZ: + return extra_newl + NFA_NALPHA; + case CLASS_az: +! return extra_newl + NFA_LOWER_IC; + case CLASS_not | CLASS_az: +! return extra_newl + NFA_NLOWER_IC; + case CLASS_AZ: +! return extra_newl + NFA_UPPER_IC; + case CLASS_not | CLASS_AZ: +! return extra_newl + NFA_NUPPER_IC; + } + return FAIL; + } +*************** +*** 914,920 **** + break; + } + +! extra = ADD_NL; + + /* "\_[" is collection plus newline */ + if (c == '[') +--- 923,929 ---- + break; + } + +! extra = NFA_ADD_NL; + + /* "\_[" is collection plus newline */ + if (c == '[') +*************** +*** 970,976 **** + } + #endif + EMIT(nfa_classcodes[p - classchars]); +! if (extra == ADD_NL) + { + EMIT(NFA_NEWL); + EMIT(NFA_OR); +--- 979,985 ---- + } + #endif + EMIT(nfa_classcodes[p - classchars]); +! if (extra == NFA_ADD_NL) + { + EMIT(NFA_NEWL); + EMIT(NFA_OR); +*************** +*** 1240,1260 **** + { + /* + * Try to reverse engineer character classes. For example, +! * recognize that [0-9] stands for \d and [A-Za-z_] with \h, + * and perform the necessary substitutions in the NFA. + */ + result = nfa_recognize_char_class(regparse, endp, +! extra == ADD_NL); + if (result != FAIL) + { +! if (result >= NFA_DIGIT && result <= NFA_NUPPER) +! EMIT(result); +! else /* must be char class + newline */ + { +! EMIT(result - ADD_NL); + EMIT(NFA_NEWL); + EMIT(NFA_OR); + } + regparse = endp; + mb_ptr_adv(regparse); + return OK; +--- 1249,1269 ---- + { + /* + * Try to reverse engineer character classes. For example, +! * recognize that [0-9] stands for \d and [A-Za-z_] for \h, + * and perform the necessary substitutions in the NFA. + */ + result = nfa_recognize_char_class(regparse, endp, +! extra == NFA_ADD_NL); + if (result != FAIL) + { +! if (result >= NFA_FIRST_NL && result <= NFA_LAST_NL) + { +! EMIT(result - NFA_ADD_NL); + EMIT(NFA_NEWL); + EMIT(NFA_OR); + } ++ else ++ EMIT(result); + regparse = endp; + mb_ptr_adv(regparse); + return OK; +*************** +*** 1504,1510 **** + * collection, add an OR below. But not for negated + * range. */ + if (!negated) +! extra = ADD_NL; + } + else + { +--- 1513,1519 ---- + * collection, add an OR below. But not for negated + * range. */ + if (!negated) +! extra = NFA_ADD_NL; + } + else + { +*************** +*** 1537,1543 **** + EMIT(NFA_END_COLL); + + /* \_[] also matches \n but it's not negated */ +! if (extra == ADD_NL) + { + EMIT(reg_string ? NL : NFA_NEWL); + EMIT(NFA_OR); +--- 1546,1552 ---- + EMIT(NFA_END_COLL); + + /* \_[] also matches \n but it's not negated */ +! if (extra == NFA_ADD_NL) + { + EMIT(reg_string ? NL : NFA_NEWL); + EMIT(NFA_OR); +*************** +*** 2011,2017 **** + if (c >= NFA_FIRST_NL && c <= NFA_LAST_NL) + { + addnl = TRUE; +! c -= ADD_NL; + } + + STRCPY(code, ""); +--- 2020,2026 ---- + if (c >= NFA_FIRST_NL && c <= NFA_LAST_NL) + { + addnl = TRUE; +! c -= NFA_ADD_NL; + } + + STRCPY(code, ""); +*************** +*** 2217,2222 **** +--- 2226,2235 ---- + case NFA_NLOWER:STRCPY(code, "NFA_NLOWER"); break; + case NFA_UPPER: STRCPY(code, "NFA_UPPER"); break; + case NFA_NUPPER:STRCPY(code, "NFA_NUPPER"); break; ++ case NFA_LOWER_IC: STRCPY(code, "NFA_LOWER_IC"); break; ++ case NFA_NLOWER_IC: STRCPY(code, "NFA_NLOWER_IC"); break; ++ case NFA_UPPER_IC: STRCPY(code, "NFA_UPPER_IC"); break; ++ case NFA_NUPPER_IC: STRCPY(code, "NFA_NUPPER_IC"); break; + + default: + STRCPY(code, "CHAR(x)"); +*************** +*** 2687,2692 **** +--- 2700,2709 ---- + case NFA_NLOWER: + case NFA_UPPER: + case NFA_NUPPER: ++ case NFA_LOWER_IC: ++ case NFA_NLOWER_IC: ++ case NFA_UPPER_IC: ++ case NFA_NUPPER_IC: + /* possibly non-ascii */ + #ifdef FEAT_MBYTE + if (has_mbyte) +*************** +*** 3841,3846 **** +--- 3858,3867 ---- + case NFA_NLOWER: + case NFA_UPPER: + case NFA_NUPPER: ++ case NFA_LOWER_IC: ++ case NFA_NLOWER_IC: ++ case NFA_UPPER_IC: ++ case NFA_NUPPER_IC: + case NFA_START_COLL: + case NFA_START_NEG_COLL: + case NFA_NEWL: +*************** +*** 5872,5877 **** +--- 5893,5920 ---- + ADD_STATE_IF_MATCH(t->state); + break; + ++ case NFA_LOWER_IC: /* [a-z] */ ++ result = ri_lower(curc) || (ireg_ic && ri_upper(curc)); ++ ADD_STATE_IF_MATCH(t->state); ++ break; ++ ++ case NFA_NLOWER_IC: /* [^a-z] */ ++ result = curc != NUL ++ && !(ri_lower(curc) || (ireg_ic && ri_upper(curc))); ++ ADD_STATE_IF_MATCH(t->state); ++ break; ++ ++ case NFA_UPPER_IC: /* [A-Z] */ ++ result = ri_upper(curc) || (ireg_ic && ri_lower(curc)); ++ ADD_STATE_IF_MATCH(t->state); ++ break; ++ ++ case NFA_NUPPER_IC: /* ^[A-Z] */ ++ result = curc != NUL ++ && !(ri_upper(curc) || (ireg_ic && ri_lower(curc))); ++ ADD_STATE_IF_MATCH(t->state); ++ break; ++ + case NFA_BACKREF1: + case NFA_BACKREF2: + case NFA_BACKREF3: +*** ../vim-7.4.000/src/testdir/test64.in 2013-08-01 17:45:33.000000000 +0200 +--- src/testdir/test64.in 2013-08-14 11:50:11.000000000 +0200 +*************** +*** 289,303 **** + :call add(tl, [2, '.a\%$', " a\n "]) + :call add(tl, [2, '.a\%$', " a\n_a", "_a"]) + :" +! :"""" Test recognition of some character classes +! :call add(tl, [2, '[0-9]', '8', '8']) +! :call add(tl, [2, '[^0-9]', '8']) +! :call add(tl, [2, '[0-9a-fA-F]*', '0a7', '0a7']) +! :call add(tl, [2, '[^0-9A-Fa-f]\+', '0a7']) +! :call add(tl, [2, '[a-z_A-Z0-9]\+', 'aso_sfoij', 'aso_sfoij']) +! :call add(tl, [2, '[a-z]', 'a', 'a']) +! :call add(tl, [2, '[a-zA-Z]', 'a', 'a']) +! :call add(tl, [2, '[A-Z]', 'a']) + :call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa']) + :" + :"""" Tests for \z features +--- 289,317 ---- + :call add(tl, [2, '.a\%$', " a\n "]) + :call add(tl, [2, '.a\%$', " a\n_a", "_a"]) + :" +! :"""" Test recognition of character classes +! :call add(tl, [2, '[0-7]\+', 'x0123456789x', '01234567']) +! :call add(tl, [2, '[^0-7]\+', '0a;X+% 897', 'a;X+% 89']) +! :call add(tl, [2, '[0-9]\+', 'x0123456789x', '0123456789']) +! :call add(tl, [2, '[^0-9]\+', '0a;X+% 9', 'a;X+% ']) +! :call add(tl, [2, '[0-9a-fA-F]\+', 'x0189abcdefg', '0189abcdef']) +! :call add(tl, [2, '[^0-9A-Fa-f]\+', '0189g;X+% ab', 'g;X+% ']) +! :call add(tl, [2, '[a-z_A-Z0-9]\+', ';+aso_SfOij ', 'aso_SfOij']) +! :call add(tl, [2, '[^a-z_A-Z0-9]\+', 'aSo_;+% sfOij', ';+% ']) +! :call add(tl, [2, '[a-z_A-Z]\+', '0abyz_ABYZ;', 'abyz_ABYZ']) +! :call add(tl, [2, '[^a-z_A-Z]\+', 'abAB_09;+% yzYZ', '09;+% ']) +! :call add(tl, [2, '[a-z]\+', '0abcxyz1', 'abcxyz']) +! :call add(tl, [2, '[a-z]\+', 'AabxyzZ', 'abxyz']) +! :call add(tl, [2, '[^a-z]\+', 'a;X09+% x', ';X09+% ']) +! :call add(tl, [2, '[^a-z]\+', 'abX0;%yz', 'X0;%']) +! :call add(tl, [2, '[a-zA-Z]\+', '0abABxzXZ9', 'abABxzXZ']) +! :call add(tl, [2, '[^a-zA-Z]\+', 'ab09_;+ XZ', '09_;+ ']) +! :call add(tl, [2, '[A-Z]\+', 'aABXYZz', 'ABXYZ']) +! :call add(tl, [2, '[^A-Z]\+', 'ABx0;%YZ', 'x0;%']) +! :call add(tl, [2, '[a-z]\+\c', '0abxyzABXYZ;', 'abxyzABXYZ']) +! :call add(tl, [2, '[A-Z]\+\c', '0abABxzXZ9', 'abABxzXZ']) +! :call add(tl, [2, '\c[^a-z]\+', 'ab09_;+ XZ', '09_;+ ']) +! :call add(tl, [2, '\c[^A-Z]\+', 'ab09_;+ XZ', '09_;+ ']) + :call add(tl, [2, '\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa']) + :" + :"""" Tests for \z features +*** ../vim-7.4.000/src/testdir/test64.ok 2013-08-01 18:28:56.000000000 +0200 +--- src/testdir/test64.ok 2013-08-14 11:50:37.000000000 +0200 +*************** +*** 650,679 **** + OK 0 - .a\%$ + OK 1 - .a\%$ + OK 2 - .a\%$ +! OK 0 - [0-9] +! OK 1 - [0-9] +! OK 2 - [0-9] +! OK 0 - [^0-9] +! OK 1 - [^0-9] +! OK 2 - [^0-9] +! OK 0 - [0-9a-fA-F]* +! OK 1 - [0-9a-fA-F]* +! OK 2 - [0-9a-fA-F]* + OK 0 - [^0-9A-Fa-f]\+ + OK 1 - [^0-9A-Fa-f]\+ + OK 2 - [^0-9A-Fa-f]\+ + OK 0 - [a-z_A-Z0-9]\+ + OK 1 - [a-z_A-Z0-9]\+ + OK 2 - [a-z_A-Z0-9]\+ +! OK 0 - [a-z] +! OK 1 - [a-z] +! OK 2 - [a-z] +! OK 0 - [a-zA-Z] +! OK 1 - [a-zA-Z] +! OK 2 - [a-zA-Z] +! OK 0 - [A-Z] +! OK 1 - [A-Z] +! OK 2 - [A-Z] + OK 0 - \C[^A-Z]\+ + OK 1 - \C[^A-Z]\+ + OK 2 - \C[^A-Z]\+ +--- 650,721 ---- + OK 0 - .a\%$ + OK 1 - .a\%$ + OK 2 - .a\%$ +! OK 0 - [0-7]\+ +! OK 1 - [0-7]\+ +! OK 2 - [0-7]\+ +! OK 0 - [^0-7]\+ +! OK 1 - [^0-7]\+ +! OK 2 - [^0-7]\+ +! OK 0 - [0-9]\+ +! OK 1 - [0-9]\+ +! OK 2 - [0-9]\+ +! OK 0 - [^0-9]\+ +! OK 1 - [^0-9]\+ +! OK 2 - [^0-9]\+ +! OK 0 - [0-9a-fA-F]\+ +! OK 1 - [0-9a-fA-F]\+ +! OK 2 - [0-9a-fA-F]\+ + OK 0 - [^0-9A-Fa-f]\+ + OK 1 - [^0-9A-Fa-f]\+ + OK 2 - [^0-9A-Fa-f]\+ + OK 0 - [a-z_A-Z0-9]\+ + OK 1 - [a-z_A-Z0-9]\+ + OK 2 - [a-z_A-Z0-9]\+ +! OK 0 - [^a-z_A-Z0-9]\+ +! OK 1 - [^a-z_A-Z0-9]\+ +! OK 2 - [^a-z_A-Z0-9]\+ +! OK 0 - [a-z_A-Z]\+ +! OK 1 - [a-z_A-Z]\+ +! OK 2 - [a-z_A-Z]\+ +! OK 0 - [^a-z_A-Z]\+ +! OK 1 - [^a-z_A-Z]\+ +! OK 2 - [^a-z_A-Z]\+ +! OK 0 - [a-z]\+ +! OK 1 - [a-z]\+ +! OK 2 - [a-z]\+ +! OK 0 - [a-z]\+ +! OK 1 - [a-z]\+ +! OK 2 - [a-z]\+ +! OK 0 - [^a-z]\+ +! OK 1 - [^a-z]\+ +! OK 2 - [^a-z]\+ +! OK 0 - [^a-z]\+ +! OK 1 - [^a-z]\+ +! OK 2 - [^a-z]\+ +! OK 0 - [a-zA-Z]\+ +! OK 1 - [a-zA-Z]\+ +! OK 2 - [a-zA-Z]\+ +! OK 0 - [^a-zA-Z]\+ +! OK 1 - [^a-zA-Z]\+ +! OK 2 - [^a-zA-Z]\+ +! OK 0 - [A-Z]\+ +! OK 1 - [A-Z]\+ +! OK 2 - [A-Z]\+ +! OK 0 - [^A-Z]\+ +! OK 1 - [^A-Z]\+ +! OK 2 - [^A-Z]\+ +! OK 0 - [a-z]\+\c +! OK 1 - [a-z]\+\c +! OK 2 - [a-z]\+\c +! OK 0 - [A-Z]\+\c +! OK 1 - [A-Z]\+\c +! OK 2 - [A-Z]\+\c +! OK 0 - \c[^a-z]\+ +! OK 1 - \c[^a-z]\+ +! OK 2 - \c[^a-z]\+ +! OK 0 - \c[^A-Z]\+ +! OK 1 - \c[^A-Z]\+ +! OK 2 - \c[^A-Z]\+ + OK 0 - \C[^A-Z]\+ + OK 1 - \C[^A-Z]\+ + OK 2 - \C[^A-Z]\+ +*** ../vim-7.4.000/src/version.c 2013-08-10 13:29:20.000000000 +0200 +--- src/version.c 2013-08-14 11:54:57.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 1, + /**/ + +-- +How many light bulbs does it take to change a person? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.002 b/pkgs/applications/editors/vim/patches/7.4.002 new file mode 100644 index 00000000000..d92f4de6c2d --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.002 @@ -0,0 +1,77 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.002 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4b.002 +Problem: Pattern with two alternative look-behind matches does not match. + (Amadeus Demarzi) +Solution: When comparing PIMs also compare their state ID to see if they are + different. +Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok + + +*** ../vim-7.4.001/src/regexp_nfa.c 2013-08-14 12:05:54.000000000 +0200 +--- src/regexp_nfa.c 2013-08-14 13:12:09.000000000 +0200 +*************** +*** 3782,3787 **** +--- 3782,3790 ---- + if (two_unused) + /* one is used and two is not: not equal */ + return FALSE; ++ /* compare the state id */ ++ if (one->state->id != two->state->id) ++ return FALSE; + /* compare the position */ + if (REG_MULTI) + return one->end.pos.lnum == two->end.pos.lnum +*** ../vim-7.4.001/src/testdir/test64.in 2013-08-14 12:05:54.000000000 +0200 +--- src/testdir/test64.in 2013-08-14 12:58:38.000000000 +0200 +*************** +*** 421,426 **** +--- 421,429 ---- + :call add(tl, [2, '\(foo\)\@<=\>', 'barfoo', '', 'foo']) + :call add(tl, [2, '\(foo\)\@<=.*', 'foobar', 'bar', 'foo']) + :" ++ :" complicated look-behind match ++ :call add(tl, [2, '\(r\@<=\|\w\@ + :call add(tl, [2, '\(a*\)\@>a', 'aaaa']) + :call add(tl, [2, '\(a*\)\@>b', 'aaab', 'aaab', 'aaa']) +*** ../vim-7.4.001/src/testdir/test64.ok 2013-08-14 12:05:54.000000000 +0200 +--- src/testdir/test64.ok 2013-08-14 13:14:09.000000000 +0200 +*************** +*** 974,979 **** +--- 974,982 ---- + OK 0 - \(foo\)\@<=.* + OK 1 - \(foo\)\@<=.* + OK 2 - \(foo\)\@<=.* ++ OK 0 - \(r\@<=\|\w\@a + OK 1 - \(a*\)\@>a + OK 2 - \(a*\)\@>a +*** ../vim-7.4.001/src/version.c 2013-08-14 12:05:54.000000000 +0200 +--- src/version.c 2013-08-14 13:13:45.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 2, + /**/ + +-- +From "know your smileys": + :-)-O Smiling doctor with stethoscope + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.003 b/pkgs/applications/editors/vim/patches/7.4.003 new file mode 100644 index 00000000000..9aad3c8c8f1 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.003 @@ -0,0 +1,100 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.003 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.003 +Problem: Memory access error in Ruby syntax highlighting. (Christopher Chow) +Solution: Refresh stale pointer. (James McCoy) +Files: src/regexp_nfa.c + + +*** ../vim-7.4.002/src/regexp_nfa.c 2013-08-14 13:31:03.000000000 +0200 +--- src/regexp_nfa.c 2013-08-14 14:02:06.000000000 +0200 +*************** +*** 4120,4126 **** + sub = &subs->norm; + } + #ifdef FEAT_SYN_HL +! else if (state->c >= NFA_ZOPEN) + { + subidx = state->c - NFA_ZOPEN; + sub = &subs->synt; +--- 4120,4126 ---- + sub = &subs->norm; + } + #ifdef FEAT_SYN_HL +! else if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9) + { + subidx = state->c - NFA_ZOPEN; + sub = &subs->synt; +*************** +*** 4189,4194 **** +--- 4189,4201 ---- + } + + subs = addstate(l, state->out, subs, pim, off); ++ /* "subs" may have changed, need to set "sub" again */ ++ #ifdef FEAT_SYN_HL ++ if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9) ++ sub = &subs->synt; ++ else ++ #endif ++ sub = &subs->norm; + + if (save_in_use == -1) + { +*************** +*** 4237,4243 **** + sub = &subs->norm; + } + #ifdef FEAT_SYN_HL +! else if (state->c >= NFA_ZCLOSE) + { + subidx = state->c - NFA_ZCLOSE; + sub = &subs->synt; +--- 4244,4250 ---- + sub = &subs->norm; + } + #ifdef FEAT_SYN_HL +! else if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9) + { + subidx = state->c - NFA_ZCLOSE; + sub = &subs->synt; +*************** +*** 4281,4286 **** +--- 4288,4300 ---- + } + + subs = addstate(l, state->out, subs, pim, off); ++ /* "subs" may have changed, need to set "sub" again */ ++ #ifdef FEAT_SYN_HL ++ if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9) ++ sub = &subs->synt; ++ else ++ #endif ++ sub = &subs->norm; + + if (REG_MULTI) + sub->list.multi[subidx].end = save_lpos; +*** ../vim-7.4.002/src/version.c 2013-08-14 13:31:03.000000000 +0200 +--- src/version.c 2013-08-14 14:03:51.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 3, + /**/ + +-- +Where do you want to crash today? + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.004 b/pkgs/applications/editors/vim/patches/7.4.004 new file mode 100644 index 00000000000..f629d673fb8 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.004 @@ -0,0 +1,232 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.004 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.004 +Problem: When closing a window fails ":bwipe" may hang. +Solution: Let win_close() return FAIL and break out of the loop. +Files: src/window.c, src/proto/window.pro, src/buffer.c + + +*** ../vim-7.4.003/src/window.c 2013-07-24 17:38:29.000000000 +0200 +--- src/window.c 2013-08-14 16:52:44.000000000 +0200 +*************** +*** 2172,2179 **** + * If "free_buf" is TRUE related buffer may be unloaded. + * + * Called by :quit, :close, :xit, :wq and findtag(). + */ +! void + win_close(win, free_buf) + win_T *win; + int free_buf; +--- 2172,2180 ---- + * If "free_buf" is TRUE related buffer may be unloaded. + * + * Called by :quit, :close, :xit, :wq and findtag(). ++ * Returns FAIL when the window was not closed. + */ +! int + win_close(win, free_buf) + win_T *win; + int free_buf; +*************** +*** 2190,2210 **** + if (last_window()) + { + EMSG(_("E444: Cannot close last window")); +! return; + } + + #ifdef FEAT_AUTOCMD + if (win->w_closing || (win->w_buffer != NULL && win->w_buffer->b_closing)) +! return; /* window is already being closed */ + if (win == aucmd_win) + { + EMSG(_("E813: Cannot close autocmd window")); +! return; + } + if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window()) + { + EMSG(_("E814: Cannot close window, only autocmd window would remain")); +! return; + } + #endif + +--- 2191,2211 ---- + if (last_window()) + { + EMSG(_("E444: Cannot close last window")); +! return FAIL; + } + + #ifdef FEAT_AUTOCMD + if (win->w_closing || (win->w_buffer != NULL && win->w_buffer->b_closing)) +! return FAIL; /* window is already being closed */ + if (win == aucmd_win) + { + EMSG(_("E813: Cannot close autocmd window")); +! return FAIL; + } + if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window()) + { + EMSG(_("E814: Cannot close window, only autocmd window would remain")); +! return FAIL; + } + #endif + +*************** +*** 2212,2218 **** + * and then close the window and the tab page to avoid that curwin and + * curtab are invalid while we are freeing memory. */ + if (close_last_window_tabpage(win, free_buf, prev_curtab)) +! return; + + /* When closing the help window, try restoring a snapshot after closing + * the window. Otherwise clear the snapshot, it's now invalid. */ +--- 2213,2219 ---- + * and then close the window and the tab page to avoid that curwin and + * curtab are invalid while we are freeing memory. */ + if (close_last_window_tabpage(win, free_buf, prev_curtab)) +! return FAIL; + + /* When closing the help window, try restoring a snapshot after closing + * the window. Otherwise clear the snapshot, it's now invalid. */ +*************** +*** 2240,2261 **** + win->w_closing = TRUE; + apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf); + if (!win_valid(win)) +! return; + win->w_closing = FALSE; + if (last_window()) +! return; + } + win->w_closing = TRUE; + apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf); + if (!win_valid(win)) +! return; + win->w_closing = FALSE; + if (last_window()) +! return; + # ifdef FEAT_EVAL + /* autocmds may abort script processing */ + if (aborting()) +! return; + # endif + } + #endif +--- 2241,2262 ---- + win->w_closing = TRUE; + apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf); + if (!win_valid(win)) +! return FAIL; + win->w_closing = FALSE; + if (last_window()) +! return FAIL; + } + win->w_closing = TRUE; + apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf); + if (!win_valid(win)) +! return FAIL; + win->w_closing = FALSE; + if (last_window()) +! return FAIL; + # ifdef FEAT_EVAL + /* autocmds may abort script processing */ + if (aborting()) +! return FAIL; + # endif + } + #endif +*************** +*** 2303,2309 **** + * other window or moved to another tab page. */ + else if (!win_valid(win) || last_window() || curtab != prev_curtab + || close_last_window_tabpage(win, free_buf, prev_curtab)) +! return; + + /* Free the memory used for the window and get the window that received + * the screen space. */ +--- 2304,2310 ---- + * other window or moved to another tab page. */ + else if (!win_valid(win) || last_window() || curtab != prev_curtab + || close_last_window_tabpage(win, free_buf, prev_curtab)) +! return FAIL; + + /* Free the memory used for the window and get the window that received + * the screen space. */ +*************** +*** 2383,2388 **** +--- 2384,2390 ---- + #endif + + redraw_all_later(NOT_VALID); ++ return OK; + } + + /* +*** ../vim-7.4.003/src/proto/window.pro 2013-08-10 13:37:30.000000000 +0200 +--- src/proto/window.pro 2013-08-14 16:52:50.000000000 +0200 +*************** +*** 9,15 **** + void win_equal __ARGS((win_T *next_curwin, int current, int dir)); + void close_windows __ARGS((buf_T *buf, int keep_curwin)); + int one_window __ARGS((void)); +! void win_close __ARGS((win_T *win, int free_buf)); + void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); + void win_free_all __ARGS((void)); + win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp)); +--- 9,15 ---- + void win_equal __ARGS((win_T *next_curwin, int current, int dir)); + void close_windows __ARGS((buf_T *buf, int keep_curwin)); + int one_window __ARGS((void)); +! int win_close __ARGS((win_T *win, int free_buf)); + void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); + void win_free_all __ARGS((void)); + win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp)); +*** ../vim-7.4.003/src/buffer.c 2013-07-17 16:39:00.000000000 +0200 +--- src/buffer.c 2013-08-14 16:54:34.000000000 +0200 +*************** +*** 1186,1192 **** + && !(curwin->w_closing || curwin->w_buffer->b_closing) + # endif + && (firstwin != lastwin || first_tabpage->tp_next != NULL)) +! win_close(curwin, FALSE); + #endif + + /* +--- 1186,1195 ---- + && !(curwin->w_closing || curwin->w_buffer->b_closing) + # endif + && (firstwin != lastwin || first_tabpage->tp_next != NULL)) +! { +! if (win_close(curwin, FALSE) == FAIL) +! break; +! } + #endif + + /* +*** ../vim-7.4.003/src/version.c 2013-08-14 14:18:37.000000000 +0200 +--- src/version.c 2013-08-14 17:10:23.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 4, + /**/ + +-- +From "know your smileys": + *<|:-) Santa Claus (Ho Ho Ho) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.005 b/pkgs/applications/editors/vim/patches/7.4.005 new file mode 100644 index 00000000000..f85d1f0e3c8 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.005 @@ -0,0 +1,48 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.005 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.005 +Problem: Using "vaB" while 'virtualedit' is set selects the wrong area. + (Dimitar Dimitrov) +Solution: Reset coladd when finding a match. +Files: src/search.c + + +*** ../vim-7.4.004/src/search.c 2013-07-17 19:20:47.000000000 +0200 +--- src/search.c 2013-08-14 17:32:38.000000000 +0200 +*************** +*** 1760,1765 **** +--- 1760,1768 ---- + #endif + + pos = curwin->w_cursor; ++ #ifdef FEAT_VIRTUALEDIT ++ pos.coladd = 0; ++ #endif + linep = ml_get(pos.lnum); + + cpo_match = (vim_strchr(p_cpo, CPO_MATCH) != NULL); +*** ../vim-7.4.004/src/version.c 2013-08-14 17:11:14.000000000 +0200 +--- src/version.c 2013-08-14 17:38:05.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 5, + /**/ + +-- +You can't have everything. Where would you put it? + -- Steven Wright + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.006 b/pkgs/applications/editors/vim/patches/7.4.006 new file mode 100644 index 00000000000..55d3802c4d1 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.006 @@ -0,0 +1,66 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.006 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.006 +Problem: mkdir("foo/bar/", "p") gives an error message. (David Barnett) +Solution: Remove the trailing slash. (lcd) +Files: src/eval.c + + +*** ../vim-7.4.005/src/eval.c 2013-07-05 18:23:42.000000000 +0200 +--- src/eval.c 2013-08-22 12:00:28.000000000 +0200 +*************** +*** 14292,14297 **** +--- 14292,14301 ---- + return; + + dir = get_tv_string_buf(&argvars[0], buf); ++ if (*gettail(dir) == NUL) ++ /* remove trailing slashes */ ++ *gettail_sep(dir) = NUL; ++ + if (argvars[1].v_type != VAR_UNKNOWN) + { + if (argvars[2].v_type != VAR_UNKNOWN) +*************** +*** 14299,14305 **** + if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0) + mkdir_recurse(dir, prot); + } +! rettv->vval.v_number = prot != -1 ? vim_mkdir_emsg(dir, prot) : 0; + } + #endif + +--- 14303,14309 ---- + if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0) + mkdir_recurse(dir, prot); + } +! rettv->vval.v_number = prot == -1 ? FAIL : vim_mkdir_emsg(dir, prot); + } + #endif + +*** ../vim-7.4.005/src/version.c 2013-08-14 17:45:25.000000000 +0200 +--- src/version.c 2013-08-22 12:02:46.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 6, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +97. Your mother tells you to remember something, and you look for + a File/Save command. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.007 b/pkgs/applications/editors/vim/patches/7.4.007 new file mode 100644 index 00000000000..5495ffbf979 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.007 @@ -0,0 +1,95 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.007 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.007 +Problem: Creating a preview window on startup leaves the screen layout in a + messed up state. (Marius Gedminas) +Solution: Don't change firstwin. (Christian Brabandt) +Files: src/main.c + + +*** ../vim-7.4.006/src/main.c 2013-07-03 12:36:49.000000000 +0200 +--- src/main.c 2013-08-22 14:02:39.000000000 +0200 +*************** +*** 2727,2732 **** +--- 2727,2733 ---- + int arg_idx; /* index in argument list */ + int i; + int advance = TRUE; ++ win_T *win; + + # ifdef FEAT_AUTOCMD + /* +*************** +*** 2816,2839 **** + # ifdef FEAT_AUTOCMD + --autocmd_no_enter; + # endif + #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) +! /* +! * Avoid making a preview window the current window. +! */ +! if (firstwin->w_p_pvw) + { +! win_T *win; +! +! for (win = firstwin; win != NULL; win = win->w_next) +! if (!win->w_p_pvw) +! { +! firstwin = win; +! break; +! } + } + #endif +! /* make the first window the current window */ +! win_enter(firstwin, FALSE); + + # ifdef FEAT_AUTOCMD + --autocmd_no_leave; +--- 2817,2838 ---- + # ifdef FEAT_AUTOCMD + --autocmd_no_enter; + # endif ++ ++ /* make the first window the current window */ ++ win = firstwin; + #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) +! /* Avoid making a preview window the current window. */ +! while (win->w_p_pvw) + { +! win = win->w_next; +! if (win == NULL) +! { +! win = firstwin; +! break; +! } + } + #endif +! win_enter(win, FALSE); + + # ifdef FEAT_AUTOCMD + --autocmd_no_leave; +*** ../vim-7.4.006/src/version.c 2013-08-22 12:06:50.000000000 +0200 +--- src/version.c 2013-08-22 14:04:11.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 7, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +105. When someone asks you for your address, you tell them your URL. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.008 b/pkgs/applications/editors/vim/patches/7.4.008 new file mode 100644 index 00000000000..6abd493f914 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.008 @@ -0,0 +1,71 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.008 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.008 +Problem: New regexp engine can't be interrupted. +Solution: Check for CTRL-C pressed. (Yasuhiro Matsumoto) +Files: src/regexp_nfa.c, src/regexp.c + + +*** ../vim-7.4.007/src/regexp_nfa.c 2013-08-14 14:18:37.000000000 +0200 +--- src/regexp_nfa.c 2013-08-25 16:55:56.000000000 +0200 +*************** +*** 5089,5094 **** +--- 5089,5100 ---- + return FALSE; + } + #endif ++ /* Some patterns may take a long time to match, especially when using ++ * recursive_regmatch(). Allow interrupting them with CTRL-C. */ ++ fast_breakcheck(); ++ if (got_int) ++ return FALSE; ++ + nfa_match = FALSE; + + /* Allocate memory for the lists of nodes. */ +*** ../vim-7.4.007/src/regexp.c 2013-08-01 18:31:30.000000000 +0200 +--- src/regexp.c 2013-08-25 16:57:35.000000000 +0200 +*************** +*** 4311,4318 **** + */ + for (;;) + { +! /* Some patterns may cause a long time to match, even though they are not +! * illegal. E.g., "\([a-z]\+\)\+Q". Allow breaking them with CTRL-C. */ + fast_breakcheck(); + + #ifdef DEBUG +--- 4311,4318 ---- + */ + for (;;) + { +! /* Some patterns may take a long time to match, e.g., "\([a-z]\+\)\+Q". +! * Allow interrupting them with CTRL-C. */ + fast_breakcheck(); + + #ifdef DEBUG +*** ../vim-7.4.007/src/version.c 2013-08-22 14:14:23.000000000 +0200 +--- src/version.c 2013-08-25 16:57:51.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 8, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +124. You begin conversations with, "Who is your internet service provider?" + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.009 b/pkgs/applications/editors/vim/patches/7.4.009 new file mode 100644 index 00000000000..f5e5fa60912 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.009 @@ -0,0 +1,64 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.009 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.009 +Problem: When a file was not decrypted (yet), writing it may destroy the + contents. +Solution: Mark the file as readonly until decryption was done. (Christian + Brabandt) +Files: src/fileio.c + + +*** ../vim-7.4.008/src/fileio.c 2013-08-05 21:58:03.000000000 +0200 +--- src/fileio.c 2013-08-25 17:45:27.000000000 +0200 +*************** +*** 2926,2934 **** +--- 2926,2939 ---- + int *did_ask; /* flag: whether already asked for key */ + { + int method = crypt_method_from_magic((char *)ptr, *sizep); ++ int b_p_ro = curbuf->b_p_ro; + + if (method >= 0) + { ++ /* Mark the buffer as read-only until the decryption has taken place. ++ * Avoids accidentally overwriting the file with garbage. */ ++ curbuf->b_p_ro = TRUE; ++ + set_crypt_method(curbuf, method); + if (method > 0) + (void)blowfish_self_test(); +*************** +*** 2977,2982 **** +--- 2982,2989 ---- + *sizep -= CRYPT_MAGIC_LEN + salt_len + seed_len; + mch_memmove(ptr, ptr + CRYPT_MAGIC_LEN + salt_len + seed_len, + (size_t)*sizep); ++ /* Restore the read-only flag. */ ++ curbuf->b_p_ro = b_p_ro; + } + } + /* When starting to edit a new file which does not have encryption, clear +*** ../vim-7.4.008/src/version.c 2013-08-25 17:01:36.000000000 +0200 +--- src/version.c 2013-08-25 17:44:30.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 9, + /**/ + +-- +I have a watch cat! Just break in and she'll watch. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.010 b/pkgs/applications/editors/vim/patches/7.4.010 new file mode 100644 index 00000000000..fee6ba5b4a8 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.010 @@ -0,0 +1,79 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.010 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.010 (after 7.4.006) +Problem: Crash with invalid argument to mkdir(). +Solution: Check for empty string. (lcd47) +Files: src/eval.c + + +*** ../vim-7.4.009/src/eval.c 2013-08-22 12:06:50.000000000 +0200 +--- src/eval.c 2013-08-30 15:47:47.000000000 +0200 +*************** +*** 14292,14309 **** + return; + + dir = get_tv_string_buf(&argvars[0], buf); +! if (*gettail(dir) == NUL) +! /* remove trailing slashes */ +! *gettail_sep(dir) = NUL; +! +! if (argvars[1].v_type != VAR_UNKNOWN) + { +! if (argvars[2].v_type != VAR_UNKNOWN) +! prot = get_tv_number_chk(&argvars[2], NULL); +! if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0) +! mkdir_recurse(dir, prot); + } +- rettv->vval.v_number = prot == -1 ? FAIL : vim_mkdir_emsg(dir, prot); + } + #endif + +--- 14292,14314 ---- + return; + + dir = get_tv_string_buf(&argvars[0], buf); +! if (*dir == NUL) +! rettv->vval.v_number = FAIL; +! else + { +! if (*gettail(dir) == NUL) +! /* remove trailing slashes */ +! *gettail_sep(dir) = NUL; +! +! if (argvars[1].v_type != VAR_UNKNOWN) +! { +! if (argvars[2].v_type != VAR_UNKNOWN) +! prot = get_tv_number_chk(&argvars[2], NULL); +! if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0) +! mkdir_recurse(dir, prot); +! } +! rettv->vval.v_number = prot == -1 ? FAIL : vim_mkdir_emsg(dir, prot); + } + } + #endif + +*** ../vim-7.4.009/src/version.c 2013-08-25 17:46:05.000000000 +0200 +--- src/version.c 2013-08-30 15:48:37.000000000 +0200 +*************** +*** 729,730 **** +--- 729,732 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 10, + /**/ + +-- +I wish there was a knob on the TV to turn up the intelligence. +There's a knob called "brightness", but it doesn't seem to work. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.011 b/pkgs/applications/editors/vim/patches/7.4.011 new file mode 100644 index 00000000000..efff82c5eba --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.011 @@ -0,0 +1,100 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.011 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.011 +Problem: Cannot find out if "acl" and "xpm" features are supported. +Solution: Add "acl" and "xpm" to the list of features. (Ken Takata) +Files: src/eval.c, src/version.c + + +*** ../vim-7.4.010/src/eval.c 2013-08-30 16:00:04.000000000 +0200 +--- src/eval.c 2013-08-30 16:34:12.000000000 +0200 +*************** +*** 12135,12140 **** +--- 12135,12143 ---- + #ifndef CASE_INSENSITIVE_FILENAME + "fname_case", + #endif ++ #ifdef HAVE_ACL ++ "acl", ++ #endif + #ifdef FEAT_ARABIC + "arabic", + #endif +*************** +*** 12538,12544 **** + "xfontset", + #endif + #ifdef FEAT_XPM_W32 +! "xpm_w32", + #endif + #ifdef USE_XSMP + "xsmp", +--- 12541,12552 ---- + "xfontset", + #endif + #ifdef FEAT_XPM_W32 +! "xpm", +! "xpm_w32", /* for backward compatibility */ +! #else +! # if defined(HAVE_XPM) +! "xpm", +! # endif + #endif + #ifdef USE_XSMP + "xsmp", +*** ../vim-7.4.010/src/version.c 2013-08-30 16:00:04.000000000 +0200 +--- src/version.c 2013-08-30 16:34:37.000000000 +0200 +*************** +*** 60,65 **** +--- 60,70 ---- + + static char *(features[]) = + { ++ #ifdef HAVE_ACL ++ "+acl", ++ #else ++ "-acl", ++ #endif + #ifdef AMIGA /* only for Amiga systems */ + # ifdef FEAT_ARP + "+ARP", +*************** +*** 721,726 **** +--- 726,737 ---- + # else + "-xpm_w32", + # endif ++ #else ++ # ifdef HAVE_XPM ++ "+xpm", ++ # else ++ "-xpm", ++ # endif + #endif + NULL + }; +*** ../vim-7.4.010/src/version.c 2013-08-30 16:00:04.000000000 +0200 +--- src/version.c 2013-08-30 16:34:37.000000000 +0200 +*************** +*** 729,730 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 11, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +141. You'd rather go to http://www.weather.com/ than look out your window. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.012 b/pkgs/applications/editors/vim/patches/7.4.012 new file mode 100644 index 00000000000..f831442ea56 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.012 @@ -0,0 +1,202 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.012 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.012 +Problem: MS-Windows: resolving shortcut does not work properly with + multi-byte characters. +Solution: Use wide system functions. (Ken Takata) +Files: src/os_mswin.c + + +*** ../vim-7.4.011/src/os_mswin.c 2013-06-16 16:41:11.000000000 +0200 +--- src/os_mswin.c 2013-08-30 16:43:23.000000000 +0200 +*************** +*** 1761,1769 **** + IPersistFile *ppf = NULL; + OLECHAR wsz[MAX_PATH]; + WIN32_FIND_DATA ffd; // we get those free of charge +! TCHAR buf[MAX_PATH]; // could have simply reused 'wsz'... + char_u *rfname = NULL; + int len; + + /* Check if the file name ends in ".lnk". Avoid calling + * CoCreateInstance(), it's quite slow. */ +--- 1761,1773 ---- + IPersistFile *ppf = NULL; + OLECHAR wsz[MAX_PATH]; + WIN32_FIND_DATA ffd; // we get those free of charge +! CHAR buf[MAX_PATH]; // could have simply reused 'wsz'... + char_u *rfname = NULL; + int len; ++ # ifdef FEAT_MBYTE ++ IShellLinkW *pslw = NULL; ++ WIN32_FIND_DATAW ffdw; // we get those free of charge ++ # endif + + /* Check if the file name ends in ".lnk". Avoid calling + * CoCreateInstance(), it's quite slow. */ +*************** +*** 1775,1792 **** + + CoInitialize(NULL); + + // create a link manager object and request its interface + hr = CoCreateInstance( + &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLink, (void**)&psl); + if (hr != S_OK) +! goto shortcut_error; + + // Get a pointer to the IPersistFile interface. + hr = psl->lpVtbl->QueryInterface( + psl, &IID_IPersistFile, (void**)&ppf); + if (hr != S_OK) +! goto shortcut_error; + + // full path string must be in Unicode. + MultiByteToWideChar(CP_ACP, 0, fname, -1, wsz, MAX_PATH); +--- 1779,1840 ---- + + CoInitialize(NULL); + ++ # ifdef FEAT_MBYTE ++ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) ++ { ++ // create a link manager object and request its interface ++ hr = CoCreateInstance( ++ &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, ++ &IID_IShellLinkW, (void**)&pslw); ++ if (hr == S_OK) ++ { ++ WCHAR *p = enc_to_utf16(fname, NULL); ++ ++ if (p != NULL) ++ { ++ // Get a pointer to the IPersistFile interface. ++ hr = pslw->lpVtbl->QueryInterface( ++ pslw, &IID_IPersistFile, (void**)&ppf); ++ if (hr != S_OK) ++ goto shortcut_errorw; ++ ++ // "load" the name and resolve the link ++ hr = ppf->lpVtbl->Load(ppf, p, STGM_READ); ++ if (hr != S_OK) ++ goto shortcut_errorw; ++ # if 0 // This makes Vim wait a long time if the target does not exist. ++ hr = pslw->lpVtbl->Resolve(pslw, NULL, SLR_NO_UI); ++ if (hr != S_OK) ++ goto shortcut_errorw; ++ # endif ++ ++ // Get the path to the link target. ++ ZeroMemory(wsz, MAX_PATH * sizeof(WCHAR)); ++ hr = pslw->lpVtbl->GetPath(pslw, wsz, MAX_PATH, &ffdw, 0); ++ if (hr == S_OK && wsz[0] != NUL) ++ rfname = utf16_to_enc(wsz, NULL); ++ ++ shortcut_errorw: ++ vim_free(p); ++ if (hr == S_OK) ++ goto shortcut_end; ++ } ++ } ++ /* Retry with non-wide function (for Windows 98). */ ++ } ++ # endif + // create a link manager object and request its interface + hr = CoCreateInstance( + &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLink, (void**)&psl); + if (hr != S_OK) +! goto shortcut_end; + + // Get a pointer to the IPersistFile interface. + hr = psl->lpVtbl->QueryInterface( + psl, &IID_IPersistFile, (void**)&ppf); + if (hr != S_OK) +! goto shortcut_end; + + // full path string must be in Unicode. + MultiByteToWideChar(CP_ACP, 0, fname, -1, wsz, MAX_PATH); +*************** +*** 1794,1805 **** + // "load" the name and resolve the link + hr = ppf->lpVtbl->Load(ppf, wsz, STGM_READ); + if (hr != S_OK) +! goto shortcut_error; +! #if 0 // This makes Vim wait a long time if the target doesn't exist. + hr = psl->lpVtbl->Resolve(psl, NULL, SLR_NO_UI); + if (hr != S_OK) +! goto shortcut_error; +! #endif + + // Get the path to the link target. + ZeroMemory(buf, MAX_PATH); +--- 1842,1853 ---- + // "load" the name and resolve the link + hr = ppf->lpVtbl->Load(ppf, wsz, STGM_READ); + if (hr != S_OK) +! goto shortcut_end; +! # if 0 // This makes Vim wait a long time if the target doesn't exist. + hr = psl->lpVtbl->Resolve(psl, NULL, SLR_NO_UI); + if (hr != S_OK) +! goto shortcut_end; +! # endif + + // Get the path to the link target. + ZeroMemory(buf, MAX_PATH); +*************** +*** 1807,1818 **** + if (hr == S_OK && buf[0] != NUL) + rfname = vim_strsave(buf); + +! shortcut_error: + // Release all interface pointers (both belong to the same object) + if (ppf != NULL) + ppf->lpVtbl->Release(ppf); + if (psl != NULL) + psl->lpVtbl->Release(psl); + + CoUninitialize(); + return rfname; +--- 1855,1870 ---- + if (hr == S_OK && buf[0] != NUL) + rfname = vim_strsave(buf); + +! shortcut_end: + // Release all interface pointers (both belong to the same object) + if (ppf != NULL) + ppf->lpVtbl->Release(ppf); + if (psl != NULL) + psl->lpVtbl->Release(psl); ++ # ifdef FEAT_MBYTE ++ if (pslw != NULL) ++ pslw->lpVtbl->Release(pslw); ++ # endif + + CoUninitialize(); + return rfname; +*** ../vim-7.4.011/src/version.c 2013-08-30 16:35:41.000000000 +0200 +--- src/version.c 2013-08-30 16:39:40.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 12, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +142. You dream about creating the world's greatest web site. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.013 b/pkgs/applications/editors/vim/patches/7.4.013 new file mode 100644 index 00000000000..dcbe0fb3e43 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.013 @@ -0,0 +1,99 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.013 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.013 +Problem: File name buffer too small for utf-8. +Solution: Use character count instead of byte count. (Ken Takata) +Files: src/os_mswin.c + + +*** ../vim-7.4.012/src/os_mswin.c 2013-08-30 16:44:15.000000000 +0200 +--- src/os_mswin.c 2013-08-30 16:47:54.000000000 +0200 +*************** +*** 456,462 **** +--- 456,469 ---- + int + mch_isFullName(char_u *fname) + { ++ #ifdef FEAT_MBYTE ++ /* WinNT and later can use _MAX_PATH wide characters for a pathname, which ++ * means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is ++ * UTF-8. */ ++ char szName[_MAX_PATH * 3 + 1]; ++ #else + char szName[_MAX_PATH + 1]; ++ #endif + + /* A name like "d:/foo" and "//server/share" is absolute */ + if ((fname[0] && fname[1] == ':' && (fname[2] == '/' || fname[2] == '\\')) +*************** +*** 464,470 **** + return TRUE; + + /* A name that can't be made absolute probably isn't absolute. */ +! if (mch_FullName(fname, szName, _MAX_PATH, FALSE) == FAIL) + return FALSE; + + return pathcmp(fname, szName, -1) == 0; +--- 471,477 ---- + return TRUE; + + /* A name that can't be made absolute probably isn't absolute. */ +! if (mch_FullName(fname, szName, sizeof(szName) - 1, FALSE) == FAIL) + return FALSE; + + return pathcmp(fname, szName, -1) == 0; +*************** +*** 498,507 **** + int + vim_stat(const char *name, struct stat *stp) + { + char buf[_MAX_PATH + 1]; + char *p; + +! vim_strncpy((char_u *)buf, (char_u *)name, _MAX_PATH); + p = buf + strlen(buf); + if (p > buf) + mb_ptr_back(buf, p); +--- 505,521 ---- + int + vim_stat(const char *name, struct stat *stp) + { ++ #ifdef FEAT_MBYTE ++ /* WinNT and later can use _MAX_PATH wide characters for a pathname, which ++ * means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is ++ * UTF-8. */ ++ char buf[_MAX_PATH * 3 + 1]; ++ #else + char buf[_MAX_PATH + 1]; ++ #endif + char *p; + +! vim_strncpy((char_u *)buf, (char_u *)name, sizeof(buf) - 1); + p = buf + strlen(buf); + if (p > buf) + mb_ptr_back(buf, p); +*** ../vim-7.4.012/src/version.c 2013-08-30 16:44:15.000000000 +0200 +--- src/version.c 2013-08-30 16:47:36.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 13, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +143. You dream in pallettes of 216 websafe colors. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.014 b/pkgs/applications/editors/vim/patches/7.4.014 new file mode 100644 index 00000000000..f6554337f27 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.014 @@ -0,0 +1,102 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.014 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.014 +Problem: MS-Windows: check for writing to device does not work. +Solution: Fix #ifdefs. (Ken Takata) +Files: src/fileio.c + + +*** ../vim-7.4.013/src/fileio.c 2013-08-25 17:46:05.000000000 +0200 +--- src/fileio.c 2013-08-30 16:56:46.000000000 +0200 +*************** +*** 428,440 **** + } + } + +- #ifdef UNIX +- /* +- * On Unix it is possible to read a directory, so we have to +- * check for it before the mch_open(). +- */ + if (!read_stdin && !read_buffer) + { + perm = mch_getperm(fname); + if (perm >= 0 && !S_ISREG(perm) /* not a regular file ... */ + # ifdef S_ISFIFO +--- 428,440 ---- + } + } + + if (!read_stdin && !read_buffer) + { ++ #ifdef UNIX ++ /* ++ * On Unix it is possible to read a directory, so we have to ++ * check for it before the mch_open(). ++ */ + perm = mch_getperm(fname); + if (perm >= 0 && !S_ISREG(perm) /* not a regular file ... */ + # ifdef S_ISFIFO +*************** +*** 457,464 **** + msg_scroll = msg_save; + return FAIL; + } +! +! # if defined(MSDOS) || defined(MSWIN) || defined(OS2) + /* + * MS-Windows allows opening a device, but we will probably get stuck + * trying to read it. +--- 457,464 ---- + msg_scroll = msg_save; + return FAIL; + } +! #endif +! #if defined(MSDOS) || defined(MSWIN) || defined(OS2) + /* + * MS-Windows allows opening a device, but we will probably get stuck + * trying to read it. +*************** +*** 470,478 **** + msg_scroll = msg_save; + return FAIL; + } +- # endif +- } + #endif + + /* Set default or forced 'fileformat' and 'binary'. */ + set_file_options(set_options, eap); +--- 470,477 ---- + msg_scroll = msg_save; + return FAIL; + } + #endif ++ } + + /* Set default or forced 'fileformat' and 'binary'. */ + set_file_options(set_options, eap); +*** ../vim-7.4.013/src/version.c 2013-08-30 16:51:15.000000000 +0200 +--- src/version.c 2013-08-30 16:54:33.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 14, + /**/ + +-- +Drink wet cement and get really stoned. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.015 b/pkgs/applications/editors/vim/patches/7.4.015 new file mode 100644 index 00000000000..e8b284d12b3 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.015 @@ -0,0 +1,106 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.015 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.015 +Problem: MS-Windows: Detecting node type does not work for multi-byte + characters. +Solution: Use wide character function when needed. (Ken Takata) +Files: src/os_win32.c + + +*** ../vim-7.4.014/src/os_win32.c 2013-08-10 12:39:12.000000000 +0200 +--- src/os_win32.c 2013-08-30 17:09:47.000000000 +0200 +*************** +*** 3107,3112 **** +--- 3107,3115 ---- + { + HANDLE hFile; + int type; ++ #ifdef FEAT_MBYTE ++ WCHAR *wn = NULL; ++ #endif + + /* We can't open a file with a name "\\.\con" or "\\.\prn" and trying to + * read from it later will cause Vim to hang. Thus return NODE_WRITABLE +*************** +*** 3114,3127 **** + if (STRNCMP(name, "\\\\.\\", 4) == 0) + return NODE_WRITABLE; + +! hFile = CreateFile(name, /* file name */ +! GENERIC_WRITE, /* access mode */ +! 0, /* share mode */ +! NULL, /* security descriptor */ +! OPEN_EXISTING, /* creation disposition */ +! 0, /* file attributes */ +! NULL); /* handle to template file */ + + if (hFile == INVALID_HANDLE_VALUE) + return NODE_NORMAL; + +--- 3117,3157 ---- + if (STRNCMP(name, "\\\\.\\", 4) == 0) + return NODE_WRITABLE; + +! #ifdef FEAT_MBYTE +! if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) +! { +! wn = enc_to_utf16(name, NULL); +! if (wn != NULL) +! { +! hFile = CreateFileW(wn, /* file name */ +! GENERIC_WRITE, /* access mode */ +! 0, /* share mode */ +! NULL, /* security descriptor */ +! OPEN_EXISTING, /* creation disposition */ +! 0, /* file attributes */ +! NULL); /* handle to template file */ +! if (hFile == INVALID_HANDLE_VALUE +! && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) +! { +! /* Retry with non-wide function (for Windows 98). */ +! vim_free(wn); +! wn = NULL; +! } +! } +! } +! if (wn == NULL) +! #endif +! hFile = CreateFile(name, /* file name */ +! GENERIC_WRITE, /* access mode */ +! 0, /* share mode */ +! NULL, /* security descriptor */ +! OPEN_EXISTING, /* creation disposition */ +! 0, /* file attributes */ +! NULL); /* handle to template file */ + ++ #ifdef FEAT_MBYTE ++ vim_free(wn); ++ #endif + if (hFile == INVALID_HANDLE_VALUE) + return NODE_NORMAL; + +*** ../vim-7.4.014/src/version.c 2013-08-30 17:06:56.000000000 +0200 +--- src/version.c 2013-08-30 17:09:35.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 15, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +144. You eagerly await the update of the "Cool Site of the Day." + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.016 b/pkgs/applications/editors/vim/patches/7.4.016 new file mode 100644 index 00000000000..c58c605f5c1 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.016 @@ -0,0 +1,221 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.016 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.016 +Problem: MS-Windows: File name completion doesn't work properly with + Chinese characters. (Yue Wu) +Solution: Add fname_casew(). (Ken Takata) +Files: src/os_win32.c + + +*** ../vim-7.4.015/src/os_win32.c 2013-08-30 17:11:29.000000000 +0200 +--- src/os_win32.c 2013-08-30 17:28:30.000000000 +0200 +*************** +*** 2500,2508 **** +--- 2500,2624 ---- + } + + ++ #ifdef FEAT_MBYTE ++ /* ++ * fname_casew(): Wide version of fname_case(). Set the case of the file name, ++ * if it already exists. When "len" is > 0, also expand short to long ++ * filenames. ++ * Return FAIL if wide functions are not available, OK otherwise. ++ * NOTE: much of this is identical to fname_case(), keep in sync! ++ */ ++ static int ++ fname_casew( ++ WCHAR *name, ++ int len) ++ { ++ WCHAR szTrueName[_MAX_PATH + 2]; ++ WCHAR szTrueNameTemp[_MAX_PATH + 2]; ++ WCHAR *ptrue, *ptruePrev; ++ WCHAR *porig, *porigPrev; ++ int flen; ++ WIN32_FIND_DATAW fb; ++ HANDLE hFind; ++ int c; ++ int slen; ++ ++ flen = (int)wcslen(name); ++ if (flen > _MAX_PATH) ++ return OK; ++ ++ /* slash_adjust(name) not needed, already adjusted by fname_case(). */ ++ ++ /* Build the new name in szTrueName[] one component at a time. */ ++ porig = name; ++ ptrue = szTrueName; ++ ++ if (iswalpha(porig[0]) && porig[1] == L':') ++ { ++ /* copy leading drive letter */ ++ *ptrue++ = *porig++; ++ *ptrue++ = *porig++; ++ *ptrue = NUL; /* in case nothing follows */ ++ } ++ ++ while (*porig != NUL) ++ { ++ /* copy \ characters */ ++ while (*porig == psepc) ++ *ptrue++ = *porig++; ++ ++ ptruePrev = ptrue; ++ porigPrev = porig; ++ while (*porig != NUL && *porig != psepc) ++ { ++ *ptrue++ = *porig++; ++ } ++ *ptrue = NUL; ++ ++ /* To avoid a slow failure append "\*" when searching a directory, ++ * server or network share. */ ++ wcscpy(szTrueNameTemp, szTrueName); ++ slen = (int)wcslen(szTrueNameTemp); ++ if (*porig == psepc && slen + 2 < _MAX_PATH) ++ wcscpy(szTrueNameTemp + slen, L"\\*"); ++ ++ /* Skip "", "." and "..". */ ++ if (ptrue > ptruePrev ++ && (ptruePrev[0] != L'.' ++ || (ptruePrev[1] != NUL ++ && (ptruePrev[1] != L'.' || ptruePrev[2] != NUL))) ++ && (hFind = FindFirstFileW(szTrueNameTemp, &fb)) ++ != INVALID_HANDLE_VALUE) ++ { ++ c = *porig; ++ *porig = NUL; ++ ++ /* Only use the match when it's the same name (ignoring case) or ++ * expansion is allowed and there is a match with the short name ++ * and there is enough room. */ ++ if (_wcsicoll(porigPrev, fb.cFileName) == 0 ++ || (len > 0 ++ && (_wcsicoll(porigPrev, fb.cAlternateFileName) == 0 ++ && (int)(ptruePrev - szTrueName) ++ + (int)wcslen(fb.cFileName) < len))) ++ { ++ wcscpy(ptruePrev, fb.cFileName); ++ ++ /* Look for exact match and prefer it if found. Must be a ++ * long name, otherwise there would be only one match. */ ++ while (FindNextFileW(hFind, &fb)) ++ { ++ if (*fb.cAlternateFileName != NUL ++ && (wcscoll(porigPrev, fb.cFileName) == 0 ++ || (len > 0 ++ && (_wcsicoll(porigPrev, ++ fb.cAlternateFileName) == 0 ++ && (int)(ptruePrev - szTrueName) ++ + (int)wcslen(fb.cFileName) < len)))) ++ { ++ wcscpy(ptruePrev, fb.cFileName); ++ break; ++ } ++ } ++ } ++ FindClose(hFind); ++ *porig = c; ++ ptrue = ptruePrev + wcslen(ptruePrev); ++ } ++ else if (hFind == INVALID_HANDLE_VALUE ++ && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) ++ return FAIL; ++ } ++ ++ wcscpy(name, szTrueName); ++ return OK; ++ } ++ #endif ++ + /* + * fname_case(): Set the case of the file name, if it already exists. + * When "len" is > 0, also expand short to long filenames. ++ * NOTE: much of this is identical to fname_casew(), keep in sync! + */ + void + fname_case( +*************** +*** 2520,2530 **** + int slen; + + flen = (int)STRLEN(name); +! if (flen == 0 || flen > _MAX_PATH) + return; + + slash_adjust(name); + + /* Build the new name in szTrueName[] one component at a time. */ + porig = name; + ptrue = szTrueName; +--- 2636,2679 ---- + int slen; + + flen = (int)STRLEN(name); +! if (flen == 0) + return; + + slash_adjust(name); + ++ #ifdef FEAT_MBYTE ++ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) ++ { ++ WCHAR *p = enc_to_utf16(name, NULL); ++ ++ if (p != NULL) ++ { ++ char_u *q; ++ WCHAR buf[_MAX_PATH + 2]; ++ ++ wcscpy(buf, p); ++ vim_free(p); ++ ++ if (fname_casew(buf, (len > 0) ? _MAX_PATH : 0) == OK) ++ { ++ q = utf16_to_enc(buf, NULL); ++ if (q != NULL) ++ { ++ vim_strncpy(name, q, (len > 0) ? len - 1 : flen); ++ vim_free(q); ++ return; ++ } ++ } ++ } ++ /* Retry with non-wide function (for Windows 98). */ ++ } ++ #endif ++ ++ /* If 'enc' is utf-8, flen can be larger than _MAX_PATH. ++ * So we should check this after calling wide function. */ ++ if (flen > _MAX_PATH) ++ return; ++ + /* Build the new name in szTrueName[] one component at a time. */ + porig = name; + ptrue = szTrueName; +*** ../vim-7.4.015/src/version.c 2013-08-30 17:11:29.000000000 +0200 +--- src/version.c 2013-08-30 17:15:06.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 16, + /**/ + +-- +Fingers not found - Pound head on keyboard to continue. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.017 b/pkgs/applications/editors/vim/patches/7.4.017 new file mode 100644 index 00000000000..7d7fad83fe7 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.017 @@ -0,0 +1,78 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.017 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.017 +Problem: ":help !!" does not find the "!!" tag in the help file. (Ben + Fritz) +Solution: When reading the start of the tags file do parse lines that are + not header lines. +Files: src/tag.c + + +*** ../vim-7.4.016/src/tag.c 2013-06-15 22:26:26.000000000 +0200 +--- src/tag.c 2013-09-05 12:03:38.000000000 +0200 +*************** +*** 1797,1809 **** + */ + if (state == TS_START) + { +! /* The header ends when the line sorts below "!_TAG_". +! * There may be non-header items before the header though, +! * e.g. "!" itself. When case is folded lower case letters +! * sort before "_". */ + if (STRNCMP(lbuf, "!_TAG_", 6) <= 0 + || (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1]))) + { + /* + * Read header line. + */ +--- 1797,1812 ---- + */ + if (state == TS_START) + { +! /* The header ends when the line sorts below "!_TAG_". When +! * case is folded lower case letters sort before "_". */ + if (STRNCMP(lbuf, "!_TAG_", 6) <= 0 + || (lbuf[0] == '!' && ASCII_ISLOWER(lbuf[1]))) + { ++ if (STRNCMP(lbuf, "!_TAG_", 6) != 0) ++ /* Non-header item before the header, e.g. "!" itself. ++ */ ++ goto parse_line; ++ + /* + * Read header line. + */ +*************** +*** 1898,1903 **** +--- 1901,1907 ---- + #endif + } + ++ parse_line: + /* + * Figure out where the different strings are in this line. + * For "normal" tags: Do a quick check if the tag matches. +*** ../vim-7.4.016/src/version.c 2013-08-30 17:29:10.000000000 +0200 +--- src/version.c 2013-09-05 12:02:01.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 17, + /**/ + +-- +An error has occurred. Hit any user to continue. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.018 b/pkgs/applications/editors/vim/patches/7.4.018 new file mode 100644 index 00000000000..2214c30b2b8 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.018 @@ -0,0 +1,45 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.018 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.018 +Problem: When completing item becomes unselected. (Shougo Matsu) +Solution: Revert patch 7.3.1269. +Files: src/edit.c + + +*** ../vim-7.4.017/src/edit.c 2013-07-04 20:22:25.000000000 +0200 +--- src/edit.c 2013-09-05 12:39:53.000000000 +0200 +*************** +*** 3467,3473 **** + } + + compl_enter_selects = !compl_used_match; +- compl_shown_match = compl_curr_match = compl_first_match; + + /* Show the popup menu with a different set of matches. */ + ins_compl_show_pum(); +--- 3467,3472 ---- +*** ../vim-7.4.017/src/version.c 2013-09-05 12:06:26.000000000 +0200 +--- src/version.c 2013-09-05 12:40:34.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 18, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +169. You hire a housekeeper for your home page. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.019 b/pkgs/applications/editors/vim/patches/7.4.019 new file mode 100644 index 00000000000..b1532c19c81 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.019 @@ -0,0 +1,61 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.019 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.019 +Problem: MS-Windows: File name completion doesn't work properly with + Chinese characters. (Yue Wu) +Solution: Take care of multi-byte characters when looking for the start of + the file name. (Ken Takata) +Files: src/edit.c + + +*** ../vim-7.4.018/src/edit.c 2013-09-05 12:49:48.000000000 +0200 +--- src/edit.c 2013-09-05 13:45:27.000000000 +0200 +*************** +*** 5183,5190 **** + } + else if (ctrl_x_mode == CTRL_X_FILES) + { +! while (--startcol >= 0 && vim_isfilec(line[startcol])) +! ; + compl_col += ++startcol; + compl_length = (int)curs_col - startcol; + compl_pattern = addstar(line + compl_col, compl_length, +--- 5183,5196 ---- + } + else if (ctrl_x_mode == CTRL_X_FILES) + { +! char_u *p = line + startcol; +! +! /* Go back to just before the first filename character. */ +! mb_ptr_back(line, p); +! while (vim_isfilec(PTR2CHAR(p)) && p >= line) +! mb_ptr_back(line, p); +! startcol = p - line; +! + compl_col += ++startcol; + compl_length = (int)curs_col - startcol; + compl_pattern = addstar(line + compl_col, compl_length, +*** ../vim-7.4.018/src/version.c 2013-09-05 12:49:48.000000000 +0200 +--- src/version.c 2013-09-05 13:41:47.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 19, + /**/ + +-- + Very funny, Scotty. Now beam down my clothes. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.020 b/pkgs/applications/editors/vim/patches/7.4.020 new file mode 100644 index 00000000000..942d82fe255 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.020 @@ -0,0 +1,82 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.020 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.020 +Problem: NFA engine matches too much with \@>. (John McGowan) +Solution: When a whole pattern match is found stop searching. +Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok + + +*** ../vim-7.4.019/src/regexp_nfa.c 2013-08-25 17:01:36.000000000 +0200 +--- src/regexp_nfa.c 2013-09-05 15:59:44.000000000 +0200 +*************** +*** 5322,5328 **** + log_subsexpr(m); + #endif + nfa_match = TRUE; +! break; + + case NFA_START_INVISIBLE: + case NFA_START_INVISIBLE_FIRST: +--- 5322,5331 ---- + log_subsexpr(m); + #endif + nfa_match = TRUE; +! /* See comment above at "goto nextchar". */ +! if (nextlist->n == 0) +! clen = 0; +! goto nextchar; + + case NFA_START_INVISIBLE: + case NFA_START_INVISIBLE_FIRST: +*** ../vim-7.4.019/src/testdir/test64.in 2013-08-14 13:31:03.000000000 +0200 +--- src/testdir/test64.in 2013-09-05 15:35:44.000000000 +0200 +*************** +*** 427,432 **** +--- 427,433 ---- + :""""" \@> + :call add(tl, [2, '\(a*\)\@>a', 'aaaa']) + :call add(tl, [2, '\(a*\)\@>b', 'aaab', 'aaab', 'aaa']) ++ :call add(tl, [2, '^\(.\{-}b\)\@>.', ' abcbd', ' abc', ' ab']) + :" TODO: BT engine does not restore submatch after failure + :call add(tl, [1, '\(a*\)\@>a\|a\+', 'aaaa', 'aaaa']) + :" +*** ../vim-7.4.019/src/testdir/test64.ok 2013-08-14 13:31:03.000000000 +0200 +--- src/testdir/test64.ok 2013-09-05 16:03:34.000000000 +0200 +*************** +*** 983,988 **** +--- 983,991 ---- + OK 0 - \(a*\)\@>b + OK 1 - \(a*\)\@>b + OK 2 - \(a*\)\@>b ++ OK 0 - ^\(.\{-}b\)\@>. ++ OK 1 - ^\(.\{-}b\)\@>. ++ OK 2 - ^\(.\{-}b\)\@>. + OK 0 - \(a*\)\@>a\|a\+ + OK 2 - \(a*\)\@>a\|a\+ + OK 0 - \_[^8-9]\+ +*** ../vim-7.4.019/src/version.c 2013-09-05 13:50:49.000000000 +0200 +--- src/version.c 2013-09-05 16:04:32.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 20, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +173. You keep tracking down the email addresses of all your friends + (even childhood friends). + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.021 b/pkgs/applications/editors/vim/patches/7.4.021 new file mode 100644 index 00000000000..0936d9a194b --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.021 @@ -0,0 +1,86 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.021 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.021 +Problem: NFA regexp: Using \ze in one branch which doesn't match may cause + end of another branch to be wrong. (William Fugh) +Solution: Set end position if it wasn't set yet. +Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok + + +*** ../vim-7.4.020/src/regexp_nfa.c 2013-09-05 16:05:32.000000000 +0200 +--- src/regexp_nfa.c 2013-09-05 20:56:25.000000000 +0200 +*************** +*** 4209,4218 **** + break; + + case NFA_MCLOSE: +! if (nfa_has_zend) + { +! /* Do not overwrite the position set by \ze. If no \ze +! * encountered end will be set in nfa_regtry(). */ + subs = addstate(l, state->out, subs, pim, off); + break; + } +--- 4209,4219 ---- + break; + + case NFA_MCLOSE: +! if (nfa_has_zend && (REG_MULTI +! ? subs->norm.list.multi[0].end.lnum >= 0 +! : subs->norm.list.line[0].end != NULL)) + { +! /* Do not overwrite the position set by \ze. */ + subs = addstate(l, state->out, subs, pim, off); + break; + } +*** ../vim-7.4.020/src/testdir/test64.in 2013-09-05 16:05:32.000000000 +0200 +--- src/testdir/test64.in 2013-09-05 20:55:18.000000000 +0200 +*************** +*** 328,333 **** +--- 328,334 ---- + :call add(tl, [2, 'abc \zsmatch\ze abc', 'abc abc abc match abc abc', 'match']) + :call add(tl, [2, '\v(a \zsif .*){2}', 'a if then a if last', 'if last', 'a if last']) + :call add(tl, [2, '\>\zs.', 'aword. ', '.']) ++ :call add(tl, [2, '\s\+\ze\[/\|\s\zs\s\+', 'is [a t', ' ']) + :" + :"""" Tests for \@= and \& features + :call add(tl, [2, 'abc\@=', 'abc', 'ab']) +*** ../vim-7.4.020/src/testdir/test64.ok 2013-09-05 16:05:32.000000000 +0200 +--- src/testdir/test64.ok 2013-09-05 21:09:56.000000000 +0200 +*************** +*** 752,757 **** +--- 752,760 ---- + OK 0 - \>\zs. + OK 1 - \>\zs. + OK 2 - \>\zs. ++ OK 0 - \s\+\ze\[/\|\s\zs\s\+ ++ OK 1 - \s\+\ze\[/\|\s\zs\s\+ ++ OK 2 - \s\+\ze\[/\|\s\zs\s\+ + OK 0 - abc\@= + OK 1 - abc\@= + OK 2 - abc\@= +*** ../vim-7.4.020/src/version.c 2013-09-05 16:05:32.000000000 +0200 +--- src/version.c 2013-09-05 21:11:38.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 21, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +174. You know what a listserv is. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.022 b/pkgs/applications/editors/vim/patches/7.4.022 new file mode 100644 index 00000000000..81a0901f5b5 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.022 @@ -0,0 +1,148 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.022 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.022 +Problem: Deadlock while exiting, because of allocating memory. +Solution: Do not use gettext() in deathtrap(). (James McCoy) +Files: src/os_unix.c, src/misc1.c + + +*** ../vim-7.4.021/src/os_unix.c 2013-07-03 16:32:32.000000000 +0200 +--- src/os_unix.c 2013-09-05 21:40:06.000000000 +0200 +*************** +*** 957,964 **** + + /* + * This function handles deadly signals. +! * It tries to preserve any swap file and exit properly. + * (partly from Elvis). + */ + static RETSIGTYPE + deathtrap SIGDEFARG(sigarg) +--- 957,966 ---- + + /* + * This function handles deadly signals. +! * It tries to preserve any swap files and exit properly. + * (partly from Elvis). ++ * NOTE: Avoid unsafe functions, such as allocating memory, they can result in ++ * a deadlock. + */ + static RETSIGTYPE + deathtrap SIGDEFARG(sigarg) +*************** +*** 1090,1107 **** + } + if (entered == 2) + { +! OUT_STR(_("Vim: Double signal, exiting\n")); + out_flush(); + getout(1); + } + + #ifdef SIGHASARG +! sprintf((char *)IObuff, _("Vim: Caught deadly signal %s\n"), + signal_info[i].name); + #else +! sprintf((char *)IObuff, _("Vim: Caught deadly signal\n")); + #endif +! preserve_exit(); /* preserve files and exit */ + + #ifdef NBDEBUG + reset_signals(); +--- 1092,1114 ---- + } + if (entered == 2) + { +! /* No translation, it may call malloc(). */ +! OUT_STR("Vim: Double signal, exiting\n"); + out_flush(); + getout(1); + } + ++ /* No translation, it may call malloc(). */ + #ifdef SIGHASARG +! sprintf((char *)IObuff, "Vim: Caught deadly signal %s\n", + signal_info[i].name); + #else +! sprintf((char *)IObuff, "Vim: Caught deadly signal\n"); + #endif +! +! /* Preserve files and exit. This sets the really_exiting flag to prevent +! * calling free(). */ +! preserve_exit(); + + #ifdef NBDEBUG + reset_signals(); +*** ../vim-7.4.021/src/misc1.c 2013-08-03 17:29:33.000000000 +0200 +--- src/misc1.c 2013-09-05 21:34:04.000000000 +0200 +*************** +*** 9174,9179 **** +--- 9174,9181 ---- + /* + * Preserve files and exit. + * When called IObuff must contain a message. ++ * NOTE: This may be called from deathtrap() in a signal handler, avoid unsafe ++ * functions, such as allocating memory. + */ + void + preserve_exit() +*************** +*** 9196,9202 **** + { + if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) + { +! OUT_STR(_("Vim: preserving files...\n")); + screen_start(); /* don't know where cursor is now */ + out_flush(); + ml_sync_all(FALSE, FALSE); /* preserve all swap files */ +--- 9198,9204 ---- + { + if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) + { +! OUT_STR("Vim: preserving files...\n"); + screen_start(); /* don't know where cursor is now */ + out_flush(); + ml_sync_all(FALSE, FALSE); /* preserve all swap files */ +*************** +*** 9206,9212 **** + + ml_close_all(FALSE); /* close all memfiles, without deleting */ + +! OUT_STR(_("Vim: Finished.\n")); + + getout(1); + } +--- 9208,9214 ---- + + ml_close_all(FALSE); /* close all memfiles, without deleting */ + +! OUT_STR("Vim: Finished.\n"); + + getout(1); + } +*** ../vim-7.4.021/src/version.c 2013-09-05 21:15:38.000000000 +0200 +--- src/version.c 2013-09-05 21:30:18.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 22, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +175. You send yourself e-mail before you go to bed to remind you + what to do when you wake up. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/editors/vim/patches/7.4.023 b/pkgs/applications/editors/vim/patches/7.4.023 new file mode 100644 index 00000000000..03005213ea4 --- /dev/null +++ b/pkgs/applications/editors/vim/patches/7.4.023 @@ -0,0 +1,53 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.023 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.023 +Problem: Compiler warning on 64 bit windows. +Solution: Add type cast. (Mike Williams) +Files: src/edit.c + + +*** ../vim-7.4.022/src/edit.c 2013-09-05 13:50:49.000000000 +0200 +--- src/edit.c 2013-09-06 17:32:55.000000000 +0200 +*************** +*** 5189,5195 **** + mb_ptr_back(line, p); + while (vim_isfilec(PTR2CHAR(p)) && p >= line) + mb_ptr_back(line, p); +! startcol = p - line; + + compl_col += ++startcol; + compl_length = (int)curs_col - startcol; +--- 5189,5195 ---- + mb_ptr_back(line, p); + while (vim_isfilec(PTR2CHAR(p)) && p >= line) + mb_ptr_back(line, p); +! startcol = (int)(p - line); + + compl_col += ++startcol; + compl_length = (int)curs_col - startcol; +*** ../vim-7.4.022/src/version.c 2013-09-05 21:41:35.000000000 +0200 +--- src/version.c 2013-09-06 17:33:41.000000000 +0200 +*************** +*** 740,741 **** +--- 740,743 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 23, + /**/ + +-- +Wizards had always known that the act of observation changed the thing that +was observed, and sometimes forgot that it also changed the observer too. + Terry Pratchett - Interesting times + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b96d1bc84f7..1c3bff2e36d 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,16 +17,21 @@ }: let - version = "6.7.5-3"; + version = "6.8.6-9"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs"; + sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; }; + preConfigure = if tetex != null then + '' + export DVIDecodeDelegate=${tetex}/bin/dvips + '' else ""; + configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib @@ -41,10 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ tetex graphviz ]; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; + postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; meta = { homepage = http://www.imagemagick.org/; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2a48ffb6e1..780c96d9ec8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.2.0"; + name = "calibre-1.4.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0h6afn57pw3rb03ffbnss774gdx7ldirr43hbhzsc2k2h7lxnzyj"; + sha256 = "0hszxjyvw75b75pzr8w5xfgchx3ksw7ziwa3skrjdj500bypmy3y"; }; inherit python; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 4a51ec2d1ac..59dfd2d891e 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: stdenv.mkDerivation rec { name = "djvulibre-3.5.25.3"; @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9"; }; - buildInputs = [ libjpeg libtiff librsvg ]; + buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 576647555ab..ef1e777f55f 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, -libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, autoconf, automake, libtool, cvs }: +libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; src = fetchsvn { - url = https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit; - rev = 3537; - sha256 = "1ajd439i7z8xm16kqh20qalvafy9miyy4accc8j7w30c4qgc2bb7"; + url = svn://svn.code.sf.net/p/navit/code/trunk/navit; + rev = 5576; + sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723"; }; # 'cvs' is only for the autogen buildInputs = [ pkgconfig gtk SDL fontconfig freetype imlib2 SDL_image mesa - libXmu freeglut python gettext quesoglc gd postgresql - autoconf automake libtool cvs ]; + libXmu freeglut python gettext quesoglc gd postgresql cmake qt4 SDL_ttf fribidi ]; - preConfigure = '' - sh ./autogen.sh - ''; - - configureFlags = [ "--disable-samplemap" ]; + cmakeFlags = [ "-DSAMPLE_MAP=n" ]; meta = { homepage = http://www.navit-project.org/; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 087bde000ed..18fb7fefeff 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -90,7 +90,9 @@ let # user namespace sandbox patch userns_patch = if versionOlder sourceInfo.version "30.0.0.0" then ./sandbox_userns_29.patch - else ./sandbox_userns_30.patch; + else if versionOlder sourceInfo.version "31.0.0.0" + then ./sandbox_userns_30.patch + else ./sandbox_userns_31.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch new file mode 100644 index 00000000000..490c1a9cebe --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch @@ -0,0 +1,297 @@ +commit ff4e8b4af04c58fc4c58ee7ed108aefcdc26a960 +Author: aszlig +Date: Thu May 16 14:17:56 2013 +0200 + + zygote: Add support for user namespaces on Linux. + + The implementation is done by patching the Zygote host to execute the sandbox + binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child + process is using uid 0 and gid 0 which map to the current user of the parent. + Afterwards, the sandbox will continue as if it was called as a setuid binary. + + In addition, this adds new_user_namespace as an option in process_util in order + to set the UID and GID mapping correctly. The reason for this is that just + passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because + without setting the mappings exec*() will clear the process's capability sets. + + If the kernel doesn't support unprivileged user namespaces and the sandbox + binary doesn't have the setuid flag, the Zygote main process will run without a + sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. + + Signed-off-by: aszlig + +diff --git a/base/process/launch.cc b/base/process/launch.cc +index 1329a5a..ec28fdf 100644 +--- a/base/process/launch.cc ++++ b/base/process/launch.cc +@@ -24,6 +24,7 @@ LaunchOptions::LaunchOptions() + new_process_group(false) + #if defined(OS_LINUX) + , clone_flags(0) ++ , new_user_namespace(false) + #endif // OS_LINUX + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) +diff --git a/base/process/launch.h b/base/process/launch.h +index ac2df5e..34a3851 100644 +--- a/base/process/launch.h ++++ b/base/process/launch.h +@@ -100,6 +100,9 @@ struct BASE_EXPORT LaunchOptions { + #if defined(OS_LINUX) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; ++ ++ // If true, start the process in a new user namespace. ++ bool new_user_namespace; + #endif // defined(OS_LINUX) + + #if defined(OS_CHROMEOS) +diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc +index de6286d..9333494 100644 +--- a/base/process/launch_posix.cc ++++ b/base/process/launch_posix.cc +@@ -37,6 +37,13 @@ + #include "base/threading/platform_thread.h" + #include "base/threading/thread_restrictions.h" + ++#if defined(OS_LINUX) ++#include ++#if !defined(CLONE_NEWUSER) ++#define CLONE_NEWUSER 0x10000000 ++#endif ++#endif ++ + #if defined(OS_CHROMEOS) + #include + #endif +@@ -294,13 +301,23 @@ bool LaunchProcess(const std::vector& argv, + + pid_t pid; + #if defined(OS_LINUX) +- if (options.clone_flags) { ++ int map_pipe_fd[2]; ++ int flags = options.clone_flags; ++ ++ if (options.new_user_namespace) { ++ flags |= CLONE_NEWUSER; ++ if (pipe(map_pipe_fd) < 0) { ++ DPLOG(ERROR) << "user namespace pipe"; ++ return false; ++ } ++ } ++ ++ if (options.clone_flags || options.new_user_namespace) { + // Signal handling in this function assumes the creation of a new + // process, so we check that a thread is not being created by mistake + // and that signal handling follows the process-creation rules. +- RAW_CHECK( +- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); +- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); ++ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); ++ pid = syscall(__NR_clone, flags, 0, 0, 0); + } else + #endif + { +@@ -318,6 +335,21 @@ bool LaunchProcess(const std::vector& argv, + } else if (pid == 0) { + // Child process + ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // Close the write end of the pipe so we get an EOF when the parent closes ++ // the FD. This is to avoid race conditions when the UID/GID mappings are ++ // written _after_ execvp(). ++ close(map_pipe_fd[1]); ++ ++ char dummy; ++ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { ++ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); ++ _exit(127); ++ } ++ } ++#endif ++ + // DANGER: fork() rule: in the child, if you don't end up doing exec*(), + // you call _exit() instead of exit(). This is because _exit() does not + // call any previously-registered (in the parent) exit handlers, which +@@ -433,6 +465,40 @@ bool LaunchProcess(const std::vector& argv, + _exit(127); + } else { + // Parent process ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // We need to write UID/GID mapping here to map the current user outside ++ // the namespace to the root user inside the namespace in order to ++ // correctly "fool" the child process. ++ char buf[256]; ++ int map_fd, map_len; ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to uid_map."); ++ } ++ close(map_fd); ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to gid_map."); ++ } ++ close(map_fd); ++ ++ // Close the pipe on the parent, so the child can continue doing the ++ // execvp() call. ++ close(map_pipe_fd[1]); ++ } ++#endif ++ + if (options.wait) { + // While this isn't strictly disk IO, waiting for another process to + // finish is the sort of thing ThreadRestrictions is trying to prevent. +diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc +index fea43b5..95cbe07 100644 +--- a/content/browser/zygote_host/zygote_host_impl_linux.cc ++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -121,25 +121,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + + sandbox_binary_ = sandbox_cmd.c_str(); + +- // A non empty sandbox_cmd means we want a SUID sandbox. +- using_suid_sandbox_ = !sandbox_cmd.empty(); ++ bool userns_sandbox = false; ++ const std::vector cmd_line_unwrapped(cmd_line.argv()); + +- if (using_suid_sandbox_) { ++ if (!sandbox_cmd.empty()) { + struct stat st; + if (stat(sandbox_binary_.c_str(), &st) != 0) { + LOG(FATAL) << "The SUID sandbox helper binary is missing: " + << sandbox_binary_ << " Aborting now."; + } + +- if (access(sandbox_binary_.c_str(), X_OK) == 0 && +- (st.st_uid == 0) && +- (st.st_mode & S_ISUID) && +- (st.st_mode & S_IXOTH)) { ++ if (access(sandbox_binary_.c_str(), X_OK) == 0) { ++ using_suid_sandbox_ = true; ++ + cmd_line.PrependWrapper(sandbox_binary_); + + scoped_ptr + sandbox_client(sandbox::SetuidSandboxClient::Create()); + sandbox_client->SetupLaunchEnvironment(); ++ ++ if (!((st.st_uid == 0) && ++ (st.st_mode & S_ISUID) && ++ (st.st_mode & S_IXOTH))) { ++ userns_sandbox = true; ++ sandbox_client->SetNoSuid(); ++ } + } else { + LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " + "configured correctly. Rather than run without sandboxing " +@@ -163,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + base::ProcessHandle process = -1; + base::LaunchOptions options; + options.fds_to_remap = &fds_to_map; ++ if (userns_sandbox) ++ options.new_user_namespace = true; + base::LaunchProcess(cmd_line.argv(), options, &process); ++ ++ if (process == -1 && userns_sandbox) { ++ LOG(ERROR) << "User namespace sandbox failed to start, running without " ++ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " ++ << "enabled in order to use the sandbox without setuid bit."; ++ using_suid_sandbox_ = false; ++ options.new_user_namespace = false; ++ base::LaunchProcess(cmd_line_unwrapped, options, &process); ++ } ++ + CHECK(process != -1) << "Failed to launch zygote process"; + + if (using_suid_sandbox_) { +diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc +index 567b305..1089233 100644 +--- a/content/zygote/zygote_main_linux.cc ++++ b/content/zygote/zygote_main_linux.cc +@@ -426,6 +426,13 @@ static bool EnterSuidSandbox(LinuxSandbox* linux_sandbox, + *has_started_new_init = true; + } + ++ // Don't set non-dumpable, as it causes trouble when the host tries to find ++ // the zygote process (XXX: Not quite sure why this happens with user ++ // namespaces). Fortunately, we also have the seccomp filter sandbox which ++ // should disallow the use of ptrace. ++ if (setuid_sandbox->IsNoSuid()) ++ return true; ++ + #if !defined(OS_OPENBSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc +index 34231d4..36e3201 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc +@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { + return env_->HasVar(kSandboxNETNSEnvironmentVarName); + } + ++bool SetuidSandboxClient::IsNoSuid() const { ++ return env_->HasVar(kSandboxNoSuidVarName); ++} ++ + bool SetuidSandboxClient::IsSandboxed() const { + return sandboxed_; + } +@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { + SetSandboxAPIEnvironmentVariable(env_); + } + ++void SetuidSandboxClient::SetNoSuid() { ++ env_->SetVar(kSandboxNoSuidVarName, "1"); ++} ++ + } // namespace sandbox + +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h +index a9f6536..2e8113a 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.h ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h +@@ -39,6 +39,8 @@ class SetuidSandboxClient { + bool IsInNewPIDNamespace() const; + // Did the setuid helper create a new network namespace ? + bool IsInNewNETNamespace() const; ++ // Is sandboxed without SUID binary ? ++ bool IsNoSuid() const; + // Are we done and fully sandboxed ? + bool IsSandboxed() const; + +@@ -46,6 +48,8 @@ class SetuidSandboxClient { + // helper. + void SetupLaunchEnvironment(); + ++ void SetNoSuid(); ++ + private: + // Holds the environment. Will never be NULL. + base::Environment* env_; +diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h +index aad4ff8..bd710d5 100644 +--- a/sandbox/linux/suid/common/sandbox.h ++++ b/sandbox/linux/suid/common/sandbox.h +@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; + + static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; + static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; ++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; + + static const long kSUIDSandboxApiNumber = 1; + static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index e83f9948535..79aa06192c5 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "31.0.1612.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1612.0.tar.xz"; - sha256 = "19h6i8jdnpzbvyq8pk9jq89lghnydpij9yj8xfs7qdgqgyxxcl5w"; + version = "31.0.1626.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1626.0.tar.xz"; + sha256 = "15rbh8hjs9ipkl4c34701p1zpfmrsw6dya03a8ym5pa5dha949mp"; }; beta = { - version = "30.0.1599.22"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.22.tar.xz"; - sha256 = "0955q7fz6nfr7nbxa8hp9q7mgljlan42rjg8ql5x2vn6c80sjji8"; + version = "30.0.1599.37"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.37.tar.xz"; + sha256 = "05xxafl1dgbi040zmhzi5v5m6myi7c6jgq2nrksmrx2i91kfir2k"; }; stable = { version = "29.0.1547.65"; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index fe436046339..7b0f2a36797 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,8 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo ? null -, useSystemCairo ? false +, cairo, gstreamer, gst_plugins_base , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those # binaries may not be distributed without permission from the @@ -14,14 +13,13 @@ }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -assert useSystemCairo -> cairo != null; let optional = stdenv.lib.optional; in rec { - firefoxVersion = "23.0.1"; + firefoxVersion = "24.0"; - xulVersion = "23.0.1"; # this attribute is used by other packages + xulVersion = "24.0"; # this attribute is used by other packages src = fetchurl { @@ -31,7 +29,7 @@ in rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "66361fcvyl9liyh41gvgysiim90wsywk"; + sha1 = "8scch0gr59j86vp9c1v0yx6mq1pkwcvg"; }; commonConfigureFlags = @@ -52,12 +50,13 @@ in rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" + "--enable-system-cairo" "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" - ] ++ optional useSystemCairo "--enable-system-cairo"; + ]; xulrunner = stdenv.mkDerivation rec { @@ -72,8 +71,9 @@ in rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx - ] ++ optional useSystemCairo cairo; + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base + ]; configureFlags = [ "--enable-application=xulrunner" @@ -82,8 +82,6 @@ in rec { enableParallelBuilding = true; - patches = optional useSystemCairo ./system-cairo.patch; - preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" @@ -139,8 +137,9 @@ in rec { [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite - hunspell libevent libstartup_notification libvpx - ] ++ optional useSystemCairo cairo; + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base + ]; patches = [ ./disable-reporter.patch # fixes "search box not working when built on xulrunner" diff --git a/pkgs/applications/networking/browsers/firefox/system-cairo.patch b/pkgs/applications/networking/browsers/firefox/system-cairo.patch deleted file mode 100644 index 76cf4d51c9c..00000000000 --- a/pkgs/applications/networking/browsers/firefox/system-cairo.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# From: https://hg.mozilla.org/mozilla-central/rev/52b02042b27f -# User Connor Behan -# Date 1370038985 -7200 -# Node ID 52b02042b27f75acbcb2bd4822bedb00ab680e67 -# Parent 08ed531fed70978385cf9253bbc8389b0abe76ca -Bug 722975: Unbreak builds using --with-system-cairo. r=bas - -diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp ---- a/gfx/thebes/gfxPlatform.cpp -+++ b/gfx/thebes/gfxPlatform.cpp -@@ -548,23 +548,31 @@ struct SourceSurfaceUserData - BackendType mBackendType; - }; - - void SourceBufferDestroy(void *srcSurfUD) - { - delete static_cast(srcSurfUD); - } - -+#if MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) - { - gfxImageSurface* origSurf = - static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); - - origSurf->SetData(&kSourceSurface, NULL, NULL); - } -+#else -+void SourceSnapshotDetached(void *nullSurf) -+{ -+ gfxImageSurface* origSurf = static_cast(nullSurf); -+ origSurf->SetData(&kSourceSurface, NULL, NULL); -+} -+#endif - - RefPtr - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) - { - void *userData = aSurface->GetData(&kSourceSurface); - - if (userData) { - SourceSurfaceUserData *surf = static_cast(userData); -@@ -667,24 +675,28 @@ gfxPlatform::GetSourceSurfaceForSurface( - } - - srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), - imgSurface->Stride(), - size, format); - - } - -+#if MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, - &kSourceSurface, - imgSurface, - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+#else -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", (const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get()); -+#endif - } - - SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; - srcSurfUD->mBackendType = aTarget->GetType(); - srcSurfUD->mSrcSurface = srcBuffer; - aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy); - - return srcBuffer; - diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 16aaf3d9f3b..f7dc270251c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -11,11 +11,11 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.7.4"; + name = "quassel-0.9.0"; src = fetchurl { url = "http://quassel-irc.org/pub/${name}.tar.bz2"; - sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7"; + sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf"; }; buildInputs = [ cmake qt4 ] @@ -48,6 +48,7 @@ in with stdenv; mkDerivation rec { ''; license = "GPLv3"; maintainers = [ maintainers.phreedom ]; + repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix new file mode 100644 index 00000000000..b2c9b7c3e73 --- /dev/null +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu, libXaw, libXext, libXpm, openjpeg, openssl }: + +let version = "1.0.29"; in +stdenv.mkDerivation rec { + name = "ssvnc-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz"; + sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d"; + }; + + buildInputs = [ imake zlib openjdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; + + configurePhase = "makeFlags=PREFIX=$out"; + + meta = { + description = "VNC viewer that adds encryption security to VNC connections"; + homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e07fe69b70c..8aaf1839f92 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -15,7 +15,7 @@ , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven -, langs ? [ "ALL" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] }: let @@ -160,6 +160,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" + "--with-lang=${langsSpaces}" ); ''; @@ -192,13 +193,12 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreoffice4.0" "$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice4.0" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" done ''; configureFlags = [ - "--with-lang=${langsSpaces}" "--with-vender=NixOS" # Without these, configure does not finish diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 820b4fb2979..a2cc07b0a61 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, libpng, lua5, automake, autoconf }: stdenv.mkDerivation rec { name = "gravit-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp"; }; - buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf]; + buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf libpng]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix new file mode 100644 index 00000000000..fa6dcaa82ed --- /dev/null +++ b/pkgs/applications/science/biology/plink/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, zlib, unzip }: + +stdenv.mkDerivation { + name = "plink-1.07"; + + src = fetchurl { + url = "http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-1.07-src.zip"; + sha256 = "4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b"; + }; + + buildInputs = [ zlib unzip ] ; + + installPhase = '' + mkdir -p $out/bin + cp plink $out/bin + ''; + + meta = { + description = "Whole genome association toolkit"; + homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; + license = "GNUv2"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix new file mode 100644 index 00000000000..d0429a45190 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -0,0 +1,126 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, alsaLib +, fontconfig +, freetype +, gcc +, glib +, libpng +, ncurses +, opencv +, openssl +, unixODBC +, xlibs +, zlib +}: + +let + platform = + if stdenv.system == "i686-linux" then + "Linux" + else if stdenv.system == "x86_64-linux" then + "Linux-x86-64" + else + abort "Mathematica requires i686-linux or x86_64 linux"; +in +stdenv.mkDerivation rec { + + name = "mathematica-9.0.0"; + + src = requireFile rec { + name = "Mathematica_9.0.0_LINUX.sh"; + message = '' + This nix expression requires that Mathematica_9.0.0_LINUX.sh is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q"; + }; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + fontconfig + freetype + gcc.gcc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + ] ++ (with xlibs; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ldpath}" \ + "$f" + patchelf --shrink-rpath "$f" + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = "http://www.wolfram.com/mathematica/"; + license = "unfree"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 37dc56585d9..8b1afc2505a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -51,6 +51,8 @@ cabal.mkDerivation (self: { ''; patches = [ (fetchurl { url = "https://github.com/joeyh/git-annex/commit/e4d0b2f180627472b017af8bcfc2ae3fc04d6767.patch"; sha256 = "08lz0zq5y3b3wgi1vbzka7kyihkhzjv02pmq8ab02674yrqrnr5k"; }) + (fetchurl { url = "https://github.com/joeyh/git-annex/commit/26baae8967d55d0793d0609475a75d265bdd64a3.patch"; + sha256 = "0yzgj55jjcqv1975bnj4wafyh4vdzjjn4ajx3wahsyg0gsrm5lpv"; }) ]; meta = { homepage = "http://git-annex.branchable.com/"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 2051590a819..6d8780d6cf4 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, freetype, pkgconfig, yasm, freefont_ttf +{ stdenv, fetchurl, pkgconfig, freetype, yasm +, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -22,6 +23,8 @@ , useUnfreeCodecs ? false }: +assert fontconfigSupport -> (fontconfig != null); +assert (!fontconfigSupport) -> (freefont_ttf != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -95,7 +98,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with stdenv.lib; - [ freetype pkgconfig ] + [ pkgconfig freetype ] + ++ optional fontconfigSupport fontconfig ++ optionals x11Support [ libX11 libXext mesa ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv @@ -125,6 +129,8 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; '' + --enable-freetype + ${if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig"} ${if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl"} ${if xineramaSupport then "--enable-xinerama" else "--disable-xinerama"} ${if xvSupport then "--enable-xv" else "--disable-xv"} @@ -144,7 +150,6 @@ stdenv.mkDerivation rec { ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} - --enable-freetype --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc @@ -153,14 +158,17 @@ stdenv.mkDerivation rec { --disable-ossaudio ''; - NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + NIX_LDFLAGS = with stdenv.lib; + optional fontconfigSupport "-lfontconfig" + ++ optionals x11Support [ "-lX11" "-lXext" ] + ; installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; enableParallelBuilding = true; - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = + # Provide a reasonable standard font when not using fontconfig. Maybe we should symlink here. + postInstall = stdenv.lib.optionalString (!fontconfigSupport) '' mkdir -p $out/share/mplayer cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 714a2882d5f..412d03daa2e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - name = "vlc-${version}"; + name = "vlc-${version}a"; version = "2.0.8"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "00hpbm0v424yhfzqyxrvrvfjkbvf3f43yqk6h1qhwmnl8n1z4am0"; + sha256 = "1lilj14il52731h7qvrjcss0zivghcxv8jmmxf23qwl7qhs5y885"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 51ef6c5b39e..d2e608ba3fa 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1 - , gnupg, libgcrypt, perl, nettle, yajl + , gnupg, libgcrypt, perl, nettle, yajl, libcap_ng , ...}: builderDefsPackage (a : diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 09b6e015a93..652b2ed92c1 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.2.16"; # changes ./guest-additions as well + version = "4.2.18"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "86992"; + extpackRevision = "88780"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - # Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url" - sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d"; + # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS + sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz"; + sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index cca133685f6..de38843c7f1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg"; + sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767"; }; KERN_DIR = "${kernelDev}/lib/modules/*/build"; diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 736857fca93..dc8057ff0f5 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp}: -#Is this really necessary? -assert stdenv ? glibc; - stdenv.mkDerivation rec { name = "libgweather-2.30.3"; src = fetchurl { diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 93490007692..5e5bae4d181 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -11,4 +11,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 70c1db8c027..079a6f169b2 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libxml2, glib}: +{ stdenv, fetchurl, pkgconfig, libxml2, glib }: stdenv.mkDerivation rec { name = "libcroco-0.6.6"; # 3.6.2 release @@ -7,5 +7,8 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; }; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + buildInputs = [ pkgconfig libxml2 glib ]; } diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix new file mode 100644 index 00000000000..2cbb8d49611 --- /dev/null +++ b/pkgs/development/compilers/go/1.1-darwin.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, bison, bash, makeWrapper }: + +stdenv.mkDerivation { + name = "go-1.1.2"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.1.2.src.tar.gz; + sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz"; + }; + + buildInputs = [ bison bash makeWrapper ]; + + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable some tests + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + + ''; + + # Unfortunately we have to use Mac OS X's own GCC + preBuild = '' + export PATH=/usr/bin:$PATH + ''; + + #patches = [ ./cacert.patch ]; + + GOOS = "darwin"; + GOARCH = if stdenv.system == "x86_64-darwin" then "amd64" else "386"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go + done + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ zef ]; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 5aeb053e110..dfb545bb368 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc +, removeGodocExternals ? false }: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -50,6 +51,8 @@ stdenv.mkDerivation { sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + '' + stdenv.lib.optionalString removeGodocExternals '' + sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html ''; patches = [ ./cacert.patch ]; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 804c4838317..8c11aa8bc72 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,17 +1,18 @@ -{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline -, languageJava, libffi, llvmGeneral, mtl, parsec, split, text -, transformers, vector, vectorBinaryInstances +{ cabal, ansiTerminal, binary, boehmgc, Cabal, filepath, gmp, happy +, haskeline, languageJava, libffi, llvmGeneral, mtl, parsec, split +, text, time, transformers, vector, vectorBinaryInstances }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.9"; - sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m"; + version = "0.9.9.1"; + sha256 = "1glxkx2hcr0lrvj3jjnlqqifyzyixjzq1hl86wmn540dccw82yah"; isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl - parsec split text transformers vector vectorBinaryInstances + ansiTerminal binary Cabal filepath haskeline languageJava libffi + llvmGeneral mtl parsec split text time transformers vector + vectorBinaryInstances ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 8b1e1529095..aa2b03838cd 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline}: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1" INSTALL_DATA='cp -d' ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; postInstall = '' diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix new file mode 100644 index 00000000000..f8787dcc7f0 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl, readline }: + +let + dsoPatch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua"; + sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; + name = "lua-arch.patch"; + }; +in +stdenv.mkDerivation rec { + name = "lua-${version}"; + majorVersion = "5.2"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "http://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz"; + }; + + buildInputs = [ readline ]; + + patches = [ dsoPatch ]; + + configurePhase = '' + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' ) + ''; + + postInstall = '' + mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" + mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" + rmdir $out/{share,lib}/lua/${majorVersion} $out/{share,lib}/lua + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/lua.pc" < libXext != null && libXfixes != null; assert playSupport -> SDL != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2"; + name = "ffmpeg-1.2.3"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; + sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index b61101654ba..22a4597abbe 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -17,4 +17,19 @@ stdenv.mkDerivation rec { configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix); + + + meta = with stdenv.lib; { + homepage = https://people.gnome.org/~veillard/gamin/; + description = "A file and directory monitoring system"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; } + +// stdenv.lib.optionalAttrs stdenv.isDarwin { + preBuild = '' + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile + ''; +}) + diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c9596d66ee2..19a3a0f18b3 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -70,9 +70,11 @@ stdenv.mkDerivation (rec { }; } -// +// optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; +} -stdenv.lib.optionalAttrs stdenv.isCygwin { +// optionalAttrs stdenv.isCygwin { patchPhase = # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. # This fixes: diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix new file mode 100644 index 00000000000..0534df821cc --- /dev/null +++ b/pkgs/development/libraries/gusb/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchgit +, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt +, glib, systemd, libusb1 +}: +stdenv.mkDerivation { + name = "gusb-git"; + enableParallelBuilding = true; + + src = fetchgit { + url = git://gitorious.org/gusb/gusb.git; + rev = "53226a15a627b20fde38303c2141a17985d741ae"; + sha256 = "01daf09f663e27bdd92532e3e2a3e87de895e9cc1f150d4e0fc75b0dc489fccf"; + }; + + preConfigure = "./autogen.sh"; + + buildInputs = [ + pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt + systemd libusb1 + glib + ]; + + meta = { + description = "GLib libusb wrapper"; + homepage = http://gitorious.org/gusb; + license = stdenv.lib.licenses.lgpl21; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.0.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.nix similarity index 89% rename from pkgs/development/libraries/haskell/Cabal/1.18.0.nix rename to pkgs/development/libraries/haskell/Cabal/1.18.1.nix index 6e0d3074bdb..f0792be6ec9 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.18.0"; - sha256 = "1nxvkfkjkyxsa4nbrwl59r84j63qh2qx4cbd3vnr6vvdnflbix8f"; + version = "1.18.1"; + sha256 = "041m3xr8v0bbw0016lnzmnv9xpj15z5pd272j3sbsrwpmcyds3a0"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix new file mode 100644 index 00000000000..a6f0e61d273 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix @@ -0,0 +1,16 @@ +{ cabal, freeglut, mesa, OpenGLRaw }: + +cabal.mkDerivation (self: { + pname = "GLURaw"; + version = "1.4.0.0"; + sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g"; + buildDepends = [ OpenGLRaw ]; + extraLibraries = [ freeglut mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix new file mode 100644 index 00000000000..f57cb34fb4a --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix @@ -0,0 +1,18 @@ +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, OpenGLRaw +}: + +cabal.mkDerivation (self: { + pname = "GLUT"; + version = "2.5.0.1"; + sha256 = "0f0bz64j7fxa0np8w53n51ri5m0pkwyc1kv7pvdnx02h181gl6l0"; + buildDepends = [ OpenGL OpenGLRaw ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL Utility Toolkit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.0.0.nix new file mode 100644 index 00000000000..869ca71dfb6 --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.0.0.nix @@ -0,0 +1,16 @@ +{ cabal, GLURaw, libX11, mesa, OpenGLRaw, text }: + +cabal.mkDerivation (self: { + pname = "OpenGL"; + version = "2.9.0.0"; + sha256 = "0likrpzlzis8fk11g7mjn102y6y6k2w8bkybqqhhmfls7ccgpvhp"; + buildDepends = [ GLURaw OpenGLRaw text ]; + extraLibraries = [ libX11 mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix new file mode 100644 index 00000000000..1145c16b4f8 --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix @@ -0,0 +1,15 @@ +{ cabal, mesa }: + +cabal.mkDerivation (self: { + pname = "OpenGLRaw"; + version = "1.4.0.0"; + sha256 = "112xaz01950pyjaw3cv9yvw4w3gqbf79idyyh05ain7x29m7bxkh"; + extraLibraries = [ mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index c51663a9d09..1552a1418d8 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace ]; + jailbreak = true; meta = { description = "Abstractions for animation"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix new file mode 100644 index 00000000000..d51274c83e9 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, attoparsec, cmdargs, text, unorderedContainers +, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson-pretty"; + version = "0.7"; + sha256 = "0zkqs3f4mr0v0j582h9ssq7dxgfkk59s7y66b640hc4zf0b5p7g7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec cmdargs text unorderedContainers vector + ]; + meta = { + homepage = "http://github.com/informatikr/aeson-pretty"; + description = "JSON pretty-printing library and command-line tool"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix new file mode 100644 index 00000000000..7b934bbe669 --- /dev/null +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -0,0 +1,16 @@ +{ cabal, binary, dataBinaryIeee754, network, text, xml }: + +cabal.mkDerivation (self: { + pname = "amqp"; + version = "0.5.0"; + sha256 = "1i02pp184r1iq40mz16m9qh8i3h1jmf3ykpg67j3i1732cks8n8w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary dataBinaryIeee754 network text xml ]; + meta = { + homepage = "https://github.com/hreinhardt/amqp"; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index a50ee82a38d..c28885b38ed 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.2.0"; - sha256 = "0350g5p3zbvm29nnjd554i6fyc47vmzpb42w6q46v3i9fiy23kvd"; + version = "0.2.1"; + sha256 = "1gnyvinimxb9vw3gwvsdvja8ascm07v9f5grxh42fzqkx6fm5xvr"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index e572e366bdd..1fa5f3fb79f 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.2.2"; - sha256 = "043lbaj4rrvh4a1yc033np51vi8xlbczflbhyx2bsiryzbi27waf"; + version = "0.2.3"; + sha256 = "0p8c4cq8ldspwj4pmg0l8pg8bkwsk9xan07md32ikm4bfqsnv2rb"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index 0f651e1eaae..351979627cb 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -1,12 +1,12 @@ -{ cabal, Cabal, fgl, filepath, MissingH, parsec }: +{ cabal, Cabal, fgl, filepath, parsec, text }: cabal.mkDerivation (self: { pname = "cabal-macosx"; - version = "0.2.2"; - sha256 = "14dc7swk03q2kp5fmhwibjh0x0pzf9ah1004skgd5six0vzfc1ch"; + version = "0.2.3"; + sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal fgl filepath MissingH parsec ]; + buildDepends = [ Cabal fgl filepath parsec text ]; meta = { homepage = "http://github.com/gimbo/cabal-macosx"; description = "Cabal support for creating Mac OSX application bundles"; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index db314a12296..0a284cd9ba5 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time ]; + jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 7d3cacdd67a..038e0dd3292 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -1,11 +1,15 @@ -{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: +{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck +, testFramework, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "cipher-rc4"; - version = "0.1.2"; - sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + version = "0.1.3"; + sha256 = "1pdkm7m3v8c7wks7asvqixxjk9jixf78n489ckmw10p77wrqby78"; + buildDepends = [ byteable cryptoCipherTypes ]; testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 + cryptoCipherTests cryptoCipherTypes QuickCheck testFramework + testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-rc4"; diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 69acb897220..53b3bae1cef 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.9"; - sha256 = "1qqmip3ynqdxlwynm60wsn82dcyymcfql79k039iablanj4mic61"; + version = "0.5.10"; + sha256 = "04grmld90qr8m6lcdf83clai0anpp8iry7m9l9li8ija9fckl3lk"; buildDepends = [ async basicPrelude deepseq hashable liftedBase monadControl systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index e80d2130ebd..752ef8fdf9e 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-tests"; - version = "0.0.7"; - sha256 = "1qlb3qr6hnla0aayyjmi5r7m7w5vy1wx8yd9cl9cpzr8wviy4lch"; + version = "0.0.8"; + sha256 = "0bprv2pj3acq97482wsz1pp76rrdvvy5scv4na8aqfsdsglbjq47"; buildDepends = [ byteable cryptoCipherTypes HUnit mtl QuickCheck securemem testFramework testFrameworkHunit testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index ca029910c9d..2dc86360241 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-types"; - version = "0.0.5"; - sha256 = "1n0sam5lldhzlcp6ihjika52pb5d12g6r9ln84s7zk7nv59lpqjl"; + version = "0.0.6"; + sha256 = "1gw3nmf242fbmwhpwk1v1sxhvw1dcy9l06aj6ag0wqb12qn2bqmg"; buildDepends = [ byteable securemem ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix new file mode 100644 index 00000000000..73565c0cee7 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -0,0 +1,13 @@ +{ cabal, deepseq, mtl, parallel, time }: + +cabal.mkDerivation (self: { + pname = "data-pprint"; + version = "0.2.1.5"; + sha256 = "0dalm41l93303rraxi9kipxkm11a0mly3w488afj700ny5v6l9ij"; + buildDepends = [ deepseq mtl parallel time ]; + meta = { + description = "Prettyprint and compare Data values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 4ce518c4061..9b5062479be 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { active colour dataDefaultClass diagramsCore fingertree intervals monoidExtras newtype NumInstances semigroups vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 85f3a5628b6..9dd35804f43 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,18 +1,19 @@ { cabal, attoparsec, attoparsecConduit, binary, blazeBuilder -, conduit, hspec, iproute, mtl, network, networkConduit, random +, conduit, doctest, hspec, iproute, mtl, network, networkConduit +, random }: cabal.mkDerivation (self: { pname = "dns"; - version = "0.3.8"; - sha256 = "1x2rfm89qpx7dpxr457i2wqmjry8r28f42j194131mfx4gc4mwdq"; + version = "1.0.0"; + sha256 = "16h7c332qdj77dw8kvrdn1jzhzsnrcybbbm5x7pxvgpnn0wzz8si"; buildDepends = [ attoparsec attoparsecConduit binary blazeBuilder conduit iproute mtl network networkConduit random ]; testDepends = [ - attoparsec attoparsecConduit binary blazeBuilder conduit hspec - iproute mtl network networkConduit random + attoparsec attoparsecConduit binary blazeBuilder conduit doctest + hspec iproute mtl network networkConduit random ]; testTarget = "spec"; meta = { diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 3b8c03e2da2..185f8034381 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.7"; - sha256 = "0d3aywm5v3kx16c1i6cb4inr7hdnmsl8qawxp27g0yng03wdra5l"; + version = "0.9.8"; + sha256 = "0c1qi1dfqndbkaiksffw54gv6nlhd3wsk25s97vhrgmpd3n7sb8a"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix new file mode 100644 index 00000000000..c43c246557b --- /dev/null +++ b/pkgs/development/libraries/haskell/enummapset/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "enummapset"; + version = "0.5.2.0"; + sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/michalt/enummapset"; + description = "IntMap and IntSet with Enum keys/elements"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix new file mode 100644 index 00000000000..4e0abd3c34f --- /dev/null +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -0,0 +1,25 @@ +{ cabal, conduit, hspec, HUnit, monadControl, monadLogger +, persistent, persistentSqlite, persistentTemplate, QuickCheck +, resourcet, tagged, text, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "esqueleto"; + version = "1.3.4.2"; + sha256 = "1gp0jy8ra11ansari659wqvwafw1pi2svl3w16wa5dv9xk3v9pr6"; + buildDepends = [ + conduit monadLogger persistent resourcet tagged text transformers + unorderedContainers + ]; + testDepends = [ + conduit hspec HUnit monadControl monadLogger persistent + persistentSqlite persistentTemplate QuickCheck text transformers + ]; + meta = { + homepage = "https://github.com/meteficha/esqueleto"; + description = "Bare bones, type-safe EDSL for SQL queries on persistent backends"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 0f60a650d36..ebd4417af99 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,11 +1,11 @@ -{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils -, hlint, hspec, ioChoice, syb, time, transformers +{ cabal, Cabal, convertible, doctest, emacs, filepath, ghcPaths +, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "3.0.0"; - sha256 = "1ll2vn4vv4k7jaah0ngr2ml381cpprqy9ndqpf8cn44m5xd9qn6p"; + version = "3.1.1"; + sha256 = "0gz5andg5ap7a71ap82rpkbflgj9fcrw47gyzlbn5rpp110d86jf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { time transformers ]; testDepends = [ - Cabal convertible filepath ghcPaths ghcSybUtils hlint hspec + Cabal convertible doctest filepath ghcPaths ghcSybUtils hlint hspec ioChoice syb time transformers ]; buildTools = [ emacs ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index a594ce87880..0197bc4d142 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,9 +1,9 @@ -{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs +{ cabal, binary, blazeHtml, blazeMarkup, pandocCiteproc, cmdargs , cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit , httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time +, testFrameworkQuickcheck2, text, time, fetchurl }: cabal.mkDerivation (self: { @@ -12,22 +12,26 @@ cabal.mkDerivation (self: { sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n"; isLibrary = true; isExecutable = true; + patches = [ (fetchurl { url = "https://github.com/jaspervdj/hakyll/pull/183.patch"; + sha256 = "0vjrxvgyc05nnshapjhk65pcamj9rigqff5q6wjbssx3ggqggrz9"; + name = "hakyll-pandoc-fix.patch"; + }) ]; buildDepends = [ - binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash + binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc parsec random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup text time ]; testDepends = [ - binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash + binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network pandoc parsec QuickCheck random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; - patchPhase = '' - sed -i -e 's|cryptohash.*,|cryptohash,|' hakyll.cabal + postPatch = '' + sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal ''; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix b/pkgs/development/libraries/haskell/hashable/1.2.1.0.nix similarity index 87% rename from pkgs/development/libraries/haskell/hashable/1.2.0.10.nix rename to pkgs/development/libraries/haskell/hashable/1.2.1.0.nix index 2bafe55f420..092a3f69156 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.1.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.10"; - sha256 = "155r7zqc0kisjdslr8d1c04yqwvzwqx4d99c0zla113dvsdjhp37"; + version = "1.2.1.0"; + sha256 = "09m1glpcxm3f6s9cwz8xzljy6j0n271cym4d9dllw5rpzrwp9h2f"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 9def726fb69..c39a1fc24a8 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0"; - sha256 = "1f406i7jdz45s88n0nrd76vj927a0fx02nf1f98r4in0ic5anp11"; + version = "0.13.0.1"; + sha256 = "1hxf131xhvsqbvmrm8wbjpndy41pz1lq65gqlk3lxr57dhi59s4w"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index 89d2f2d518e..f65520da532 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hflags"; - version = "0.2"; - sha256 = "1bz8w1vxqlc2c9iygr2dhy2ck1sd56zjwqzz707nqcmsqqsfmyhb"; + version = "0.3"; + sha256 = "113pqdjnxfhkk95969ia393n1jvbbnfljsz42vfapgzvd8f1fci2"; buildDepends = [ text ]; meta = { homepage = "http://github.com/errge/hflags"; diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix new file mode 100644 index 00000000000..e953eb74711 --- /dev/null +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "hslua"; + version = "0.3.6.1"; + sha256 = "0c60gnf0mp6kx2z2149icl7hdwvigibvxd091a3vc6zkl5c5r41p"; + buildDepends = [ mtl ]; + meta = { + description = "A Lua language interpreter embedding in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index cbdc05f93e3..4d639909d8e 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.5"; - sha256 = "01xmm63cbdm20wp6bpp3052zfpqmvglcq33skhy92cqkpgvd7f8y"; + version = "1.9.5.1"; + sha256 = "1a53s5f9p0xnd33midi4pfj6i3nvckb9khn0p3l3v3xvqn5rrgf2"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix new file mode 100644 index 00000000000..80a61b5b5be --- /dev/null +++ b/pkgs/development/libraries/haskell/keys/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonadsFd, comonadTransformers, free, semigroupoids +, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "keys"; + version = "3.0.3"; + sha256 = "1fqw0745pj8pzjjlrbg85gdr3acm7gpip5052m9wcz997949ca3r"; + buildDepends = [ + comonadsFd comonadTransformers free semigroupoids semigroups + transformers + ]; + meta = { + homepage = "http://github.com/ekmett/keys/"; + description = "Keyed functors and containers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index 922130f4f9b..bbf13bd3fe9 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lambdabot"; - version = "4.3"; - sha256 = "0pjwxlq4rbmg9wj44vrillly967y35b4i995mz5167hpji05clvy"; + version = "4.3.0.1"; + sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 4571b869e3b..abf8df4f556 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.7"; - sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3"; + version = "0.5.8"; + sha256 = "0slwj2bi9v7qjr6ai5dwql7fqgsh8k9k2bzlsq407iacsv0w3b9h"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; testDepends = [ blazeBuilder Cabal HUnit mtl QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix index b1a472dfc7c..2de451f4177 100644 --- a/pkgs/development/libraries/haskell/lens-datetime/default.nix +++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lens-datetime"; - version = "0.1.1"; - sha256 = "0p93211ibq1rkh4aj69xdwan0338k35vb5qyf7zp761nghnk3d47"; + version = "0.2"; + sha256 = "0wrs7alz1zfg1xrg04lhz01mrd1gcz2xr8b5mxfdvq94f5m87sdr"; buildDepends = [ lens time ]; meta = { homepage = "http://github.com/klao/lens-datetime"; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index ba0f2ce1a3a..b68558cf914 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -1,17 +1,21 @@ -{ cabal, distributive, doctest, filepath, hashable, lens +{ cabal, distributive, doctest, filepath, hashable, HUnit, lens , reflection, semigroupoids, semigroups, simpleReflect, tagged -, transformers, unorderedContainers, vector +, testFramework, testFrameworkHunit, transformers +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "linear"; - version = "1.2"; - sha256 = "0mna8k6plq0akki5j5zjk1xk1hgks1076q1h5s14v87d0h45wlrh"; + version = "1.3"; + sha256 = "0b5qjsbdkqv0h1236lv2nisjh9yz7gc5bd6xv6i8q5jryzs43pi9"; buildDepends = [ distributive hashable reflection semigroupoids semigroups tagged transformers unorderedContainers vector ]; - testDepends = [ doctest filepath lens simpleReflect ]; + testDepends = [ + doctest filepath HUnit lens simpleReflect testFramework + testFrameworkHunit + ]; meta = { homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix new file mode 100644 index 00000000000..4eb91c67a47 --- /dev/null +++ b/pkgs/development/libraries/haskell/list-tries/default.nix @@ -0,0 +1,16 @@ +{ cabal, binary, dlist }: + +cabal.mkDerivation (self: { + pname = "list-tries"; + version = "0.5.1"; + sha256 = "15lbq41rikj5vm9gfgjxz98pamnib4dcs48fr2vm9r3s3fikd2kz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary dlist ]; + meta = { + homepage = "http://iki.fi/matti.niemenmaa/list-tries/"; + description = "Tries and Patricia tries: finite sets and maps for list keys"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix index 6993a7108d3..0a8f455d971 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "llvm-general-pure"; - version = "3.3.8.1"; - sha256 = "1izn30pka7z60dr73c3mhr5i8n2fb0yvpdgg66r7c5qf1m5bmqbx"; + version = "3.3.8.2"; + sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp"; buildDepends = [ mtl parsec setenv transformers ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { description = "Pure Haskell LLVM functionality (no FFI)"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix new file mode 100644 index 00000000000..16d9859aae2 --- /dev/null +++ b/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix @@ -0,0 +1,21 @@ +{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "llvm-general"; + version = "3.3.5.0"; + sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf"; + buildDepends = [ mtl parsec setenv text transformers ]; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + buildTools = [ llvmConfig ]; + meta = { + description = "General purpose LLVM bindings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix similarity index 85% rename from pkgs/development/libraries/haskell/llvm-general/default.nix rename to pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix index fd7ee4849d9..2eb0a2c5d20 100644 --- a/pkgs/development/libraries/haskell/llvm-general/default.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.3.8.1"; - sha256 = "1w9wqi9mj673s0bm3j4a5kapl5f65sy8mwjbw7ydism6j5jmxhpk"; + version = "3.3.8.2"; + sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5"; buildDepends = [ llvmGeneralPure mtl parsec setenv transformers utf8String ]; @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 ]; buildTools = [ llvmConfig ]; + doCheck = false; meta = { description = "General purpose LLVM bindings"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix index d682908dcf1..58cbb522fa2 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.4"; - sha256 = "0mqvrg2izqjrgzbmr6pcl9v9827fkr4mwxpdckm3gj1miljsj314"; + version = "0.3.4.5"; + sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index a9a2b07e81b..5378c468808 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.2.0"; sha256 = "0yhb55v0a2221xbpbm8jiqzqvps0lab5n8iakpq69ndr2l0d2r3x"; buildDepends = [ groupoids groups semigroupoids semigroups ]; + jailbreak = true; meta = { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 555435d3c58..3c5239b4737 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.22.0.0"; - sha256 = "1fswkgrn8mc92lrzmrxhv6hbgch2lqdvmjn88k4ajqc0gpmpb750"; + version = "0.24.0.0"; + sha256 = "0vdhrsqwa2wq9cvf96x3hqml2vbjcvik9mpz1kbbhb61f9lbhas6"; buildDepends = [ utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index 02f5c289836..91cc79f52b8 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "nats"; - version = "0.1"; - sha256 = "08gh7jjmws70919hmqqmvnfqcpxr34f03jmg3lzmmhqvr15gm1vy"; + version = "0.1.2"; + sha256 = "1r4083p8sbnqs74l8faqfs1i97k8bql762l55pbmapy0p1xrkzka"; meta = { homepage = "http://github.com/ekmett/nats/"; description = "Haskell 98 natural numbers"; diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index c98f711f297..e3283a242f5 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -2,17 +2,12 @@ cabal.mkDerivation (self: { pname = "ncurses"; - version = "0.2.4"; - sha256 = "0d4h85qgva1sf59g55k9xidqdpw18qj51xj7w5cqsf5pcpxgkcwh"; + version = "0.2.6"; + sha256 = "0mcgbq67f8hfdqmvm3p59949mbxcc2mgjw889zxvxx0174kn205q"; buildDepends = [ text transformers ]; buildTools = [ c2hs ]; extraLibraries = [ ncurses ]; - preConfigure = '' - sed -i -e "s,ncursesw/,," lib/UI/NCurses.chs - sed -i -e "s,ncursesw/,," lib/UI/NCurses/Enums.chs - sed -i -e "s,ncursesw/,," lib/UI/NCurses/Panel.chs - sed -i -e "s,ncursesw/,," cbits/hsncurses-shim.c - ''; + patchPhase = "find . -type f -exec sed -i -e 's|ncursesw/||' {} \\;"; meta = { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix new file mode 100644 index 00000000000..16d5d910b4b --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -0,0 +1,25 @@ +{ cabal, aeson, aesonPretty, attoparsec, Diff, filepath, hexpat +, hsBibutils, HTTP, json, mtl, network, pandocTypes, parsec +, rfc5051, syb, tagsoup, texmath, text, time, utf8String, vector +, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.1.1"; + sha256 = "1pna6m83ay1jjcnazgc70vif55fff9xhk7129fbv9wf7d29hlw32"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec filepath hexpat hsBibutils HTTP json mtl network + pandocTypes parsec rfc5051 syb tagsoup texmath text time utf8String + vector yaml + ]; + testDepends = [ aeson aesonPretty Diff pandocTypes utf8String ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index d4f49791d30..18788b342e0 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, aeson, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.10"; - sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; - buildDepends = [ syb ]; + version = "1.12.1"; + sha256 = "0gqn7byag5vx09mwbx6y3zs3hqmncarlpml0cfc5picwv8kg4vbj"; + buildDepends = [ aeson syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index f81fb4e56d9..c3149c4a2e2 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,29 +1,31 @@ -{ cabal, ansiTerminal, base64Bytestring, blazeHtml, blazeMarkup -, citeprocHs, dataDefault, Diff, extensibleExceptions, filepath -, highlightingKate, HTTP, HUnit, json, mtl, network, pandocTypes -, parsec, QuickCheck, random, syb, tagsoup, temporary -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, texmath, text, time, xml, zipArchive, zlib +{ cabal, aeson, alex, ansiTerminal, attoparsec, base64Bytestring +, blazeHtml, blazeMarkup, dataDefault, Diff, extensibleExceptions +, filepath, happy, highlightingKate, hslua, HTTP, httpConduit +, httpTypes, HUnit, mtl, network, pandocTypes, parsec, QuickCheck +, random, syb, tagsoup, temporary, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, texmath, text, time +, unorderedContainers, vector, xml, yaml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.11.1"; - sha256 = "0b23vrgkm1csykx1zrldkg5ka816j6m7a5fhs4cxffalifq91c7b"; + version = "1.12.0.2"; + sha256 = "125vl6l7nd3s3zwkms46y8l5zhg22iwz5387ll9rd2hf6asfpp56"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault - extensibleExceptions filepath highlightingKate HTTP json mtl - network pandocTypes parsec random syb tagsoup temporary texmath - text time xml zipArchive zlib + aeson alex attoparsec base64Bytestring blazeHtml blazeMarkup + dataDefault extensibleExceptions filepath happy highlightingKate + hslua HTTP httpConduit httpTypes mtl network pandocTypes parsec + random syb tagsoup temporary texmath text time unorderedContainers + vector xml yaml zipArchive zlib ]; testDepends = [ ansiTerminal Diff filepath highlightingKate HUnit pandocTypes QuickCheck syb testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; - configureFlags = "-fblaze_html_0_5"; + buildTools = [ alex happy ]; doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 16b47a9c8ae..473f15c4d1f 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -1,14 +1,15 @@ -{ cabal, attoparsec, base64Bytestring, cereal, mtl, QuickCheck -, testFramework, testFrameworkQuickcheck2 +{ cabal, base64Bytestring, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "pem"; - version = "0.1.2"; - sha256 = "1p2sw36b9w6lf53jzj86ibyy9a48fjd786mx3x8mvc5lczx8v78m"; - buildDepends = [ attoparsec base64Bytestring cereal mtl ]; + version = "0.2.0"; + sha256 = "1hmsyavqzjx1chbn4a8vf0r2wz2fg0xl9cxgja4ap04si3qr458v"; + buildDepends = [ base64Bytestring mtl ]; testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-pem"; diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix new file mode 100644 index 00000000000..715fcaa9338 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -0,0 +1,14 @@ +{ cabal, pipes, pipesParse, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-bytestring"; + version = "1.0.1"; + sha256 = "0zk2n9mly1mjh1zb3z33gab362abgh8c0mw88mmwnlfszq97hcz7"; + buildDepends = [ pipes pipesParse transformers ]; + meta = { + description = "ByteString support for pipes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 3a14619d266..7136a281f89 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "2.0.0"; - sha256 = "1f9l6qlaf8dyldzwaavj3k5akm74ycga5j173ypdna3pv0jbzfrk"; + version = "2.0.1"; + sha256 = "0grfwmmwzxrska2218php22f898nn3x92bz1lmhpw2qi8mywvkzh"; buildDepends = [ pipes stm ]; testDepends = [ async pipes stm ]; meta = { diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index d75823d6025..42aaeba82a8 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,10 +1,10 @@ -{ cabal, base64Bytestring, cryptohash, random }: +{ cabal, base64Bytestring, binary, cryptohash, random, SHA }: cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.3"; - sha256 = "014l4n00lpg5037fkdwnxnv7xjfc3vlz1dphr7hfbqnjwf1z9ibw"; - buildDepends = [ base64Bytestring cryptohash random ]; + version = "2.4.1"; + sha256 = "1k98b1s2ld0jx8fy53k8d8pscp6n0plh51b2lj6ai6w8xj4vknw4"; + buildDepends = [ base64Bytestring binary cryptohash random SHA ]; meta = { homepage = "https://github.com/PeterScott/pwstore"; description = "Secure password storage"; diff --git a/pkgs/development/libraries/haskell/rfc5051/default.nix b/pkgs/development/libraries/haskell/rfc5051/default.nix new file mode 100644 index 00000000000..09b5d3e229e --- /dev/null +++ b/pkgs/development/libraries/haskell/rfc5051/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "rfc5051"; + version = "0.1.0.3"; + sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3"; + isLibrary = true; + isExecutable = true; + meta = { + description = "Simple unicode collation as per RFC5051"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 9baaa89d2d4..ad932df1ac7 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,14 +1,15 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, httpTypes, mtl, regexCompat, resourcet, text, wai, waiExtra, warp +, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai +, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.4.6"; - sha256 = "0g83kgqr1p03z7dks6x00id2gz95kkw00wmwp5vyz4zvx1mmmvk8"; + version = "0.5.0"; + sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat resourcet text wai waiExtra warp + mtl regexCompat resourcet text transformers wai waiExtra warp ]; meta = { homepage = "https://github.com/ku-fpg/scotty"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index ded335ca524..16e6eb60fcf 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,13 +1,13 @@ -{ cabal, nats }: +{ cabal, hashable, nats, text, unorderedContainers }: cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.9.2"; - sha256 = "06r6zdfbks48yb7ib0bc168xxk4qciv4dbazq76dpmnlhwxcf1li"; - buildDepends = [ nats ]; + version = "0.11"; + sha256 = "0w81ap41j28pbppqs33hz7b9n5ghyj2hnny0kgxgcg8iv2qg9czy"; + buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; - description = "Haskell 98 semigroups"; + description = "Anything that associates"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index dc9367b4463..4272afd61a2 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.7"; - sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m"; + version = "1.3.1"; + sha256 = "1psgb1jqw6hqbrp7f217ayabchsn9q4fn2z77lc52r4mlvys13mh"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 089151a31ac..f4d26a03b2f 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.0.1"; - sha256 = "16v2x9gnkfwz87y7p727nbp4sn7xln7sn5n72ldxfdrnclyixxjk"; + version = "0.13.0.2"; + sha256 = "1ss5r7nyp5w4gwrbm5v79jr4si3w9ci7dypsaqrxjw7ga95znsbm"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix new file mode 100644 index 00000000000..838f45eccaa --- /dev/null +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -0,0 +1,15 @@ +{ cabal, acidState, snap, text }: + +cabal.mkDerivation (self: { + pname = "snaplet-acid-state"; + version = "0.2.5"; + sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + buildDepends = [ acidState snap text ]; + meta = { + homepage = "https://github.com/mightybyte/snaplet-acid-state"; + description = "acid-state snaplet for Snap Framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix new file mode 100644 index 00000000000..663b198b2ee --- /dev/null +++ b/pkgs/development/libraries/haskell/stringable/default.nix @@ -0,0 +1,13 @@ +{ cabal, systemFilepath, text }: + +cabal.mkDerivation (self: { + pname = "stringable"; + version = "0.1.2"; + sha256 = "17lhry3x90s88lplbv2kvzyak8wrc9r80czng5s3dirmyp9rn5gs"; + buildDepends = [ systemFilepath text ]; + meta = { + description = "A Stringable type class, in the spirit of Foldable and Traversable"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 3258267f012..5dc83178be0 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.8"; - sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3"; + version = "0.13"; + sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 60999f51898..f40730b5e56 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.0.0"; - sha256 = "0nv8kp5ax0088z0d9y93xkv59v1i8wrrdprsj7bknk3yn0gd2gb3"; + version = "0.3.0.1"; + sha256 = "086i8cadq2s894157s1bh3zhd9zb9apr7w39gnydywzgkx47478h"; buildDepends = [ attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index e8abded2438..535f4103d12 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "word8"; - version = "0.0.3"; - sha256 = "1k5sq91pidgw7w8fc62k9gl8iynb65pcza6mjx8pa3n2lslp7125"; + version = "0.0.4"; + sha256 = "1jrys2crl1yfkgwc4ny6x1kr24kx8j3zsy0zql5ms19rfb0rnkki"; testDepends = [ hspec ]; meta = { description = "Word8 library"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index d194b1970c8..ee9bb33cdba 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,16 +1,17 @@ -{ cabal, csv, filepath, HDBC, HDBCSqlite3, HsSyck, HStringTemplate -, pandoc, parsec, split, time, utf8String, xhtml +{ cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate +, pandoc, parsec, split, text, time, unorderedContainers, xhtml +, yaml }: cabal.mkDerivation (self: { pname = "yst"; - version = "0.3.1.1"; - sha256 = "1wc2s5aan4rqdrpqgqvka5pqm3d691si5hdf0m0wpi2hzkwl3qv3"; + version = "0.4.0.1"; + sha256 = "0j260lvprgsi9qgjwji2cc25k0dzrw94h2527rwghik8baa1ha3r"; isLibrary = false; isExecutable = true; buildDepends = [ - csv filepath HDBC HDBCSqlite3 HsSyck HStringTemplate pandoc parsec - split time utf8String xhtml + aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec + split text time unorderedContainers xhtml yaml ]; meta = { homepage = "http://github.com/jgm/yst"; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 807fe54c27e..9db9b801952 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune= - doCheck = !stdenv.isDarwin; # until we solve dejagnu problems on darwin + doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. postInstall = # Install headers in the right place. - '' ln -srv "$out/lib/"libffi*/include "$out/include" + '' ln -s${if stdenv.isFreeBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include" ''; meta = { diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 249e9291fa3..9253468b8df 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconvOrEmpty -}: +, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; @@ -8,28 +7,32 @@ stdenv.mkDerivation rec { name = "libgsf-1.14.26"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; + url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; }; nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] + ++ libiconvOrEmpty + ++ libintlOrEmpty; doCheck = true; - meta = { - homepage = http://www.gnome.org/projects/libgsf; - license = "LGPLv2"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; + homepage = http://www.gnome.org/projects/libgsf; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for dealing with different structured file formats. ''; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 13385dfb65c..15e07af9f1e 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo -, libxml2, libgsf, bzip2, libcroco +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf +, bzip2, libcroco , gtk2 ? null, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -9,15 +9,22 @@ stdenv.mkDerivation rec { name = "librsvg-2.36.4"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; + url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] + + buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; + + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; - configureFlags = ["--enable-introspection=auto"]; + configureFlags = [ "--enable-introspection=auto" ] + ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + NIX_CFLAGS_COMPILE + = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 06ead3ca23f..ce81c1b2e8c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,23 +1,27 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils +, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng }: -let version = "1.1.1"; in +let version = "1.1.2"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "1hi27d5pld925g1azx8jq0wv557wpkd6xrq6lzm91cdr2lg1wvyw"; + md5 = "1835bbfa492099bce12e2934870e5611"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper + libcap_ng ]; + # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html + patches = [ ./securtyfs_userns.patch ]; + preConfigure = '' PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch new file mode 100644 index 00000000000..2723334f94a --- /dev/null +++ b/pkgs/development/libraries/libvirt/securtyfs_userns.patch @@ -0,0 +1,30 @@ +--- a/src/lxc/lxc_container.c ++++ b/src/lxc/lxc_container.c +@@ -750,7 +750,7 @@ err: + } + + +-static int lxcContainerMountBasicFS(void) ++static int lxcContainerMountBasicFS(bool userns_enabled) + { + const struct { + const char *src; +@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) + continue; + #endif + ++ if (STREQ(mnts[i].src, "securityfs") && userns_enabled) ++ continue; ++ + if (virFileMakePath(mnts[i].dst) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), +@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, + goto cleanup; + + /* Mounts the core /proc, /sys, etc filesystems */ +- if (lxcContainerMountBasicFS() < 0) ++ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) + goto cleanup; + + /* Mounts /proc/meminfo etc sysinfo */ diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index a47cacd62bc..75999f18d62 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, cmake, glib/*passthru only*/ }: stdenv.mkDerivation rec { - name = "openjpeg-1.5.1"; + name = "openjpeg-2.0.0"; passthru = { - incDir = "openjpeg-1.5"; + incDir = "openjpeg-2.0"; }; src = fetchurl { url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; - sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; + sha1 = "0af78ab2283b43421458f80373422d8029a9f7a7"; }; + buildInputs = [ cmake ]; nativebuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 311ed43729e..59151d35326 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,10 +1,7 @@ -{ stdenv, fetchurl, substituteAll -, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext -, libXfixes, libXrandr, libSM, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig -, libtiff, glib, icu -, mysql, postgresql, sqlite -, perl, coreutils, libXi +{ stdenv, fetchurl, substituteAll, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng +, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf @@ -40,6 +37,11 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # remove impure reference to /usr/lib/libstdc++.6.dylib + # there might be more references, but this is the only one I could find + substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ + --replace /usr/lib/libstdc++.6.dylib "${stdenv.gcc}/lib/libstdc++.6.dylib" ''; patches = diff --git a/pkgs/development/libraries/sqlite/3.7.14.nix b/pkgs/development/libraries/sqlite/3.7.14.nix deleted file mode 100644 index 50338f98a2c..00000000000 --- a/pkgs/development/libraries/sqlite/3.7.14.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, readline ? null, ncurses ? null }: - -assert readline != null -> ncurses != null; - -stdenv.mkDerivation { - name = "sqlite-3.7.14.1"; - - src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz; - sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc"; - }; - - buildInputs = [ readline ncurses ]; - - configureFlags = "--enable-threadsafe"; - - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; - - meta = { - homepage = http://www.sqlite.org/; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/sqlite/3.7.9-full.nix b/pkgs/development/libraries/sqlite/3.7.9-full.nix deleted file mode 100644 index c6ef448ea12..00000000000 --- a/pkgs/development/libraries/sqlite/3.7.9-full.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, tcl, readline ? null, ncurses ? null }: - -assert readline != null -> ncurses != null; - -stdenv.mkDerivation { - # I try to keep a version no newer than default.nix, and similar CFLAGS, - # for this to be compatible with it. - name = "sqlite-3.7.9-full"; - - src = fetchurl { - url = "http://www.sqlite.org/cgi/src/tarball/SQLite-3.7.9.tar.gz?uuid=version-3.7.9"; - sha256 = "0v11slxgjpx2nv7wp8c76wk2pa1dijs9v6zlcn2dj9jblp3bx8fk"; - }; - - buildInputs = [ readline ncurses ]; - nativeBuildInputs = [ tcl ]; - - doCheck = true; - checkTarget = "test"; - - configureFlags = "--enable-threadsafe --enable-tempstore"; - - preConfigure = '' - ${ # The tests oserror-1.1.{1,2,3} need the fd limit < 2000 - # and on the builders in NixOS we have 4096 now. - if stdenv.isLinux then "ulimit -n 1024" else ""} - export TCLLIBDIR=$out/${tcl.libdir} - ''; - - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; - - postInstall = '' - make sqlite3_analyzer - cp sqlite3_analyzer $out/bin - ''; - - meta = { - homepage = http://www.sqlite.org/; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/sqlite/3.7.16.nix b/pkgs/development/libraries/sqlite/default.nix similarity index 80% rename from pkgs/development/libraries/sqlite/3.7.16.nix rename to pkgs/development/libraries/sqlite/default.nix index f681e94c6ba..7521abc599b 100644 --- a/pkgs/development/libraries/sqlite/3.7.16.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.16.2"; + name = "sqlite-3.8.0.2"; src = fetchurl { - url = http://www.sqlite.org/2013/sqlite-autoconf-3071602.tar.gz; - sha1 = "85bf857cf86f34831d55d7ba97606dba581b8d62"; + url = http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz; + sha1 = "294c30e882a0d45877bce09afe72d08ccfc6b650"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 635d0ae964f..2020f48b1d2 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -781,14 +781,14 @@ August 15, 2011 - + google Google Inc. google_apis Google APIs Android + Google APIs 18 - 1 + 2 com.google.android.maps @@ -802,9 +802,9 @@ August 15, 2011 - 147899839 - 5c0c24f04e6b65c61da83408b7aee79228c24a40 - google_apis-18_r01.zip + 142778022 + 40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2 + google_apis-18_r02.zip @@ -855,14 +855,14 @@ August 15, 2011 Google Inc. Google Repository m2repository - 1 + 2 Local Maven repository for Google Libraries - 660833 - d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0 - google_m2repository_r01.zip + 2043649 + f518e0170e84a6bccbadb8a043989cc61f4c37aa + google_m2repository_r02.zip @@ -910,15 +910,15 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 9 + 11 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 5125755 - 3e31fc0b982f938edf216afe9e532774db12607a - google_play_services_3159130_r09.zip + 5265306 + 00851350c55b016bef202700f643f246fb0c24ea + google_play_services_3264130_r11.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 651c84533f0..2fd66420cf6 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -197,8 +197,8 @@ in google_apis_18 = buildGoogleApis { name = "google_apis-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-18_r01.zip; - sha1 = "5c0c24f04e6b65c61da83408b7aee79228c24a40"; + url = https://dl-ssl.google.com/android/repository/google_apis-18_r02.zip; + sha1 = "40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 38377cf8bbb..0b5f69ed3e2 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -8,16 +8,16 @@ {platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-22.05"; + name = "android-sdk-22.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; - md5 = "8201b10c21510f082c54f58a9bb082c8"; + url = http://dl.google.com/android/android-sdk_r22.2-linux.tgz; + md5 = "2a3776839e823ba9acb7a87a3fe26e02"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; - md5 = "94f3cbe896c332b94ee0408ae610a4b8"; + url = http://dl.google.com/android/android-sdk_r22.2-macosx.zip; + md5 = "9dfef6404e2f842c433073796aed8b7d"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 0d9cbc22080..58bf3549361 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,15 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r18.0.1"; + name = "android-build-tools-r18.1.0"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip; - sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; - sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 3339a065e2a..3c6263f125d 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -64,6 +64,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_3 = androidsdk { + platformVersions = [ "18" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant; inherit androidsdk; diff --git a/pkgs/development/mobile/androidenv/fetch b/pkgs/development/mobile/androidenv/fetch new file mode 100755 index 00000000000..30aabc9e086 --- /dev/null +++ b/pkgs/development/mobile/androidenv/fetch @@ -0,0 +1,15 @@ +#!/bin/sh + +# this shows a list of available xmls +android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O + +# we skip the intel addons, as they are Windows+osX only +# we skip the default sys-img (arm?) because it is empty +curl -o repository-8.xml https://dl-ssl.google.com/android/repository/repository-8.xml +curl -o addon.xml https://dl-ssl.google.com/android/repository/addon.xml +curl -o sys-img-mips.xml https://dl-ssl.google.com/android/repository/sys-img/mips/sys-img.xml +curl -o sys-img-x86.xml https://dl-ssl.google.com/android/repository/sys-img/x86/sys-img.xml + +./generate-addons.sh +./generate-platforms.sh +./generate-sysimages.sh diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 2ca937b5534..5db90ffef1c 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; meta = { description = "Android SDK Platform 4.3"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index c89cb9ed127..c5ddf714cdf 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; meta = { description = "Android SDK Platform 4.3"; diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml index 4e180ac4b3e..79795aa4939 100644 --- a/pkgs/development/mobile/androidenv/repository-8.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -616,8 +616,8 @@ November 13, 2012 - - 1 + + 2 Android SDK Platform 4.3 4.3 18 @@ -625,14 +625,14 @@ November 13, 2012 21 - 9 + 10 1 - 48752456 - c24de91d6f296cf453701aef281609779fffb379 - android-18_r01.zip + 57319855 + 62a9438d4cf6692f4d6510c27a380be195db9534 + android-18_r02.zip @@ -705,16 +705,16 @@ November 13, 2012 - - 1 + + 2 Android SDK Platform 4.3 18 armeabi-v7a - 125597583 - 5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e - sysimg_armv7a-18_r01.zip + 125457135 + 4a1a93200210d8c42793324362868846f67401ab + sysimg_armv7a-18_r02.zip @@ -1006,33 +1006,60 @@ November 13, 2012 + + + + 18 + 1 + 0 + + + + 19659547 + 3a9810fc8559ab03c09378f07531e8cae2f1db30 + build-tools_r18.1-windows.zip + + + 20229298 + f314a0599e51397f0886fe888b50dd98f2f050d8 + build-tools_r18.1-linux.zip + + + 20451524 + 16ddb299b8b43063e5bb3387ec17147c5053dfd8 + build-tools_r18.1-macosx.zip + + + + + - + 22 - 0 - 5 + 2 + 0 18 - 113389691 - a3f450706b5374122f0edb76a4488462ba5171ca - tools_r22.0.5-windows.zip + 108669997 + c4231cd769ef9d1b6ae69202a1a0d0f783f04ea7 + tools_r22.2-windows.zip - 105904090 - 06a3e1d66b9280cba49c7ba1893ea14beae072d2 - tools_r22.0.5-linux.zip + 101168674 + a11febd30023ed2590bca4c2d7b1dc2b0cfcd715 + tools_r22.2-linux.zip - 77191184 - 318947edef0ab46603eb7f4d21333ee4b4fa1ff3 - tools_r22.0.5-macosx.zip + 74822802 + 76896171d0c9ba91c875c8f13ac58cd2e50e9f28 + tools_r22.2-macosx.zip diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml index f0e8347f6db..75ddf73eb1d 100644 --- a/pkgs/development/mobile/androidenv/sys-img-x86.xml +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -136,4 +136,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY + + Android SDK Platform 4.3 + 1 + 18 + x86 + + + + 155656419 + f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1 + sysimg_x86-18_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index bc78ea11e6f..4c1f0a30907 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -48,8 +48,8 @@ in sysimg_armeabi-v7a_18 = buildSystemImage { name = "armeabi-v7a-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; - sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r02.zip; + sha1 = "4a1a93200210d8c42793324362868846f67401ab"; }; }; @@ -85,6 +85,14 @@ in }; }; + sysimg_x86_18 = buildSystemImage { + name = "x86-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-18_r01.zip; + sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; + }; + }; + sysimg_mips_15 = buildSystemImage { name = "mips-15"; src = fetchurl { diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 403bb264892..922594bc3dc 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -36,7 +36,9 @@ in buildPythonPackage rec { c libudev = "${udev}/lib/libudev.so.1" }' blivet/pyudev.py '' else '' - sed -i -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ + sed -i \ + -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ + -e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \ blivet/pyudev.py ''); diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 70a8cfd5d6c..885f599493a 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.0.4"; - sha256 = "0h34bqiig4d7xk514gl0zk119xbl2i3x5h2hvylbrzq1mrdc6xnk"; + version = "0.7.0.5"; + sha256 = "0i2l0f38j48im3vrqgg54czii5gxszscagdk3928miffac098a7s"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 4cb75151b00..e6377a201fe 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.0.1"; - sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5"; + version = "1.0.1.1"; + sha256 = "1bcp9yxmh5z7cvap4nrj8gxnndwws21w6y352yasf35bf432nxa9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/parsing/alex/3.1.0.nix b/pkgs/development/tools/parsing/alex/3.1.0.nix new file mode 100644 index 00000000000..b6d46bea58e --- /dev/null +++ b/pkgs/development/tools/parsing/alex/3.1.0.nix @@ -0,0 +1,18 @@ +{ cabal, perl, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "alex"; + version = "3.1.0"; + sha256 = "1d2kdn4g3zyc3ijiscbqayzg1apy0iih603dv90pr9w2f36djrkh"; + isLibrary = false; + isExecutable = true; + buildDepends = [ QuickCheck ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/parsing/happy/1.19.0.nix b/pkgs/development/tools/parsing/happy/1.19.0.nix new file mode 100644 index 00000000000..2ff2950591e --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.19.0.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.19.0"; + sha256 = "1phk44crr1zi4sd3slxj1ik5ll799zl48k69z1miws3mxq6w076z"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index e17038692f5..87fd50fe759 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; stdenv.mkDerivation rec { - name = "phantomjs-1.9.1"; + name = "phantomjs-1.9.2"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2"; - sha256 = "1r4ssx6v0ah18jy3vjswhki2i21r45qbs1jzh4x672wdc9lxz2p6"; + sha256 = "1nywb9xhcfjark6zfjlnrljc08r5185vv25vfcc65jzla8hy75qp"; } else # x86_64-linux fetchurl { url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2"; - sha256 = "1l7hlhspzw3zzsgz9cq0a3j26giynjicvb6y96fj3ipkn4shznnn"; + sha256 = "1xsjx4j6rwkq27y4iqdn0ai4yrq70a3g9309blywki0g976phccg"; }; buildPhase = '' diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 48c4809e5cd..4f276d50105 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,15 +1,17 @@ -{ cabal, binary, ConfigFile, filepath, gtk, miniutter, mtl, random -, text, zlib +{ cabal, binary, ConfigFile, deepseq, enummapset, filepath, gtk +, hashable, keys, miniutter, mtl, random, stm, text, transformers +, unorderedContainers, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.6.5"; - sha256 = "114s3adqs5mh566dbn0bb20v088wgg8arsm6m8hs9vx8j3jc8nx5"; + version = "0.2.8"; + sha256 = "0dwv6ljigwc46czyivn4ivszfiykvhjx6n4agv7lwx8faan7kax3"; isLibrary = true; isExecutable = true; buildDepends = [ - binary ConfigFile filepath gtk miniutter mtl random text zlib + binary ConfigFile deepseq enummapset filepath gtk hashable keys + miniutter mtl random stm text transformers unorderedContainers zlib ]; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 41d70533437..b904a6b5dcd 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, lame, mplayer, pulseaudio, portaudio , python, pyqt4, pythonPackages # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. @@ -9,16 +9,16 @@ let in stdenv.mkDerivation rec { - name = "anki-2.0.3"; + name = "anki-2.0.12"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "f40ee4ef29c91101cf9978ce7bd4c513f13ca7c77497a3fb50b8128adf3a5178"; + sha256 = "1pccws3rgfpyxdx5xph5x72c4a46is0alfz73icn9ppgjdizzipr"; }; - pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy ] + pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] ++ lib.optional plotsSupport py.matplotlib; - buildInputs = [ python py.wrapPython ]; + buildInputs = [ python py.wrapPython lame mplayer pulseaudio ]; preConfigure = '' substituteInPlace anki \ @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { ''; postInstall = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + ln -s $out/share/anki/* $out/lib/${python.libPrefix}/site-packages/ + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" wrapPythonPrograms ''; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index cd4242b170f..a6ef3b9c07f 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -58,4 +58,5 @@ vizanto = "Danny Wilson "; winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; + zef = "Zef Hemel "; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b8e5055f056..410fa6a7ad6 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "1.0"; + version = "2.0"; src = fetchurl { - url = "http://w1.fi/releases/${name}.tar.gz"; - sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0"; + url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; + sha256 = "262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35"; }; buildInputs = [ libnl openssl pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/bin"; meta = with stdenv.lib; { - homepage = http://w1.fi/hostapd/; + homepage = http://hostap.epitest.fi; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index e394b612388..8e181d3d5cf 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,16 +1,22 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages }: buildPythonPackage rec { - name = "iotop-0.4.1"; + name = "iotop-0.6"; namePrefix = ""; src = fetchurl { url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; - sha256 = "1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll"; + sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; pythonPath = [ pythonPackages.curses ]; + postInstall = + '' + # Put the man page in the right place. + mv $out/lib/python*/site-packages/iotop-*/share $out + ''; + doCheck = false; meta = { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d4f7c4e6718..45cd135fbbe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -242,6 +242,8 @@ with stdenv.lib; CGROUP_MEM_RES_CTLR_SWAP y ''} DEVPTS_MULTIPLE_INSTANCES y + BLK_DEV_THROTTLING y + CFQ_GROUP_IOSCHED y # Enable staging drivers. These are somewhat experimental, but # they generally don't hurt. diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 34b2d488289..94773a22bfa 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11"; - modDirVersion = "3.11.0"; + version = "3.11.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1yfpa4fzhsn4r5dwkcf3azy0vqdms865jaikn3fdwbabmpqchgl0"; + sha256 = "16wblz06129lxvxsl3rhmdj4b31yzmwv3rxnjmrlj3c3qlzph29c"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 33494a65f23..b275d0740dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.61"; + version = "3.4.62"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1izjmpcb2ww1pj5nyxgnx4v5ghl0d173w2s6py89ai4yqzqamhnf"; + sha256 = "1cfi7125xdb1b9mrabrxyr86ixyb8jik21vg5r8d355r0zgz124m"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch b/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch deleted file mode 100644 index 4098d042fd5..00000000000 --- a/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch +++ /dev/null @@ -1,39 +0,0 @@ -Work around LVM/cryptsetup errors like: - - semid 32768: semop failed for cookie 0xd4d41f4: incorrect semaphore state - Failed to set a proper state for notification semaphore identified by cookie value 223166964 (0xd4d41f4) to initialize waiting for incoming notifications. - -and (when running "cryptsetup --debug"): - - Uevent not generated! Calling udev_complete internally to avoid process lock-up. - -Here for some reason libdm *thinks* that the uevent hasn't been -emitted, so it calls udev_complete. But the uevent actually *has* -been emitted, so udev calls ‘dmsetup udevcomplete’ as well, leading to -a race. - -This is probably a reoccurence of the problem described here: - - http://www.redhat.com/archives/dm-devel/2011-August/msg00075.html - http://www.redhat.com/archives/linux-lvm/2011-September/msg00023.html - -which was fixed in the kernel, so it's not clear why it's surfacing -again. Maybe netlink_broadcast_filtered() has started returning some -other bogus error code. - -diff -ru -x '*~' LVM2.2.02.98/libdm/ioctl/libdm-iface.c LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c ---- LVM2.2.02.98/libdm/ioctl/libdm-iface.c 2012-10-15 10:24:58.000000000 -0400 -+++ LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c 2012-10-15 14:19:06.774363736 -0400 -@@ -1754,9 +1754,12 @@ - - if (ioctl_with_uevent && dm_udev_get_sync_support() && - !_check_uevent_generated(dmi)) { -+ log_debug("warning: Uevent might not be generated!"); -+#if 0 - log_debug("Uevent not generated! Calling udev_complete " - "internally to avoid process lock-up."); - _udev_complete(dmt); -+#endif - } - - if (!_dm_ioctl_unmangle_names(dmt->type, dmi)) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index ec68304c935..53127e4458c 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.98"; + v = "2.02.100"; in stdenv.mkDerivation { name = "lvm2-${v}"; src = fetchurl { - url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; - sha256 = "0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"; + url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; + md5 = "9629cf5728544d7e637cafde1f73d777"; }; - patches = [ ./assume-uevent-generated.patch ]; - configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; @@ -24,7 +22,11 @@ stdenv.mkDerivation { substituteInPlace scripts/lvmdump.sh \ --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/sbin/lvm $out/sbin/lvm + --replace /usr/sbin/lvm $out/sbin/lvm \ + --replace /usr/bin/udevadm ${udev}/bin/udevadm + + sed -i /DEFAULT_SYS_DIR/d Makefile.in + sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in ''; #patches = [ ./purity.patch ]; @@ -39,6 +41,11 @@ stdenv.mkDerivation { '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ --replace $out/sbin/blkid ${utillinux}/sbin/blkid + + # Systemd stuff + mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators + cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system + cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; meta = { diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix deleted file mode 100644 index 4cad810cc5f..00000000000 --- a/pkgs/os-specific/linux/mountall/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }: - -stdenv.mkDerivation { - name = "mountall-2.35"; - - src = fetchurl { - url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.35.tar.gz; - sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy"; - }; - - patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ]; - - buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ]; - - makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; - - meta = { - homepage = https://launchpad.net/ubuntu/+source/mountall; - description = "Utility to mount all filesystems and emit Upstart events"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/mountall/fix-usr1-race.patch b/pkgs/os-specific/linux/mountall/fix-usr1-race.patch deleted file mode 100644 index e970b77733c..00000000000 --- a/pkgs/os-specific/linux/mountall/fix-usr1-race.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru mountall-2.35-orig/src/mountall.c mountall-2.35/src/mountall.c ---- mountall-2.35-orig/src/mountall.c 2012-03-20 11:01:14.035898815 +0100 -+++ mountall-2.35/src/mountall.c 2012-03-20 11:20:39.194786311 +0100 -@@ -3746,6 +3746,12 @@ - exit (EXIT_ERROR); - } - -+ /* SIGUSR1 tells us that a network device came up. Install -+ the handler before daemonising so that the mountall-net job -+ won't kill us by sending USR1. */ -+ nih_signal_set_handler (SIGUSR1, nih_signal_handler); -+ NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL)); -+ - /* Become daemon */ - if (daemonise) { - pid_t pid; -@@ -3799,10 +3805,6 @@ - nih_signal_set_handler (SIGTERM, nih_signal_handler); - NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL)); - -- /* SIGUSR1 tells us that a network device came up */ -- nih_signal_set_handler (SIGUSR1, nih_signal_handler); -- NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL)); -- - /* Check for force-fsck on the kernel command line */ - cmdline = fopen ("/proc/cmdline", "r"); - if (cmdline) { diff --git a/pkgs/os-specific/linux/mountall/no-plymouth.patch b/pkgs/os-specific/linux/mountall/no-plymouth.patch deleted file mode 100644 index 890dab9bc88..00000000000 --- a/pkgs/os-specific/linux/mountall/no-plymouth.patch +++ /dev/null @@ -1,295 +0,0 @@ -diff -ru -x '*~' mountall-2.31-orig/configure.ac mountall-2.31/configure.ac ---- mountall-2.31-orig/configure.ac 2011-07-15 14:00:15.000000000 +0200 -+++ mountall-2.31/configure.ac 2011-07-25 00:13:13.000000000 +0200 -@@ -29,7 +29,7 @@ - PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0]) - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) - PKG_CHECK_MODULES([UDEV], [libudev >= 146]) --PKG_CHECK_MODULES([PLYMOUTH], [ply-boot-client >= 0.8.0]) -+#PKG_CHECK_MODULES([PLYMOUTH], [ply-boot-client >= 0.8.0]) - - # Checks for header files. - -diff -ru -x '*~' mountall-2.31-orig/src/mountall.c mountall-2.31/src/mountall.c ---- mountall-2.31-orig/src/mountall.c 2011-07-15 14:00:15.000000000 +0200 -+++ mountall-2.31/src/mountall.c 2011-07-25 00:21:13.000000000 +0200 -@@ -64,8 +64,10 @@ - #include - #include - -+#if 0 - #include - #include -+#endif - - #include "ioprio.h" - -@@ -219,15 +221,19 @@ - void boredom_timeout (void *data, NihTimer *timer); - - int plymouth_connect (void); -+#if 0 - void plymouth_disconnected (void *user_data, ply_boot_client_t *client); -+#endif - - void plymouth_progress (Mount *mnt, int progress); - void plymouth_update (int only_clear); - -+#if 0 - void plymouth_response (void *user_data, ply_boot_client_t *client); - void plymouth_failed (void *user_data, ply_boot_client_t *client); - void plymouth_answer (void *user_data, const char *keys, - ply_boot_client_t *client); -+#endif - - void usr1_handler (void *data, NihSignal *signal); - int set_dev_wait_time (NihOption *option, const char *arg); -@@ -247,8 +253,10 @@ - **/ - size_t num_local = 0; - size_t num_local_mounted = 0; -+size_t num_local_failed = 0; - size_t num_remote = 0; - size_t num_remote_mounted = 0; -+size_t num_remote_failed = 0; - size_t num_virtual = 0; - size_t num_virtual_mounted = 0; - size_t num_swap = 0; -@@ -318,6 +326,7 @@ - **/ - static struct udev *udev = NULL; - -+#if 0 - /** - * ply_event_loop: - * -@@ -331,6 +340,7 @@ - * Plymouth boot client. - **/ - static ply_boot_client_t *ply_boot_client = NULL; -+#endif - - /** - * plymouth_error: -@@ -1253,11 +1263,12 @@ - nih_debug ("%s is root filesystem", MOUNT_NAME (mnt)); - tag = TAG_LOCAL; - } else if (is_remote (mnt)) { -- if ((! strcmp (mnt->mountpoint, "/usr")) -+ if ((! has_option (mnt, "nobootwait", FALSE)) && ( -+ (! strcmp (mnt->mountpoint, "/usr")) - || (! strcmp (mnt->mountpoint, "/var")) - || (! strncmp (mnt->mountpoint, "/usr/", 5)) - || (! strncmp (mnt->mountpoint, "/var/", 5)) -- || (has_option (mnt, "bootwait", FALSE))) -+ || (has_option (mnt, "bootwait", FALSE)))) - { - tag = TAG_REMOTE; - } else { -@@ -1566,7 +1577,8 @@ - /* Enforce local only after virtual filesystems triggered */ - if ((! local_triggered) - && virtual_triggered -- && (num_local_mounted == num_local)) { -+ && (num_local_mounted == num_local) -+ && (num_local_failed == 0)) { - nih_info (_("%s finished"), "local"); - emit_event ("local-filesystems", NULL); - local_triggered = TRUE; -@@ -1575,7 +1587,8 @@ - /* Enforce remote only after virtual filesystems triggrered */ - if ((! remote_triggered) - && virtual_triggered -- && (num_remote_mounted == num_remote)) { -+ && (num_remote_mounted == num_remote) -+ && (num_remote_failed == 0)) { - nih_info (_("%s finished"), "remote"); - emit_event ("remote-filesystems", NULL); - remote_triggered = TRUE; -@@ -1585,7 +1598,9 @@ - if ((! filesystem_triggered) - && virtual_triggered - && local_triggered -- && remote_triggered) { -+ && remote_triggered -+ && (num_local_failed == 0) -+ && (num_remote_failed == 0)) { - nih_info (_("All filesystems mounted")); - emit_event ("filesystem", NULL); - filesystem_triggered = TRUE; -@@ -1599,9 +1614,9 @@ - swap_triggered = TRUE; - } - -- nih_info ("local %zi/%zi remote %zi/%zi virtual %zi/%zi swap %zi/%zi", -- num_local_mounted, num_local, -- num_remote_mounted, num_remote, -+ nih_info ("local %zi/%zi/%zi remote %zi/%zi/%zi virtual %zi/%zi swap %zi/%zi", -+ num_local_mounted, num_local, num_local_failed, -+ num_remote_mounted, num_remote, num_remote_failed, - num_virtual_mounted, num_virtual, - num_swap_mounted, num_swap); - } -@@ -2442,12 +2457,14 @@ - if (no_events) - return; - -+#if 0 - /* Flush the Plymouth connection to ensure all updates are sent, - * since the event may kill plymouth. - */ - if (ply_boot_client) - ply_boot_client_flush (ply_boot_client); -- -+#endif -+ - env = NIH_MUST (nih_str_array_new (NULL)); - - if (mnt) { -@@ -3026,6 +3043,7 @@ - int - plymouth_connect (void) - { -+#if 0 - /* If we were already connected, just re-use that connection */ - if (ply_boot_client) - return TRUE; -@@ -3052,8 +3070,13 @@ - nih_info (_("Connected to Plymouth")); - - return TRUE; -+#else -+ return FALSE; -+#endif - } - -+ -+#if 0 - void - plymouth_disconnected (void * user_data, - ply_boot_client_t *client) -@@ -3066,6 +3089,7 @@ - ply_boot_client_free (ply_boot_client); - ply_boot_client = NULL; - } -+#endif - - - void -@@ -3076,6 +3100,7 @@ - - nih_assert (mnt != NULL); - -+#if 0 - /* No Plymouth => no progress information */ - if (! plymouth_connect ()) - return; -@@ -3105,6 +3130,7 @@ - plymouth_response, - plymouth_failed, - NULL); -+#endif - } - - void -@@ -3120,20 +3146,31 @@ - NIH_LIST_FOREACH (mounts, iter) { - Mount *mnt = (Mount *)iter; - -- if (mnt->error <= ERROR_BORED) -+ if (mnt->error == ERROR_NONE) - continue; - -- nih_error (_("Skipping mounting %s since Plymouth is not available"), -+ nih_error (_("Could not mount %s"), - MOUNT_NAME (mnt)); - - mnt->error = ERROR_NONE; - -+ if (mnt->tag == TAG_LOCAL) { -+ num_local_failed++; -+ emit_event ("mount-failed", mnt); -+ } -+ -+ if (mnt->tag == TAG_REMOTE) { -+ num_remote_failed++; -+ emit_event ("mount-failed", mnt); -+ } -+ - skip_mount (mnt); - } - - return; - } - -+#if 0 - /* If we're already displaying messages, don't change them unless - * the message is no longer valid for that mount point; otherwise - * clear the message. -@@ -3244,8 +3281,10 @@ - plymouth_answer, - plymouth_failed, - NULL); -+#endif - } - -+#if 0 - void - plymouth_response (void * user_data, - ply_boot_client_t *client) -@@ -3364,6 +3403,7 @@ - break; - } - } -+#endif - - /* - * set_dev_wait_time: -@@ -3399,7 +3439,6 @@ - return err; - } - -- - /** - * stop_mountpoint_timer: - * @mountpoint: mountpoint whose timer you want to stop. -@@ -3673,6 +3712,7 @@ - (NihIoWatcher)udev_monitor_watcher, - udev_monitor)); - -+#if 0 - /* Initialise a Plymouth event loop; this is an epoll instance that - * we can poll within our own main loop and call out to when needs - * be. -@@ -3686,6 +3726,7 @@ - - /* Attempt an early connection to Plymouth */ - plymouth_connect (); -+#endif - - mounts = NIH_MUST (nih_list_new (NULL)); - -@@ -3698,7 +3739,9 @@ - * from /etc/fstab and /proc/self/mountinfo to find out what else - * we need to do. - */ -+#if 0 - parse_fstab (BUILTIN_FSTAB); -+#endif - parse_fstab (_PATH_MNTTAB); - parse_mountinfo (); - -@@ -3822,10 +3865,12 @@ - /* Flush the D-Bus connection to ensure all messages are sent */ - dbus_connection_flush (connection); - -+#if 0 - /* Flush the Plymouth connection to ensure all updates are sent */ - if (ply_boot_client) - ply_boot_client_flush (ply_boot_client); -- -+#endif -+ - return ret; - } - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 77126e5ffdc..63e1a2a3bf3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl +, kexectools }: assert stdenv.isLinux; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { '' # FIXME: patch this in systemd properly (and send upstream). # FIXME: use sulogin from util-linux once updated. - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c src/core/shutdown.c; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ @@ -60,7 +61,8 @@ stdenv.mkDerivation rec { --replace /sbin/fsck ${utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${sysvtools}/sbin/sulogin + --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \ + --replace /sbin/kexec ${kexectools}/sbin/kexec done substituteInPlace src/journal/catalog.c \ diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 8f244c3d645..d5dc292ac33 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; + NIX_CFLAGS_LINK = "-lgcc_s"; + installFlags = "historydir=$(TMPDIR)/foo"; meta = { diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix new file mode 100644 index 00000000000..ae50091add1 --- /dev/null +++ b/pkgs/servers/bird/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, flex, bison, readline }: + +stdenv.mkDerivation rec { + name = "bird-1.3.11"; + + src = fetchurl { + url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + sha256 = "15c4d9cyd6l8jdlrvmzvwmpga81llm8zxqvbsir9gvwgzn6zbmna"; + }; + + buildInputs = [ flex bison readline ]; + + meta = { + description = ""; + homepage = http://bird.network.cz; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 4f689bae658..b10239e1b77 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, doxygen }: stdenv.mkDerivation rec { - name = "libmpdclient-2.6"; + version = "2.8"; + name = "libmpdclient-${version}"; src = fetchurl { - url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "1j8kn0fawdsvczrkhf6xm2yp0h6w49b326i3c08zwvhskd3phljw"; + url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2"; + sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh"; }; + buildInputs = [ doxygen ]; + meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index c71283570e0..ccac6e331fd 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, erlang }: +{ stdenv, fetchurl, unzip, erlangR15B03 }: let srcs = { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "riak-1.3.1"; - buildInputs = [unzip erlang]; + buildInputs = [unzip erlangR15B03]; src = srcs.riak; diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/6.x.nix similarity index 100% rename from pkgs/servers/sql/virtuoso/default.nix rename to pkgs/servers/sql/virtuoso/6.x.nix diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix new file mode 100644 index 00000000000..630095782fa --- /dev/null +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, libxml2, openssl, readline, gawk }: + +stdenv.mkDerivation rec { + name = "virtuoso-opensource-7.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + sha256 = "1z0jdzayv45y57jj8kii6csqfjhswcs8s2krqqfhab54xy6gynbl"; + }; + + buildInputs = [ libxml2 openssl readline gawk ]; + + CPP = "${stdenv.gcc}/bin/gcc -E"; + + configureFlags = " + --enable-shared --disable-all-vads --with-readline=${readline} + --disable-hslookup --disable-wbxml2 --without-iodbc + --enable-openssl=${openssl} + "; + + postInstall='' + echo Moving documentation + mkdir -pv $out/share/doc + mv -v $out/share/virtuoso/doc $out/share/doc/${name} + echo Removing jars and empty directories + find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete + ''; + + meta = with stdenv.lib; { + description = "SQL/RDF database used by, e.g., KDE-nepomuk"; + homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + platforms = platforms.all; + maintainers = [ maintainers.urkud ]; + }; +} diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix new file mode 100644 index 00000000000..21a93774758 --- /dev/null +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: + +stdenv.mkDerivation rec { + name = "netatalk-3.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + }; + + buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + + configureFlags = [ + "--with-bdb=${db48}" + "--with-openssl=${openssl}" + ]; + + enableParallelBuild = true; + + meta = { + description = "Apple File Protocl Server"; + homepage = http://netatalk.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix new file mode 100644 index 00000000000..e6787ec76c8 --- /dev/null +++ b/pkgs/tools/misc/colord/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, fetchgit +, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus + +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection +, version ? "git" +}: + +# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db +# thus they get symlinked to /etc and /var + +stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { + "0.1.33" = { + name = "colord-0.1.33"; + src = fetchurl { + url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; + sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; + }; + }; + "git" = { + name = "colord-git-11dca"; + src = fetchgit { + url = "https://github.com/hughsie/colord.git"; + rev = "11dcaba034edff3955ceff53795df82c57c34adc"; + sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; + }; + + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; + }; +} { + + enableParallelBuilding = true; + + preConfigure = '' + configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" + ''; + + buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + + postInstall = '' + sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules + mv $out/etc/colord.conf{,.default} + ln -s /etc/colord.conf $out/etc/colord.conf + rm -fr $out/var/lib/colord + ln -s /var/lib/colord $out/var/lib/colord + ''; + + meta = { + description = "system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices"; + homepage = http://www.freedesktop.org/software/colord/intro.html; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix deleted file mode 100644 index 23db167f307..00000000000 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchurl, perl, gmp ? null -, aclSupport ? false, acl ? null -, selinuxSupport? false, libselinux ? null, libsepol ? null -}: - -assert aclSupport -> acl != null; -assert selinuxSupport -> libselinux != null && libsepol != null; - -stdenv.mkDerivation rec { - name = "coreutils-8.19"; - - src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; - }; - - nativeBuildInputs = [ perl ]; - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; - - crossAttrs = ({ - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; - - # Needed for fstatfs() - # I don't know why it is not properly detected cross building with glibc. - configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; - doCheck = false; - } - - // - - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - })); - - # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), - # and {Open,Free}BSD. - doCheck = stdenv ? glibc; - - enableParallelBuilding = true; - - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - meta = { - homepage = http://www.gnu.org/software/coreutils/; - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; - - longDescription = '' - The GNU Core Utilities are the basic file, shell and text - manipulation utilities of the GNU operating system. These are - the core utilities which are expected to exist on every - operating system. - ''; - - license = "GPLv3+"; - - maintainers = [ ]; - }; -} - diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a526d3ac5a8..ebd68ee9cf6 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -6,8 +6,11 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; + +with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; + let - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation (rec { name = "coreutils-8.21"; src = fetchurl { @@ -17,16 +20,14 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; + ++ optional aclSupport acl + ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + ++ optional aclSupport acl.crossDrv + ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] + ++ optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.crossDrv; buildPhase = '' @@ -57,7 +58,7 @@ let enableParallelBuilding = true; - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; + NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -74,7 +75,9 @@ let maintainers = [ ]; }; - }; + } // optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + }); in self // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 885fd040e47..2b1108846d7 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { substituteInPlace configure --replace /bin/stty "$(type -tP stty)" sed -e '1i\#include ' -i exp_inter.c export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" + '' + stdenv.lib.optionalString stdenv.isFreeBSD '' + ln -s libexpect.so.1 libexpect545.so ''; configureFlags = [ diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index b273e4630a3..6ee427bc506 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,11 +1,11 @@ { fetchurl }: -let version = "1.1.0"; in +let version = "1.2.1"; in fetchurl { - url = "http://semicomplete.com/files/logstash/logstash-${version}-monolithic.jar"; + url = "https://logstash.objects.dreamhost.com/release/logstash-${version}-flatjar.jar"; name = "logstash-${version}.jar"; - sha256 = "03s9g2appsmdg973212dl37ldws36fgsvxi9w1lxbvmmclc4k7vc"; + sha256 = "08zfhq6klhkqapqnyzbdikgryd8bj2fp0wdb5d6dawdan5psbf6h"; } diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix new file mode 100644 index 00000000000..2b15d4470c3 --- /dev/null +++ b/pkgs/tools/misc/megacli/default.nix @@ -0,0 +1,35 @@ +{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "megacli-8.07.07"; + + src = + requireFile { + name = "8.07.07_MegaCLI.zip"; + url = http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.07.07_MegaCLI.zip; + sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; + }; + + buildInputs = [rpm cpio ncurses unzip makeWrapper]; + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; + + buildCommand = '' + ensureDir $out/bin + cd $out + unzip ${src} + rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 + wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 + ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 + eval fixupPhase + ''; + + meta = { + description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; + license = "unfree"; + }; +} diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index dd6bfb82aab..c2b25e863f2 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.21"; + version = "1.0.22"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "12v1x9p4f8y9967ypwxhkr10q6pk4cdallr0k4lic0kcfsmmxhba"; + sha256 = "0b2w5jic0zs8smfq2a9w99ql7lspb7jph3psmqaflw0hq4gdsfa7"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix new file mode 100644 index 00000000000..648abe882c4 --- /dev/null +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, nix, readline, boehmgc }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; + + src = fetchgit { + url = https://github.com/edolstra/nix-repl.git; + rev = "81d658fe4afda234028cd4551e12491db4303957"; + sha256 = "067mj8as99n0hkrr2qss3y3hnr8c5zy4n8bqx3z900n3j43cwzyc"; + }; + + buildInputs = [ nix readline boehmgc ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/bin + g++ -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix -L${nix}/lib/nix \ + -lformat -lutil -lstore -lexpr -lmain -lreadline -lgc + ''; + + meta = { + homepage = https://github.com/edolstra/nix-repl; + description = "An interactive environment for evaluating and building Nix expressions"; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl3; + platforms = nix.meta.platforms; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 89cf2d1e00e..7b4bb3c6193 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 17e860f7d7c..ba0353e4507 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index df4917e803d..dd869714e05 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -7,8 +7,8 @@ pythonPackages.buildPythonPackage { namePrefix = ""; src = fetchurl { - url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; - name = "fail2ban-${version}.zip"; + url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; + name = "fail2ban-${version}.zip"; sha256 = "0lbanfshr8kasa1bb7861w3mrm2d0c1bvv4s5703265s8zp5m284"; }; @@ -16,38 +16,37 @@ pythonPackages.buildPythonPackage { pythonPath = [ gamin ]; - preConfigure = - '' - substituteInPlace setup.cfg \ - --replace /usr $out + preConfigure = '' + substituteInPlace setup.cfg \ + --replace /usr $out - substituteInPlace setup.py \ - --replace /etc $out/etc \ - --replace /var $TMPDIR/var \ + substituteInPlace setup.py \ + --replace /etc $out/etc \ + --replace /var $TMPDIR/var \ - for i in fail2ban-client fail2ban-regex fail2ban-server; do - substituteInPlace $i \ - --replace /usr/share/fail2ban $out/share/fail2ban - done - - for i in config/action.d/sendmail*.conf; do - substituteInPlace $i \ - --replace /usr/sbin/sendmail sendmail \ - --replace /usr/bin/whois whois - done - ''; + for i in fail2ban-client fail2ban-regex fail2ban-server; do + substituteInPlace $i \ + --replace /usr/share/fail2ban $out/share/fail2ban + done + + for i in config/action.d/sendmail*.conf; do + substituteInPlace $i \ + --replace /usr/sbin/sendmail sendmail \ + --replace /usr/bin/whois whois + done + ''; doCheck = false; - installCommand = - '' - python setup.py install --prefix=$out - ''; + installCommand = '' + python setup.py install --prefix=$out + ''; - meta = { - homepage = http://www.fail2ban.org/; + meta = with stdenv.lib; { + homepage = http://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index f131fcef4ce..b27707a0015 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mkpasswd-${version}"; - version = "5.0.25"; + version = "5.0.26"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz"; - sha256 = "0qb859vwd6g93cb5zbf19gpw2g2b9s1qlq4nqia1a966pjkvw1qj"; + sha256 = "729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5"; }; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af73216027e..46466f0de1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -633,6 +633,8 @@ let ciopfs = callPackage ../tools/filesystems/ciopfs { }; + colord = callPackage ../tools/misc/colord { }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { }; @@ -665,11 +667,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - coreutils = (if stdenv.isDarwin then - # 8.20 doesn't build on Darwin - callPackage ../tools/misc/coreutils/8.19.nix - else - callPackage ../tools/misc/coreutils) + coreutils = callPackage ../tools/misc/coreutils { # TODO: Add ACL support for cross-Linux. aclSupport = crossSystem == null && stdenv.isLinux; @@ -806,7 +804,12 @@ let encfs = callPackage ../tools/filesystems/encfs { }; - enscript = callPackage ../tools/text/enscript { }; + enscript = callPackage ../tools/text/enscript { + # fix syntax errors + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -1244,6 +1247,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + megacli = callPackage ../tools/misc/megacli { }; + megatools = callPackage ../tools/networking/megatools { }; minecraft = callPackage ../games/minecraft { }; @@ -1323,6 +1328,8 @@ let nbd = callPackage ../tools/networking/nbd { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; + netcdf = callPackage ../development/libraries/netcdf { }; nc6 = callPackage ../tools/networking/nc6 { }; @@ -2753,7 +2760,11 @@ let go_1_0 = callPackage ../development/compilers/go { }; - go_1_1 = callPackage ../development/compilers/go/1.1.nix { }; + go_1_1 = + if stdenv.isDarwin then + callPackage ../development/compilers/go/1.1-darwin.nix { } + else + callPackage ../development/compilers/go/1.1.nix { }; go = go_1_1; @@ -3167,9 +3178,10 @@ let love = callPackage ../development/interpreters/love {}; lua4 = callPackage ../development/interpreters/lua-4 { }; - lua5 = callPackage ../development/interpreters/lua-5 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; + lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { }; + lua5 = lua5_1; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; @@ -3256,6 +3268,8 @@ let pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; + pypi2nix = python27Packages.pypi2nix; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -4313,6 +4327,10 @@ let gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; + gusb = callPackage ../development/libraries/gusb { + inherit (gnome) gtkdoc; + }; + qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; gnet = callPackage ../development/libraries/gnet { }; @@ -4968,7 +4986,12 @@ let libtommath = callPackage ../development/libraries/libtommath { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { + # fix "unrecognized option -arch" error + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; @@ -5552,26 +5575,15 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; - sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { + sqlite = lowPrio (callPackage ../development/libraries/sqlite { readline = null; ncurses = null; }); - sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { - readline = null; - ncurses = null; - }); - - sqlite = sqlite_3_7_16; - sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; }); - sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix { - inherit readline ncurses; - }); - stfl = callPackage ../development/libraries/stfl { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple @@ -6024,6 +6036,8 @@ let bind = callPackage ../servers/dns/bind { }; + bird = callPackage ../servers/bird { }; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; }; @@ -6268,7 +6282,11 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; - virtuoso = callPackage ../servers/sql/virtuoso { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; + + virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; + + virtuoso = virtuoso6; vsftpd = callPackage ../servers/ftp/vsftpd { }; @@ -6784,8 +6802,6 @@ let module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; - mountall = callPackage ../os-specific/linux/mountall { }; - aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { inherit modules; @@ -6892,6 +6908,15 @@ let systemd = callPackage ../os-specific/linux/systemd { }; + # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get + # LVM2 working in systemd. + systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { + name = p.name + "-with-lvm2"; + postInstall = p.postInstall + '' + cp ${pkgs.lvm2}/lib/systemd/system-generators/* $out/lib/systemd/system-generators + ''; + }); + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = callPackage ../os-specific/linux/sysvinit { @@ -7491,17 +7516,16 @@ let # use override to enable additional features libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null; - gtk = if stdenv.isDarwin then null else gtk; gconf = null; librsvg = null; alsaLib = null; imagemagick = null; texinfo = texinfo5; - # use gccApple on darwin to deal with: unexec: 'my_edata is not in section - # __data' + # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in + # section __data' stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple + then clangStdenv else stdenv; }; @@ -7673,6 +7697,8 @@ let inherit (gnome) libgnome libgnomeui vte; }; + gtimelog = pythonPackages.gtimelog; + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -8508,6 +8534,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + st = callPackage ../applications/misc/st { conf = config.st.conf or null; }; @@ -9534,6 +9562,8 @@ let pal2nal = callPackage ../applications/science/biology/pal2nal { }; + plink = callPackage ../applications/science/biology/plink/default.nix { }; + ### SCIENCE/MATH @@ -9559,6 +9589,7 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + mathematica = callPackage ../applications/science/math/mathematica { }; ### SCIENCE/MOLECULAR-DYNAMICS @@ -9825,6 +9856,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nix-repl = callPackage ../tools/package-management/nix-repl { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 41be5715a67..869a1585919 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -137,17 +137,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x caseInsensitive = self.caseInsensitive_1_1; cgi = self.cgi_3001_1_7_5; fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; - GLURaw = self.GLURaw_1_3_0_0; + GLUT = self.GLUT_2_5_0_1; + GLURaw = self.GLURaw_1_4_0_0; haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_2_0_10; + hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; HTTP = self.HTTP_4000_2_8; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_1_2; OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; + OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_3; parsec = self.parsec_3_1_3; QuickCheck = self.QuickCheck_2_6; @@ -165,9 +165,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_1; - alex = self.alex_3_0_5; + alex = self.alex_3_1_0; haddock = self.haddock_2_13_2; - happy = self.happy_1_18_11; + happy = self.happy_1_19_0; primitive = self.primitive_0_5_0_1; # semi-official, but specified }; @@ -515,12 +515,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x aeson = callPackage ../development/libraries/haskell/aeson {}; + aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; + alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {}; + amqp = callPackage ../development/libraries/haskell/amqp {}; + appar = callPackage ../development/libraries/haskell/appar {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -644,7 +648,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix { + Cabal_1_18_1 = callPackage ../development/libraries/haskell/Cabal/1.18.1.nix { cabal = self.cabal.override { Cabal = null; }; deepseq = self.deepseq_1_3_0_1; }; @@ -819,6 +823,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; + dataPprint = callPackage ../development/libraries/haskell/data-pprint {}; + dataReify = callPackage ../development/libraries/haskell/data-reify {}; dateCache = callPackage ../development/libraries/haskell/date-cache {}; @@ -920,6 +926,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x enumerator = callPackage ../development/libraries/haskell/enumerator {}; + enummapset = callPackage ../development/libraries/haskell/enummapset {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; erf = callPackage ../development/libraries/haskell/erf {}; @@ -928,6 +936,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x either = callPackage ../development/libraries/haskell/either {}; + esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; @@ -1055,7 +1065,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {}; - GLURaw = self.GLURaw_1_3_0_0; + GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix {}; + GLURaw = self.GLURaw_1_4_0_0; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -1069,7 +1080,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { OpenGL = self.OpenGL_2_8_0_0; }; - GLUT = self.GLUT_2_4_0_0; + GLUT_2_5_0_1 = callPackage ../development/libraries/haskell/GLUT/2.5.0.1.nix { + OpenGL = self.OpenGL_2_9_0_0; + }; + GLUT = self.GLUT_2_5_0_1; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; @@ -1107,8 +1121,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {}; - hashable = self.hashable_1_2_0_10; + hashable_1_2_1_0 = callPackage ../development/libraries/haskell/hashable/1.2.1.0.nix {}; + hashable = self.hashable_1_2_1_0; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; @@ -1226,6 +1240,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsemail = callPackage ../development/libraries/haskell/hsemail {}; + hslua = callPackage ../development/libraries/haskell/hslua {}; + HSH = callPackage ../development/libraries/haskell/HSH {}; HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; @@ -1325,6 +1341,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; + keys = callPackage ../development/libraries/haskell/keys {}; + knob = callPackage ../development/libraries/haskell/knob {}; languageC = callPackage ../development/libraries/haskell/language-c {}; @@ -1371,13 +1389,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x List = callPackage ../development/libraries/haskell/List {}; + listTries = callPackage ../development/libraries/haskell/list-tries {}; + ListLike = callPackage ../development/libraries/haskell/ListLike {}; ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { + llvmGeneral_3_3_5 = callPackage ../development/libraries/haskell/llvm-general/3.3.5.nix { llvmConfig = pkgs.llvm; }; + llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix { + llvmConfig = pkgs.llvm; + }; + llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; @@ -1438,8 +1462,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x 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_4_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.4.nix {}; - monadPar = self.monadPar_0_3_4_4; + monadPar_0_3_4_5 = callPackage ../development/libraries/haskell/monad-par/0.3.4.5.nix {}; + monadPar = self.monadPar_0_3_4_5; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; @@ -1564,10 +1588,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL = self.OpenGL_2_8_0_0; + OpenGL_2_9_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.0.0.nix {}; + OpenGL = self.OpenGL_2_9_0_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; + OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; + OpenGLRaw = self.OpenGLRaw_1_4_0_0; operational = callPackage ../development/libraries/haskell/operational {}; @@ -1577,6 +1603,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pandoc = callPackage ../development/libraries/haskell/pandoc {}; + pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; + pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pango = callPackage ../development/libraries/haskell/pango { @@ -1635,6 +1663,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {}; + pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {}; + pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {}; @@ -1792,6 +1822,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x resourcet = callPackage ../development/libraries/haskell/resourcet {}; + rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {}; + rosezipper = callPackage ../development/libraries/haskell/rosezipper {}; RSA = callPackage ../development/libraries/haskell/RSA {}; @@ -1836,6 +1868,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; @@ -1862,6 +1896,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x strict = callPackage ../development/libraries/haskell/strict {}; + stringable = callPackage ../development/libraries/haskell/stringable {}; + stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; stringprep = callPackage ../development/libraries/haskell/stringprep {}; @@ -2307,7 +2343,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; - alex = self.alex_3_0_5; + alex_3_1_0 = callPackage ../development/tools/parsing/alex/3.1.0.nix {}; + alex = self.alex_3_1_0; alexMeta = callPackage ../development/tools/haskell/alex-meta {}; @@ -2337,7 +2374,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; - happy = self.happy_1_18_11; + happy_1_19_0 = callPackage ../development/tools/parsing/happy/1.19.0.nix {}; + happy = self.happy_1_19_0; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; @@ -2367,7 +2405,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x darcs = callPackage ../applications/version-management/darcs {}; - idris_plain = callPackage ../development/compilers/idris {}; + idris_plain = callPackage ../development/compilers/idris { + llvmGeneral = self.llvmGeneral_3_3_5; + }; idris = callPackage ../development/compilers/idris/wrapper.nix {}; @@ -2400,7 +2440,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix { - Cabal = self.Cabal_1_18_0; + Cabal = self.Cabal_1_18_1; }; cabalInstall = self.cabalInstall_1_18_0; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 15c01748a44..3aa30145687 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2,33 +2,33 @@ { full."CSSselect"."0.x" = lib.makeOverridable self.buildNodePackage { - name = "CSSselect-0.3.5"; + name = "CSSselect-0.3.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.5.tgz"; - sha1 = "b85cae765678432aa54be73c140e3d4de78938a1"; + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.10.tgz"; + sha1 = "f139d09a1ec1e1104f717c1661d44e0bccd597d1"; }) ]; buildInputs = (self.nativeDeps."CSSselect"."0.x" or []); deps = [ - self.full."CSSwhat"."0.3" + self.full."CSSwhat"."0.4" self.full."domutils"."1" ]; peerDependencies = [ ]; passthru.names = [ "CSSselect" ]; }; - full."CSSwhat"."0.3" = lib.makeOverridable self.buildNodePackage { - name = "CSSwhat-0.3.0"; + full."CSSwhat"."0.4" = lib.makeOverridable self.buildNodePackage { + name = "CSSwhat-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.3.0.tgz"; - sha1 = "44e93c6a50dab70f59575a539cb09f4016e188ae"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.0.tgz"; + sha1 = "563bf7a0ba373e28271ff147e5e893b67e4c4bac"; }) ]; buildInputs = - (self.nativeDeps."CSSwhat"."0.3" or []); + (self.nativeDeps."CSSwhat"."0.4" or []); deps = [ ]; peerDependencies = [ @@ -165,40 +165,6 @@ passthru.names = [ "almond" ]; }; "almond" = self.full."almond"."*"; - full."ambi"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "ambi-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ambi/-/ambi-2.0.0.tgz"; - sha1 = "42c2bf98e8d101aa4da28a812678a5dbe36ada66"; - }) - ]; - buildInputs = - (self.nativeDeps."ambi"."~2.0.0" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ambi" ]; - }; - full."ambi"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ambi-2.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ambi/-/ambi-2.1.1.tgz"; - sha1 = "254ea79bf4203ed74a7038632e176e64640bb91d"; - }) - ]; - buildInputs = - (self.nativeDeps."ambi"."~2.1.0" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ambi" ]; - }; full."amdefine"."*" = lib.makeOverridable self.buildNodePackage { name = "amdefine-0.0.8"; src = [ @@ -644,11 +610,11 @@ passthru.names = [ "async" ]; }; full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.5.1"; + name = "aws-sdk-1.6.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz"; - sha1 = "5927d9539c9c82116501aed0747a2073375dfacd"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz"; + sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed"; }) ]; buildInputs = @@ -663,11 +629,11 @@ }; "aws-sdk" = self.full."aws-sdk"."*"; full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.5.1"; + name = "aws-sdk-1.6.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz"; - sha1 = "5927d9539c9c82116501aed0747a2073375dfacd"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz"; + sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed"; }) ]; buildInputs = @@ -746,28 +712,6 @@ ]; passthru.names = [ "backoff" ]; }; - full."bal-util"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bal-util-2.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bal-util/-/bal-util-2.0.5.tgz"; - sha1 = "b5a3b78e520b17892dfa051d2a819e8a48455b9c"; - }) - ]; - buildInputs = - (self.nativeDeps."bal-util"."~2.0.0" or []); - deps = [ - self.full."ambi"."~2.0.0" - self.full."eachr"."~2.0.2" - self.full."extendr"."~2.0.1" - self.full."safefs"."~3.0.1" - self.full."taskgroup"."~3.1.1" - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bal-util" ]; - }; full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "base64id-0.1.0"; src = [ @@ -785,11 +729,11 @@ passthru.names = [ "base64id" ]; }; full."bcrypt"."*" = lib.makeOverridable self.buildNodePackage { - name = "bcrypt-0.7.6"; + name = "bcrypt-0.7.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.6.tgz"; - sha1 = "97eae4472baf2352699f5fd1662e77e63d0cd0aa"; + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; + sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; }) ]; buildInputs = @@ -886,6 +830,22 @@ ]; passthru.names = [ "block-stream" ]; }; + full."blueimp-md5"."~1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "blueimp-md5-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.0.3.tgz"; + sha1 = "932f8fa56652701823cee46cecc0477c88333ab2"; + }) + ]; + buildInputs = + (self.nativeDeps."blueimp-md5"."~1.0.3" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "blueimp-md5" ]; + }; full."boom"."0.3.x" = lib.makeOverridable self.buildNodePackage { name = "boom-0.3.8"; src = [ @@ -1648,18 +1608,18 @@ passthru.names = [ "cli" ]; }; full."cli-color"."~0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "cli-color-0.2.2"; + name = "cli-color-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.2.tgz"; - sha1 = "2220dcbd5e8410e15c435946b6c8daa22e076741"; + url = "http://registry.npmjs.org/cli-color/-/cli-color-0.2.3.tgz"; + sha1 = "0a25ceae5a6a1602be7f77d28563c36700274e88"; }) ]; buildInputs = (self.nativeDeps."cli-color"."~0.2.2" or []); deps = [ - self.full."es5-ext"."~0.9.1" - self.full."memoizee"."0.2.x" + self.full."es5-ext"."~0.9.2" + self.full."memoizee"."~0.2.5" ]; peerDependencies = [ ]; @@ -1882,6 +1842,22 @@ ]; passthru.names = [ "colors" ]; }; + full."colors"."0.5.x" = lib.makeOverridable self.buildNodePackage { + name = "colors-0.5.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + }) + ]; + buildInputs = + (self.nativeDeps."colors"."0.5.x" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "colors" ]; + }; full."colors"."0.6.0-1" = lib.makeOverridable self.buildNodePackage { name = "colors-0.6.0-1"; src = [ @@ -2212,19 +2188,18 @@ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.8.8"; + full."connect"."2.9.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; - sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; + sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; }) ]; buildInputs = - (self.nativeDeps."connect"."2.8.8" or []); + (self.nativeDeps."connect"."2.9.0" or []); deps = [ self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" self.full."cookie-signature"."1.0.1" self.full."buffer-crc32"."0.2.1" self.full."cookie"."0.1.0" @@ -2235,24 +2210,24 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" + self.full."multiparty"."2.1.8" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; full."connect"."~2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.8.8"; + name = "connect-2.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; - sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; + sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; }) ]; buildInputs = (self.nativeDeps."connect"."~2" or []); deps = [ self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" self.full."cookie-signature"."1.0.1" self.full."buffer-crc32"."0.2.1" self.full."cookie"."0.1.0" @@ -2263,6 +2238,7 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" + self.full."multiparty"."2.1.8" ]; peerDependencies = [ ]; @@ -2543,11 +2519,11 @@ passthru.names = [ "couch-login" ]; }; full."coveralls"."*" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.2.0"; + name = "coveralls-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.2.0.tgz"; - sha1 = "9bfe310447895b5665fee55bfee0743cc47fa4e4"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.3.0.tgz"; + sha1 = "9eda569c115214acb7f58ca3a28401e866485144"; }) ]; buildInputs = @@ -2563,6 +2539,23 @@ passthru.names = [ "coveralls" ]; }; "coveralls" = self.full."coveralls"."*"; + full."crossroads"."~0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "crossroads-0.12.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; + sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e"; + }) + ]; + buildInputs = + (self.nativeDeps."crossroads"."~0.12.0" or []); + deps = [ + self.full."signals"."<2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "crossroads" ]; + }; full."cryptiles"."0.1.x" = lib.makeOverridable self.buildNodePackage { name = "cryptiles-0.1.3"; src = [ @@ -2919,16 +2912,16 @@ ]; passthru.names = [ "di" ]; }; - full."diff"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.2"; + full."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz"; - sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = - (self.nativeDeps."diff"."1.0.2" or []); + (self.nativeDeps."diff"."1.0.7" or []); deps = [ ]; peerDependencies = [ @@ -2936,11 +2929,11 @@ passthru.names = [ "diff" ]; }; full."diff"."~1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.6"; + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz"; - sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = @@ -2952,11 +2945,11 @@ passthru.names = [ "diff" ]; }; full."diff"."~1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.6"; + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz"; - sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = @@ -3017,11 +3010,11 @@ passthru.names = [ "domhandler" ]; }; full."domutils"."1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.1.4"; + name = "domutils-1.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz"; - sha1 = "14b774276187066c76f80141f7eac47a22f77248"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.1.5.tgz"; + sha1 = "6d3f86d1444993951afdd228a46f73cb2f688328"; }) ]; buildInputs = @@ -3051,11 +3044,11 @@ passthru.names = [ "domutils" ]; }; full."domutils"."1.1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.1.4"; + name = "domutils-1.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz"; - sha1 = "14b774276187066c76f80141f7eac47a22f77248"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.1.5.tgz"; + sha1 = "6d3f86d1444993951afdd228a46f73cb2f688328"; }) ]; buildInputs = @@ -3083,23 +3076,6 @@ ]; passthru.names = [ "dtrace-provider" ]; }; - full."eachr"."~2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "eachr-2.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eachr/-/eachr-2.0.2.tgz"; - sha1 = "f1100c5bb1619f6ee86a0661fe604e3a9ad7559d"; - }) - ]; - buildInputs = - (self.nativeDeps."eachr"."~2.0.2" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "eachr" ]; - }; full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "editor-0.0.4"; src = [ @@ -3181,22 +3157,6 @@ ]; passthru.names = [ "entities" ]; }; - full."es5-ext"."~0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "es5-ext-0.9.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.9.2.tgz"; - sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a"; - }) - ]; - buildInputs = - (self.nativeDeps."es5-ext"."~0.9.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "es5-ext" ]; - }; full."es5-ext"."~0.9.2" = lib.makeOverridable self.buildNodePackage { name = "es5-ext-0.9.2"; src = [ @@ -3428,17 +3388,17 @@ passthru.names = [ "events.node" ]; }; full."express"."*" = lib.makeOverridable self.buildNodePackage { - name = "express-3.3.8"; + name = "express-3.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz"; - sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd"; + url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; + sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; }) ]; buildInputs = (self.nativeDeps."express"."*" or []); deps = [ - self.full."connect"."2.8.8" + self.full."connect"."2.9.0" self.full."commander"."1.2.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" @@ -3510,17 +3470,17 @@ passthru.names = [ "express" ]; }; full."express"."3.x" = lib.makeOverridable self.buildNodePackage { - name = "express-3.3.8"; + name = "express-3.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz"; - sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd"; + url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; + sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; }) ]; buildInputs = (self.nativeDeps."express"."3.x" or []); deps = [ - self.full."connect"."2.8.8" + self.full."connect"."2.9.0" self.full."commander"."1.2.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" @@ -3600,11 +3560,11 @@ passthru.names = [ "express-partials" ]; }; full."extend"."*" = lib.makeOverridable self.buildNodePackage { - name = "extend-1.2.0"; + name = "extend-1.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.2.0.tgz"; - sha1 = "da1a81af472a5a3e7fd607f85cdeaf69c169294d"; + url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }) ]; buildInputs = @@ -3616,23 +3576,6 @@ passthru.names = [ "extend" ]; }; "extend" = self.full."extend"."*"; - full."extendr"."~2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "extendr-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/extendr/-/extendr-2.0.1.tgz"; - sha1 = "d8ab375fcbb833e4ba2cd228540f04e4aa07de90"; - }) - ]; - buildInputs = - (self.nativeDeps."extendr"."~2.0.1" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "extendr" ]; - }; full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "extsprintf-1.0.0"; src = [ @@ -3698,17 +3641,17 @@ passthru.names = [ "eyes" ]; }; full."faye-websocket"."*" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.6.1"; + name = "faye-websocket-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.6.1.tgz"; - sha1 = "43a54b2ab807761d7ec335d12f48eb69ec4ab61c"; + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; }) ]; buildInputs = (self.nativeDeps."faye-websocket"."*" or []); deps = [ - self.full."websocket-driver".">=0.2.0" + self.full."websocket-driver".">=0.3.0" ]; peerDependencies = [ ]; @@ -4376,11 +4319,11 @@ passthru.names = [ "generator-mocha" ]; }; full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.1"; + name = "generator-webapp-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.1.tgz"; - sha1 = "b2d3f1b3ea83fbbc0043c81fdf82a3fe725b6001"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.2.tgz"; + sha1 = "41a856064a00ad952f9cbca79b176da9ab0aa969"; }) ]; buildInputs = @@ -4446,20 +4389,20 @@ ]; passthru.names = [ "glob" ]; }; - full."glob"."3.2.1" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.1"; + full."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { + name = "glob-3.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.1.tgz"; - sha1 = "57af70ec73ba2323bfe3f29a067765db64c5d758"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; }) ]; buildInputs = - (self.nativeDeps."glob"."3.2.1" or []); + (self.nativeDeps."glob"."3.2.3" or []); deps = [ self.full."minimatch"."~0.2.11" - self.full."graceful-fs"."~1.2.0" - self.full."inherits"."1" + self.full."graceful-fs"."~2.0.0" + self.full."inherits"."2" ]; peerDependencies = [ ]; @@ -4591,11 +4534,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -4687,11 +4630,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -4703,11 +4646,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -4783,6 +4726,38 @@ ]; passthru.names = [ "grunt" ]; }; + full."grunt"."~0.4" = lib.makeOverridable self.buildNodePackage { + name = "grunt-0.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz"; + sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729"; + }) + ]; + buildInputs = + (self.nativeDeps."grunt"."~0.4" or []); + deps = [ + self.full."async"."~0.1.22" + self.full."coffee-script"."~1.3.3" + self.full."colors"."~0.6.0-1" + self.full."dateformat"."1.0.2-1.2.3" + self.full."eventemitter2"."~0.4.9" + self.full."findup-sync"."~0.1.0" + self.full."glob"."~3.1.21" + self.full."hooker"."~0.2.3" + self.full."iconv-lite"."~0.2.5" + self.full."minimatch"."~0.2.6" + self.full."nopt"."~1.0.10" + self.full."rimraf"."~2.0.2" + self.full."lodash"."~0.9.0" + self.full."underscore.string"."~2.2.0rc" + self.full."which"."~1.0.5" + self.full."js-yaml"."~2.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "grunt" ]; + }; full."grunt"."~0.4.0" = lib.makeOverridable self.buildNodePackage { name = "grunt-0.4.1"; src = [ @@ -5006,6 +4981,25 @@ ]; passthru.names = [ "grunt-lib-contrib" ]; }; + full."grunt-sed"."*" = lib.makeOverridable self.buildNodePackage { + name = "grunt-sed-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz"; + sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82"; + }) + ]; + buildInputs = + (self.nativeDeps."grunt-sed"."*" or []); + deps = [ + self.full."replace"."~0.2.4" + ]; + peerDependencies = [ + self.full."grunt"."~0.4" + ]; + passthru.names = [ "grunt-sed" ]; + }; + "grunt-sed" = self.full."grunt-sed"."*"; full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = lib.makeOverridable self.buildNodePackage { name = "guifi-earth-0.2.1"; src = [ @@ -5098,6 +5092,23 @@ ]; passthru.names = [ "has-color" ]; }; + full."hasher"."~1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "hasher-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hasher/-/hasher-1.1.4.tgz"; + sha1 = "cb0a6c480bfa402adfbd4208452c64c684da9490"; + }) + ]; + buildInputs = + (self.nativeDeps."hasher"."~1.1.4" or []); + deps = [ + self.full."signals".">0.7 <2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hasher" ]; + }; full."hat"."*" = lib.makeOverridable self.buildNodePackage { name = "hat-0.0.3"; src = [ @@ -5477,11 +5488,11 @@ passthru.names = [ "i" ]; }; full."i18next"."*" = lib.makeOverridable self.buildNodePackage { - name = "i18next-1.6.8"; + name = "i18next-1.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz"; - sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.0.tgz"; + sha1 = "4f2ac1808a5a8165c8110a5701172f4fb7056515"; }) ]; buildInputs = @@ -5731,11 +5742,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.2"; + name = "inquirer-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz"; - sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz"; + sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896"; }) ]; buildInputs = @@ -5751,11 +5762,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.2"; + name = "inquirer-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz"; - sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz"; + sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896"; }) ]; buildInputs = @@ -5809,16 +5820,17 @@ passthru.names = [ "intersect" ]; }; full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage { - name = "ironhorse-0.0.7"; + name = "ironhorse-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.7.tgz"; - sha1 = "5217f2cced8caffe15df95033492f8582e44e5ef"; + url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.8.tgz"; + sha1 = "b0c9c0908e6e22f7a48001be48533f12227c7980"; }) ]; buildInputs = (self.nativeDeps."ironhorse"."*" or []); deps = [ + self.full."underscore"."~1.5.2" self.full."winston"."*" self.full."nconf"."*" self.full."fs-walk"."*" @@ -5873,11 +5885,11 @@ passthru.names = [ "isbinaryfile" ]; }; full."istanbul"."~0.1.41" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.1.43"; + name = "istanbul-0.1.44"; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.43.tgz"; - sha1 = "8dfd86802b345209f366d29093330ace17f1539d"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.44.tgz"; + sha1 = "7ea1d55e34234e7b7d8f2f61cceb29b59439d983"; }) ]; buildInputs = @@ -5893,7 +5905,7 @@ self.full."async"."0.2.x" self.full."abbrev"."1.0.x" self.full."wordwrap"."0.0.x" - self.full."resolve"."0.4.x" + self.full."resolve"."0.5.x" ]; peerDependencies = [ ]; @@ -5982,6 +5994,25 @@ passthru.names = [ "jayschema" ]; }; "jayschema" = self.full."jayschema"."*"; + full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml"."*" or []); + deps = [ + self.full."argparse"."~ 0.1.11" + self.full."esprima"."~ 1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; + "js-yaml" = self.full."js-yaml"."*"; full."js-yaml"."0.3.x" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-0.3.7"; src = [ @@ -7068,6 +7099,22 @@ ]; passthru.names = [ "lru-cache" ]; }; + full."lru-cache"."~2.3.1" = lib.makeOverridable self.buildNodePackage { + name = "lru-cache-2.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-cache"."~2.3.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; full."mailcomposer".">= 0.1.27" = lib.makeOverridable self.buildNodePackage { name = "mailcomposer-0.2.1"; src = [ @@ -7104,7 +7151,7 @@ ]; passthru.names = [ "match-stream" ]; }; - full."memoizee"."0.2.x" = lib.makeOverridable self.buildNodePackage { + full."memoizee"."~0.2.5" = lib.makeOverridable self.buildNodePackage { name = "memoizee-0.2.5"; src = [ (fetchurl { @@ -7113,7 +7160,7 @@ }) ]; buildInputs = - (self.nativeDeps."memoizee"."0.2.x" or []); + (self.nativeDeps."memoizee"."~0.2.5" or []); deps = [ self.full."es5-ext"."~0.9.2" self.full."event-emitter"."~0.2.2" @@ -7496,12 +7543,30 @@ ]; passthru.names = [ "minimatch" ]; }; - full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.2"; + full."minimatch"."~0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-0.2.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.2.tgz"; - sha1 = "3297e0500be195b8fcb56668c45b925bc9bca7ab"; + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch"."~0.2.9" or []); + deps = [ + self.full."lru-cache"."2" + self.full."sigmund"."~1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; + full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "minimist-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.4.tgz"; + sha1 = "db41b1028484927a9425765b954075f5082f5048"; }) ]; buildInputs = @@ -7690,11 +7755,11 @@ passthru.names = [ "mkdirp" ]; }; full."mocha"."*" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.12.1"; + name = "mocha-1.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.12.1.tgz"; - sha1 = "5212e3f5914eef8c0888ae344e6a7dd2e5ac294a"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz"; + sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c"; }) ]; buildInputs = @@ -7703,10 +7768,10 @@ self.full."commander"."0.6.1" self.full."growl"."1.7.x" self.full."jade"."0.26.3" - self.full."diff"."1.0.2" + self.full."diff"."1.0.7" self.full."debug"."*" self.full."mkdirp"."0.3.5" - self.full."glob"."3.2.1" + self.full."glob"."3.2.3" ]; peerDependencies = [ ]; @@ -7865,11 +7930,11 @@ passthru.names = [ "mongoose" ]; }; full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.6.18"; + name = "mongoose-3.6.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.18.tgz"; - sha1 = "cdf41325433ea795a1b3632ef1d7591db487d224"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.19.tgz"; + sha1 = "87eec5e7dd78ffaf7db6a0b6f2dc4c7b7d76dfa8"; }) ]; buildInputs = @@ -8057,6 +8122,24 @@ ]; passthru.names = [ "msgpack" ]; }; + full."multiparty"."2.1.8" = lib.makeOverridable self.buildNodePackage { + name = "multiparty-2.1.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/multiparty/-/multiparty-2.1.8.tgz"; + sha1 = "35a31834323578ee65f5d870568097914739cf4e"; + }) + ]; + buildInputs = + (self.nativeDeps."multiparty"."2.1.8" or []); + deps = [ + self.full."readable-stream"."~1.0.2" + self.full."stream-counter"."~0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "multiparty" ]; + }; full."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "muri-0.3.1"; src = [ @@ -8295,11 +8378,11 @@ passthru.names = [ "nib" ]; }; full."nijs"."*" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.10"; + name = "nijs-0.0.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.10.tgz"; - sha1 = "79d09c5c9a2f1f3e96708c9dc6b4547b89cf8177"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.11.tgz"; + sha1 = "386894330e53135a84e1c42c317b0384c0f48b7a"; }) ]; buildInputs = @@ -8330,11 +8413,11 @@ }; "node-expat" = self.full."node-expat"."*"; full."node-gyp"."*" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = @@ -8359,16 +8442,16 @@ passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.full."node-gyp"."*"; - full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + full."node-gyp"."~0.10.10" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = - (self.nativeDeps."node-gyp"."~0.10.2" or []); + (self.nativeDeps."node-gyp"."~0.10.10" or []); deps = [ self.full."glob"."3" self.full."graceful-fs"."2" @@ -8388,16 +8471,16 @@ ]; passthru.names = [ "node-gyp" ]; }; - full."node-gyp"."~0.10.9" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = - (self.nativeDeps."node-gyp"."~0.10.9" or []); + (self.nativeDeps."node-gyp"."~0.10.2" or []); deps = [ self.full."glob"."3" self.full."graceful-fs"."2" @@ -8581,6 +8664,24 @@ passthru.names = [ "nodemon" ]; }; "nodemon" = self.full."nodemon"."*"; + full."nomnom"."1.6.x" = lib.makeOverridable self.buildNodePackage { + name = "nomnom-1.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.1.tgz"; + sha1 = "bfed4506642d81278738e891c557e80694c1e0c9"; + }) + ]; + buildInputs = + (self.nativeDeps."nomnom"."1.6.x" or []); + deps = [ + self.full."colors"."0.5.x" + self.full."underscore"."~1.4.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "nomnom" ]; + }; full."nopt"."2" = lib.makeOverridable self.buildNodePackage { name = "nopt-2.1.2"; src = [ @@ -8702,11 +8803,11 @@ passthru.names = [ "normalize-package-data" ]; }; full."npm"."*" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.9"; + name = "npm-1.3.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.9.tgz"; - sha1 = "dbf815e1661845046e82105a705f8df1735bb1ee"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.11.tgz"; + sha1 = "4bf7f005fe1038c4fe9207603b961c97bd0ba5a3"; }) ]; buildInputs = @@ -8714,21 +8815,21 @@ deps = [ self.full."semver"."~2.1.0" self.full."ini"."~1.1.0" - self.full."slide"."~1.1.4" + self.full."slide"."~1.1.5" self.full."abbrev"."~1.0.4" self.full."graceful-fs"."~2.0.0" self.full."minimatch"."~0.2.12" self.full."nopt"."~2.1.2" self.full."rimraf"."~2.2.0" - self.full."request"."~2.25.0" + self.full."request"."~2.27.0" self.full."which"."1" self.full."tar"."~0.1.18" self.full."fstream"."~0.1.23" self.full."block-stream"."0.0.7" self.full."mkdirp"."~0.3.3" self.full."read"."~1.0.4" - self.full."lru-cache"."~2.3.0" - self.full."node-gyp"."~0.10.9" + self.full."lru-cache"."~2.3.1" + self.full."node-gyp"."~0.10.10" self.full."fstream-npm"."~0.1.3" self.full."uid-number"."0" self.full."archy"."0" @@ -8736,7 +8837,7 @@ self.full."npmlog"."0.0.4" self.full."ansi"."~0.1.2" self.full."npm-registry-client"."~0.2.28" - self.full."read-package-json"."~1.1.0" + self.full."read-package-json"."~1.1.3" self.full."read-installed"."~0.2.2" self.full."glob"."~3.2.6" self.full."init-package-json"."0.0.11" @@ -9675,11 +9776,11 @@ passthru.names = [ "pause" ]; }; full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.1-9"; + name = "phantomjs-1.9.2-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.1-9.tgz"; - sha1 = "f18671f4bcbbb5d5fc4a20ddcd6800ab0edc4453"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-0.tgz"; + sha1 = "36f265d99f8e5b40b1f3c92ddf94cbae66db7ebc"; }) ]; buildInputs = @@ -9940,11 +10041,11 @@ passthru.names = [ "pullstream" ]; }; full."q"."0.9.x" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9956,11 +10057,11 @@ passthru.names = [ "q" ]; }; full."q".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9972,11 +10073,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9988,11 +10089,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -10004,11 +10105,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9.6" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -10327,6 +10428,26 @@ ]; passthru.names = [ "read-package-json" ]; }; + full."read-package-json"."~1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "read-package-json-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz"; + sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391"; + }) + ]; + buildInputs = + (self.nativeDeps."read-package-json"."~1.1.3" or []); + deps = [ + self.full."glob"."~3.2.1" + self.full."lru-cache"."2" + self.full."normalize-package-data"."~0.2" + self.full."graceful-fs"."2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "read-package-json" ]; + }; full."readable-stream"."1.0" = lib.makeOverridable self.buildNodePackage { name = "readable-stream-1.0.17"; src = [ @@ -10509,6 +10630,25 @@ ]; passthru.names = [ "regexp-clone" ]; }; + full."replace"."~0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "replace-0.2.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/replace/-/replace-0.2.7.tgz"; + sha1 = "e22d08a9e2e6764337bb530166a4dd89c2558fda"; + }) + ]; + buildInputs = + (self.nativeDeps."replace"."~0.2.4" or []); + deps = [ + self.full."nomnom"."1.6.x" + self.full."colors"."0.5.x" + self.full."minimatch"."~0.2.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "replace" ]; + }; full."request"."2" = lib.makeOverridable self.buildNodePackage { name = "request-2.27.0"; src = [ @@ -10908,16 +11048,16 @@ ]; passthru.names = [ "requirejs" ]; }; - full."resolve"."0.4.x" = lib.makeOverridable self.buildNodePackage { - name = "resolve-0.4.3"; + full."resolve"."0.5.x" = lib.makeOverridable self.buildNodePackage { + name = "resolve-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-0.4.3.tgz"; - sha1 = "dcadad202e7cacc2467e3a38800211f42f9c13df"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.5.0.tgz"; + sha1 = "e797504cd5a33ef1dbb9bdad252b6cbffa95b0b4"; }) ]; buildInputs = - (self.nativeDeps."resolve"."0.4.x" or []); + (self.nativeDeps."resolve"."0.5.x" or []); deps = [ ]; peerDependencies = [ @@ -11176,23 +11316,6 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.full."s3http"."*"; - full."safefs"."~3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "safefs-3.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/safefs/-/safefs-3.0.3.tgz"; - sha1 = "1d511e2945f0e7eccdd6bb12ec2e309abf13514e"; - }) - ]; - buildInputs = - (self.nativeDeps."safefs"."~3.0.1" or []); - deps = [ - self.full."taskgroup"."~3.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "safefs" ]; - }; full."sauce-connect-launcher"."~0.1.10" = lib.makeOverridable self.buildNodePackage { name = "sauce-connect-launcher-0.1.11"; src = [ @@ -11665,11 +11788,11 @@ passthru.names = [ "shelljs" ]; }; full."should"."*" = lib.makeOverridable self.buildNodePackage { - name = "should-1.2.2"; + name = "should-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-1.2.2.tgz"; - sha1 = "0f03f775066d9ea2632690c917b12824fcc1d582"; + url = "http://registry.npmjs.org/should/-/should-1.3.0.tgz"; + sha1 = "20b71a09b5ed16146b903022bd306ef332efe873"; }) ]; buildInputs = @@ -11697,12 +11820,60 @@ ]; passthru.names = [ "sigmund" ]; }; - full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.8"; + full."signals"."<2.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.8.tgz"; - sha1 = "64bea183c9d95211e17e21e228a20312661def09"; + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals"."<2.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."signals".">0.7 <2.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals".">0.7 <2.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."signals"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals"."~1.0.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.10.tgz"; + sha1 = "f395f4b118de45f82ac4fdae4bd88f12dc326f5d"; }) ]; buildInputs = @@ -11812,6 +11983,22 @@ ]; passthru.names = [ "slide" ]; }; + full."slide"."~1.1.5" = lib.makeOverridable self.buildNodePackage { + name = "slide-1.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; + sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; + }) + ]; + buildInputs = + (self.nativeDeps."slide"."~1.1.5" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "slide" ]; + }; full."smartdc"."*" = lib.makeOverridable self.buildNodePackage { name = "smartdc-7.0.0"; src = [ @@ -12318,11 +12505,11 @@ passthru.names = [ "superagent" ]; }; full."supertest"."*" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.7.1"; + name = "supertest-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.7.1.tgz"; - sha1 = "349a65a8bfb5207250658f71761279ad3a671d88"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.8.0.tgz"; + sha1 = "c8dd008358ed60175cfd4dfab0ab1af81d0dc55b"; }) ]; buildInputs = @@ -12482,53 +12669,19 @@ ]; passthru.names = [ "tar" ]; }; - full."taskgroup"."~3.1.1" = lib.makeOverridable self.buildNodePackage { - name = "taskgroup-3.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz"; - sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16"; - }) - ]; - buildInputs = - (self.nativeDeps."taskgroup"."~3.1.1" or []); - deps = [ - self.full."ambi"."~2.0.0" - self.full."eventemitter2"."~0.4.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "taskgroup" ]; - }; - full."taskgroup"."~3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "taskgroup-3.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.2.0.tgz"; - sha1 = "ac45e79852a080bd20716eae6d79931968d637d2"; - }) - ]; - buildInputs = - (self.nativeDeps."taskgroup"."~3.2.0" or []); - deps = [ - self.full."ambi"."~2.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "taskgroup" ]; - }; full."temp"."*" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.5.1"; + name = "temp-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz"; - sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df"; + url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; }) ]; buildInputs = (self.nativeDeps."temp"."*" or []); deps = [ self.full."rimraf"."~2.1.4" + self.full."osenv"."0.0.3" ]; peerDependencies = [ ]; @@ -12715,22 +12868,6 @@ ]; passthru.names = [ "tunnel-agent" ]; }; - full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "typechecker-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.1.tgz"; - sha1 = "e18e99be60762c01bde38ef02f9a067ed887c454"; - }) - ]; - buildInputs = - (self.nativeDeps."typechecker"."~2.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "typechecker" ]; - }; full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-1.2.5"; src = [ @@ -12873,11 +13010,11 @@ passthru.names = [ "uid2" ]; }; full."underscore"."*" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12922,11 +13059,11 @@ passthru.names = [ "underscore" ]; }; full."underscore".">=1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12938,11 +13075,11 @@ passthru.names = [ "underscore" ]; }; full."underscore".">=1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12985,6 +13122,38 @@ ]; passthru.names = [ "underscore" ]; }; + full."underscore"."~1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "underscore-1.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore"."~1.4.4" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; + full."underscore"."~1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "underscore-1.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore"."~1.5.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; full."underscore.string"."~2.2.0rc" = lib.makeOverridable self.buildNodePackage { name = "underscore.string-2.2.1"; src = [ @@ -13018,11 +13187,11 @@ passthru.names = [ "underscore.string" ]; }; full."ungit"."*" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.1.8"; + name = "ungit-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.1.8.tgz"; - sha1 = "9d6c45b3771d983bf011424f4cb284c1e79ef0c8"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.2.0.tgz"; + sha1 = "fa25b1bd4670a527823dd0912d6f2fa2f1dc6a06"; }) ]; buildInputs = @@ -13032,7 +13201,6 @@ self.full."superagent"."0.14.7" self.full."underscore"."1.4.4" self.full."temp"."0.5.0" - self.full."watchr"."2.4.3" self.full."socket.io"."0.9.16" self.full."moment"."2.0.0" self.full."async"."0.2.9" @@ -13047,6 +13215,10 @@ self.full."forever-monitor"."1.1.0" self.full."open"."0.0.4" self.full."optimist"."0.6.0" + self.full."crossroads"."~0.12.0" + self.full."signals"."~1.0.0" + self.full."hasher"."~1.1.4" + self.full."blueimp-md5"."~1.0.3" ]; peerDependencies = [ ]; @@ -13419,28 +13591,6 @@ ]; passthru.names = [ "watch" ]; }; - full."watchr"."2.4.3" = lib.makeOverridable self.buildNodePackage { - name = "watchr-2.4.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/watchr/-/watchr-2.4.3.tgz"; - sha1 = "b7e32fc1cc7a730043a73b3fc6559ad2283af79e"; - }) - ]; - buildInputs = - (self.nativeDeps."watchr"."2.4.3" or []); - deps = [ - self.full."bal-util"."~2.0.0" - self.full."typechecker"."~2.0.1" - self.full."extendr"."~2.0.1" - self.full."eachr"."~2.0.2" - self.full."safefs"."~3.0.1" - self.full."taskgroup"."~3.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "watchr" ]; - }; full."wd"."~0.0.32" = lib.makeOverridable self.buildNodePackage { name = "wd-0.0.34"; src = [ @@ -13463,16 +13613,16 @@ ]; passthru.names = [ "wd" ]; }; - full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.2.2"; + full."websocket-driver".">=0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz"; - sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.0.tgz"; + sha1 = "497b258c508b987249ab9b6f79f0c21dd3467c64"; }) ]; buildInputs = - (self.nativeDeps."websocket-driver".">=0.2.0" or []); + (self.nativeDeps."websocket-driver".">=0.3.0" or []); deps = [ ]; peerDependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index d3dcbe665c5..3487f9a29de 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -84,6 +84,7 @@ , "grunt-contrib-cssmin" , "grunt-contrib-uglify" , "grunt-karma" +, "grunt-sed" , "karma" , "karma-mocha" , "karma-coverage" @@ -94,4 +95,5 @@ , "almond" , "lcov-result-merger" , "coveralls" +, "js-yaml" ] diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 870f5fa67b9..461dc0c1f6e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,6 +11,8 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn gnused; + inherit (stdenv.lib) maintainers; + inherit __overrides; # Helper functions for packages that use Module::Build to build. @@ -33,17 +35,15 @@ rec { # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; propagatedBuildInputs = [ FileNext ]; - meta = with stdenv.lib; { + meta = { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; license = "free"; # Artistic 2.0 maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; }; - # t/swamp/{0,perl-without-extension} are datafiles for the test - # t/ack-show-types.t, but the perl generic builder confuses them - # for scripts and purifies them, making the test fail. - preCheck = "sed -i '1s,.*,#!/usr/bin/perl -w,' t/swamp/0 t/swamp/perl-without-extension"; + # tests fails on nixos and hydra because of different purity issues + doCheck = false; }; AlgorithmAnnotate = buildPerlPackage { @@ -83,6 +83,10 @@ rec { sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; }; propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; aliased = buildPerlPackage rec { @@ -108,6 +112,10 @@ rec { url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz; sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; AnyEventRabbitMQ = buildPerlPackage { @@ -121,6 +129,8 @@ rec { meta = { description = "An asynchronous and multi channel Perl AMQP client"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -168,6 +178,8 @@ rec { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -289,6 +301,8 @@ rec { meta = { description = "Replace functions with ones that succeed or die with lexical scope"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -321,6 +335,8 @@ rec { meta = { description = "Wrap OP check callbacks"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -331,6 +347,10 @@ rec { sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs"; }; propagatedBuildInputs = [CarpClan]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; BKeywords = buildPerlPackage { @@ -392,6 +412,10 @@ rec { sha256 = "1aa2mjn5767b13063nnsrwcikrnbspby7j1c5q007bzaq0gcbcri"; }; propagatedBuildInputs = [ StringCRC32 ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CacheMemcachedFast = buildPerlPackage { @@ -403,6 +427,8 @@ rec { meta = { description = "Perl client for B, in C language"; license = "unknown"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -413,6 +439,10 @@ rec { sha256 = "1zykapgl9lxnlx79xfghzb26qimhry94xfxfyswwfhra1ywd9yyg"; }; propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; cam_pdf = buildPerlPackage rec { @@ -433,6 +463,10 @@ rec { }; propagatedBuildInputs = [HTMLTiny LWP]; buildInputs = [TestPod]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CaptureTiny = buildPerlPackage { @@ -518,6 +552,8 @@ rec { meta = { description = "HTTP Basic and Digest authentication"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -720,6 +756,8 @@ rec { meta = { description = "Flexible caching support for Catalyst."; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -734,6 +772,8 @@ rec { meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -769,6 +809,8 @@ rec { meta = { description = "Unicode aware Catalyst"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -941,6 +983,8 @@ rec { propagatedBuildInputs = [ TestException ]; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1002,6 +1046,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1407,6 +1453,10 @@ rec { sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; }; propagatedBuildInputs = [ SymbolUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; constantdefer = pkgs.perlPackages.constant-defer; @@ -1445,6 +1495,10 @@ rec { sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CPANChanges = buildPerlPackage { @@ -1586,6 +1640,8 @@ rec { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1678,6 +1734,8 @@ rec { meta = { description = "Polymorphic data cloning"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1837,6 +1895,8 @@ rec { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; license = "apache_2_0"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1858,6 +1918,10 @@ rec { sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy"; }; propagatedBuildInputs = [CarpClan BitVector]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; DateManip = buildPerlPackage { @@ -1966,6 +2030,8 @@ rec { meta = { description = "Parses ISO8601 formats"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1993,6 +2059,8 @@ rec { meta = { description = "Parse and format PostgreSQL dates and times"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2235,6 +2303,8 @@ rec { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2247,6 +2317,8 @@ rec { propagatedBuildInputs = [ DBI ]; meta = { description = "Very complete easy-to-use OO interface to DBI"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2258,6 +2330,8 @@ rec { }; meta = { description = "Find memory cycles in objects"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2272,6 +2346,8 @@ rec { meta = { description = "Adding keywords to perl, in perl"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2317,6 +2393,10 @@ rec { sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n"; }; propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; DevelStackTrace = buildPerlPackage { @@ -2385,6 +2465,8 @@ rec { meta = { description = "Keyed-Hashing for Message Authentication"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2405,6 +2487,8 @@ rec { propagatedBuildInputs = [ LWP ]; meta = { description = "Perl extension for getting MD5 sums for files and urls."; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2795,6 +2879,8 @@ rec { meta = { description = "Generate world unique message-ids"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2807,6 +2893,8 @@ rec { propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2819,6 +2907,8 @@ rec { meta = { description = "Parse a MIME Content-Type Header"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2830,6 +2920,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2901,6 +2993,10 @@ rec { url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Error = buildPerlPackage rec { @@ -2933,6 +3029,10 @@ rec { sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; }; buildInputs = [ TestUnitLite ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExceptionClass = buildPerlPackage rec { @@ -2952,6 +3052,10 @@ rec { }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExceptionWarning = buildPerlPackage { @@ -2962,6 +3066,10 @@ rec { }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExporterDeclare = buildPerlModule { @@ -2976,6 +3084,8 @@ rec { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3028,6 +3138,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3142,6 +3254,10 @@ rec { }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ExceptionDied ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; FCGI = buildPerlPackage rec { @@ -3163,6 +3279,8 @@ rec { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3300,6 +3418,10 @@ rec { url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.21.tar.gz; sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Filepushd = buildPerlPackage { @@ -3312,6 +3434,8 @@ rec { homepage = https://metacpan.org/release/File-pushd; description = "Change directory temporarily for a limited scope"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3334,6 +3458,8 @@ rec { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3359,6 +3485,8 @@ rec { meta = { description = "Install shared files"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3563,6 +3691,10 @@ rec { url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz; sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HashFlatten = buildPerlPackage rec { @@ -3619,6 +3751,10 @@ rec { sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47"; }; propagatedBuildInputs = [ Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HeapFibonacci = buildPerlPackage { @@ -3627,6 +3763,10 @@ rec { url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HookLexWrap = buildPerlPackage rec { @@ -3692,6 +3832,8 @@ rec { meta = { description = "HTML forms using Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3715,6 +3857,10 @@ rec { sha256 = "0wnb561yp1r3mqw2hmd16zm45lqqm2mp823s1rx2k4qw141rmkpv"; }; buildInputs = [ TestBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HTMLScrubber = buildPerlPackage { @@ -3785,6 +3931,8 @@ rec { meta = { description = "Add XPath support to HTML::TreeBuilder"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3966,6 +4114,8 @@ rec { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4093,6 +4243,8 @@ rec { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4288,6 +4440,10 @@ rec { url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; libxml_perl = buildPerlPackage rec { @@ -4371,6 +4527,8 @@ rec { meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4392,6 +4550,10 @@ rec { url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; LocaleGettext = buildPerlPackage { @@ -4447,6 +4609,8 @@ rec { meta = { description = "Simple logging interface with a contextual log"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4460,6 +4624,8 @@ rec { meta = { description = "Dispatches messages to one or more outputs"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4585,6 +4751,10 @@ rec { sha256 = "1z89jszgifvjb8irzd8wrzim7l5m4hypdl9mj4dpkb4jm4189kmn"; }; propagatedBuildInputs = [ LWP HookLexWrap ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; LWPxParanoidAgent = buildPerlPackage rec { @@ -4683,6 +4853,8 @@ rec { homepage = http://search.cpan.org/dist/Math-Random-ISAAC; description = "Perl interface to the ISAAC PRNG algorithm"; license = "unrestricted"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4696,6 +4868,8 @@ rec { meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4710,6 +4884,8 @@ rec { meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4731,6 +4907,8 @@ rec { meta = { description = "Tools for creating Meta objects to track custom metrics"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4744,6 +4922,8 @@ rec { meta = { description = "Basic method declarations with signatures, without source filters"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4890,6 +5070,8 @@ rec { meta = { description = "Declare author-only dependencies"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4903,6 +5085,8 @@ rec { meta = { description = "Designate tests only run by module authors"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5012,6 +5196,10 @@ rec { sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Moo = buildPerlPackage { @@ -5069,6 +5257,8 @@ rec { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5094,6 +5284,8 @@ rec { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5117,6 +5309,8 @@ rec { meta = { description = "Extend your attribute interfaces (deprecated)"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5127,6 +5321,10 @@ rec { sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f"; }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXConfigFromFile = buildPerlPackage { @@ -5140,6 +5338,8 @@ rec { meta = { description = "An abstract Moose role for setting attributes from a configfile"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5198,6 +5398,8 @@ rec { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5352,6 +5554,10 @@ rec { }; buildInputs = [ Testuseok TestTableDriven ]; propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXSemiAffordanceAccessor = buildPerlPackage rec { @@ -5380,6 +5586,10 @@ rec { sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; }; buildInputs = [ Moose TestFatal TestRequires ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXStrictConstructor = buildPerlPackage { @@ -5440,6 +5650,10 @@ rec { }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose MooseXTypes ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesDateTime = buildPerlPackage { @@ -5449,6 +5663,10 @@ rec { sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996"; }; propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesDateTimeMoreCoercions = buildPerlPackage { @@ -5472,6 +5690,10 @@ rec { sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g"; }; propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesPathClass = buildPerlPackage { @@ -5499,6 +5721,8 @@ rec { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5527,6 +5751,8 @@ rec { homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5542,6 +5768,8 @@ rec { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5552,6 +5780,10 @@ rec { sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s"; }; propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Mouse = buildPerlPackage rec { @@ -5646,6 +5878,8 @@ rec { propagatedBuildInputs = [ URI ]; meta = { description = "Perl extension to create signatures for AWS requests"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5710,6 +5944,8 @@ rec { meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5724,6 +5960,8 @@ rec { meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; preConfigure = '' @@ -5746,6 +5984,8 @@ rec { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5825,6 +6065,8 @@ rec { meta = { description = "An Asynchronous and multi channel Perl AMQP client"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5932,6 +6174,8 @@ rec { meta = { description = "Comprehensive inside-out object support module"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6110,6 +6354,8 @@ rec { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; preConfigure = '' @@ -6168,11 +6414,11 @@ rec { }; }; - PerlMagick = buildPerlPackage { - name = "PerlMagick-6.77"; + PerlMagick = buildPerlPackage rec { + name = "PerlMagick-6.86"; src = fetchurl { - url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz; - sha256 = "0axbj3n5avjxvlxradjs9zxiv84i00drmnjsb7hq9sjn9fzggngg"; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz"; + sha256 = "18xgh8r9pjxg9yi119gnsln1r4p4sk1r8bxd3iy0qj77frmksisi"; }; buildInputs = [pkgs.imagemagick]; preConfigure = @@ -6236,6 +6482,8 @@ rec { meta = { description = "Display information about the current request/response"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6554,6 +6802,8 @@ rec { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6605,6 +6855,8 @@ rec { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6674,6 +6926,10 @@ rec { sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6"; }; propagatedBuildInputs = [ SOAPLite ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; SafeIsa = buildPerlPackage { @@ -6749,6 +7005,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6770,6 +7028,8 @@ rec { meta = { description = "Perl's Web Services Toolkit"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6905,6 +7165,8 @@ rec { propagatedBuildInputs = [ NumberFormat ]; meta = { license = "open_source"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6978,6 +7240,10 @@ rec { url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.4.tar.gz; sha256 = "0lc3d4szxagwzcw6pxq3mmkvdlrz2zkw4i13crf42nvivv7gda8l"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringErrf = buildPerlPackage { @@ -7000,6 +7266,10 @@ rec { url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringFlogger = buildPerlPackage { @@ -7065,6 +7335,10 @@ rec { url = mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz; sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringToIdentifierEN = buildPerlPackage rec { @@ -7101,6 +7375,8 @@ rec { meta = { description = "Use TT to interpolate lexical variables"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7291,6 +7567,10 @@ rec { url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; syntax = buildPerlPackage { @@ -7380,6 +7660,10 @@ rec { sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; }; propagatedBuildInputs = [ TemplateToolkit ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TemplatePluginJavaScript = buildPerlPackage { @@ -7389,6 +7673,10 @@ rec { sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; }; propagatedBuildInputs = [ TemplateToolkit ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TemplateTimer = buildPerlPackage { @@ -7527,6 +7815,10 @@ rec { }; buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestAssertions = buildPerlPackage rec { @@ -7623,6 +7915,8 @@ rec { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7646,6 +7940,8 @@ rec { homepage = https://metacpan.org/release/Test-FailWarnings; description = "Add test failures if warnings are caught"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7693,6 +7989,10 @@ rec { sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; propagatedBuildInputs = [ JSONAny TestDifferences TestTester ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestLongString = buildPerlPackage rec { @@ -7712,6 +8012,8 @@ rec { propagatedBuildInputs = [ DevelCycle PadWalker ]; meta = { description = "Verifies code hasn't left circular references"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7726,6 +8028,8 @@ rec { meta = { description = "Simulating other classes"; license = "lgpl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7735,6 +8039,10 @@ rec { url = mirror://cpan/authors/id/S/SI/SIMONFLK/Test-MockModule-0.05.tar.gz; sha256 = "01vf75higpap5mwm5fyas08b3qcmy5bfq1c3wl4h0y3nihjibib7"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestMockObject = buildPerlPackage { @@ -7806,6 +8114,8 @@ rec { meta = { description = "Check the presence of tabs in your project"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7923,6 +8233,8 @@ rec { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7975,6 +8287,8 @@ rec { meta = { description = "Write tests, not scripts that run them"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8008,6 +8322,8 @@ rec { meta = { description = "Unit testing without external dependencies"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8061,6 +8377,8 @@ rec { meta = { description = "Test fallback behaviour in absence of modules"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8099,6 +8417,10 @@ rec { sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; propagatedBuildInputs = [ TestWWWMechanize WWWMechanizeCGI ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestWWWMechanizePSGI = buildPerlPackage { @@ -8121,6 +8443,10 @@ rec { sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi"; }; propagatedBuildInputs = [ XMLLibXML ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TextAligner = buildPerlPackage { @@ -8196,6 +8522,8 @@ rec { meta = { description = "Spy on objects to achieve test doubles (mock testing)"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8222,6 +8550,8 @@ rec { meta = { description = "Micro template engine with Perl5 language"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8347,6 +8677,8 @@ rec { meta = { description = "Remove leading and/or trailing whitespace from strings"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8356,6 +8688,10 @@ rec { url = mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz; sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TextUnidecode = buildPerlPackage rec { @@ -8373,6 +8709,10 @@ rec { sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry"; }; propagatedBuildInputs = [ URI ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Throwable = buildPerlPackage rec { @@ -8545,6 +8885,8 @@ rec { meta = { description = "Wrapper around ICU collation services"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; buildInputs = [ pkgs.icu ]; }; @@ -8593,6 +8935,8 @@ rec { meta = { description = "Build a URI from a set of named parameters"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8693,7 +9037,14 @@ rec { sha256 = "046jm18liq7rwkdawdh9520cnalkfrk26yqryp7xgw71y65lvq61"; }; propagatedBuildInputs = [ HTTPRequestAsCGI WWWMechanize ]; - preConfigure = "sed -i 's|#!/usr/bin/perl|#!${perl}/bin/perl|' t/cgi-bin/script.cgi"; + preConfigure = '' + substituteInPlace t/cgi-bin/script.cgi \ + --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' + ''; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; WWWRobotRules = buildPerlPackage { @@ -8796,6 +9147,8 @@ rec { }; meta = { description = "A re-usable XPath engine for DOM-like trees"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8823,6 +9176,10 @@ rec { sha256 = "05rzm433vvndh49k8p4gqnyw4x4lxa4zr6qdlrlgplqkxvhvk6jk"; }; propagatedBuildInputs = [ XMLParser ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; XMLSimple = buildPerlPackage { diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ff86757c979..fe75ea4098a 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -55,7 +55,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -67,15 +67,15 @@ in }; - "Products.Archetypes-1.9.1" = self.buildPythonPackage { - name = "Products.Archetypes-1.9.1"; + "Products.Archetypes-1.9.4" = self.buildPythonPackage { + name = "Products.Archetypes-1.9.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip"; - md5 = "c2343539f9f3e485f0bc98b46c12cd85"; + url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.4.zip"; + md5 = "fc5679b10df703a542b58da044f7d9c6"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.4" self."Products.PlacelessTranslationService-2.0.3" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -87,6 +87,26 @@ in }; + "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage { + name = "collective.z3cform.datetimewidget-1.2.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip"; + md5 = "38fa463ea9b0b3cf5f61540250968214"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + z3c.form date and datetime widgets + ''; + homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; + license = "GPL version 2"; + }; + }; + + "Products.Marshall-2.1.2" = self.buildPythonPackage { name = "Products.Marshall-2.1.2"; src = fetchurl { @@ -95,7 +115,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -127,15 +147,55 @@ in }; - "Products.CMFPlone-4.3.1" = self.buildPythonPackage { - name = "Products.CMFPlone-4.3.1"; + "plone.app.caching-1.1.6" = self.buildPythonPackage { + name = "plone.app.caching-1.1.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip"; - md5 = "2fee0c66e0d9bdf28b513bcd6d95a602"; + url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip"; + md5 = "52f817d67e6da1508bf6f1486e5466d2"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.8" self."archetypes.referencebrowserwidget-2.4.18" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.10" self."plone.app.content-2.1.2" self."plone.app.contentlisting-1.0.4" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.3" self."plone.app.controlpanel-2.3.6" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.6" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.5" self."plone.app.layout-2.3.5" self."plone.app.linkintegrity-1.5.2" self."plone.app.locales-4.3.1" self."plone.app.portlets-2.4.4" self."plone.app.redirector-1.2" self."plone.app.search-1.1.4" self."plone.app.upgrade-1.3.3" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.3" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.8" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.4" self."Products.Archetypes-1.9.1" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PasswordResetTool-2.0.14" self."Products.PlacelessTranslationService-2.0.3" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.4" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Plone UI and default rules for plone.caching/z3c.caching + ''; + homepage = "http://pypi.python.org/pypi/plone.app.caching"; + license = "GPL version 2"; + }; + }; + + + "six-1.4.1" = self.buildPythonPackage { + name = "six-1.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/six/six-1.4.1.tar.gz"; + md5 = "bdbb9e12d3336c198695aa4cf3a61d62"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Python 2 and 3 compatibility utilities + ''; + homepage = "http://pypi.python.org/pypi/six/"; + license = "UNKNOWN"; + }; + }; + + + "Products.CMFPlone-4.3.2" = self.buildPythonPackage { + name = "Products.CMFPlone-4.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.2.zip"; + md5 = "b9948583429d7d90475148d276fa5cf4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.9" self."archetypes.referencebrowserwidget-2.4.19" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.3" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.8" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.6" self."plone.app.layout-2.3.7" self."plone.app.linkintegrity-1.5.3" self."plone.app.locales-4.3.2" self."plone.app.portlets-2.4.5" self."plone.app.redirector-1.2" self."plone.app.search-1.1.5" self."plone.app.upgrade-1.3.4" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.4" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.5" self."Products.Archetypes-1.9.4" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.15" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.5" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -167,11 +227,31 @@ in }; - "waitress-0.8.6" = self.buildPythonPackage { - name = "waitress-0.8.6"; + "Mako-0.9.0" = self.buildPythonPackage { + name = "Mako-0.9.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.6.tar.gz"; - md5 = "eb5a8968780cfbc6b75364683b09f5fe"; + url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.9.0.tar.gz"; + md5 = "e2627ba5c65f83dfe39d9a0892ae517d"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ self."MarkupSafe-0.18" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + A super-fast templating language that borrows the best ideas from the existing templating languages. + ''; + homepage = "http://www.makotemplates.org/"; + license = "MIT"; + }; + }; + + + "waitress-0.8.7" = self.buildPythonPackage { + name = "waitress-0.8.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.7.tar.gz"; + md5 = "714f3d458d82a47f12fb168460de8366"; }; doCheck = false; buildInputs = [ ]; @@ -207,22 +287,22 @@ in }; - "plone.app.workflow-2.1.5" = self.buildPythonPackage { - name = "plone.app.workflow-2.1.5"; + "plone.app.textfield-1.2.2" = self.buildPythonPackage { + name = "plone.app.textfield-1.2.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; - md5 = "b3589b4def82201adc196b3075b54213"; + url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip"; + md5 = "f832887a40826d6f68c48b48f071fb9c"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - workflow and security settings for Plone + Text field with MIME type support ''; - homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/plone.app.textfield"; + license = "GPL"; }; }; @@ -235,7 +315,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -247,35 +327,15 @@ in }; - "roman-1.4.0" = self.buildPythonPackage { - name = "roman-1.4.0"; + "plone.autoform-1.5" = self.buildPythonPackage { + name = "plone.autoform-1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; - md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integer to Roman numerals converter - ''; - homepage = "http://pypi.python.org/pypi/roman"; - license = "Python 2.1.1"; - }; - }; - - - "plone.autoform-1.4" = self.buildPythonPackage { - name = "plone.autoform-1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip"; - md5 = "01e5ccb59253bfaaa02c1ab4be3f212f"; + url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.5.zip"; + md5 = "a62216fb76017077643f5af8b1e17949"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + propagatedBuildInputs = [ self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -327,6 +387,26 @@ in }; + "Products.GenericSetup-1.7.4" = self.buildPythonPackage { + name = "Products.GenericSetup-1.7.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz"; + md5 = "f93251ed519e8c4aea0bc001416027b1"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Read Zope configuration state from profile dirs / tarballs + ''; + homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + "plone.app.redirector-1.2" = self.buildPythonPackage { name = "plone.app.redirector-1.2"; src = fetchurl { @@ -415,7 +495,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -427,26 +507,6 @@ in }; - "plone.outputfilters-1.10" = self.buildPythonPackage { - name = "plone.outputfilters-1.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip"; - md5 = "2c8ba3b7fd2bf18406eb49d01b478139"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Transformations applied to HTML in Plone text fields as they are rendered - ''; - homepage = "http://github.com/plone/plone.outputfilters"; - license = "GPL"; - }; - }; - - "zope.site-3.9.2" = self.buildPythonPackage { name = "zope.site-3.9.2"; src = fetchurl { @@ -487,41 +547,41 @@ in }; - "six-1.3.0" = self.buildPythonPackage { - name = "six-1.3.0"; + "mechanize-0.2.5" = self.buildPythonPackage { + name = "mechanize-0.2.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz"; - md5 = "ec47fe6070a8a64c802363d2c2b1e2ee"; + url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; + md5 = "32657f139fc2fb75bcf193b63b8c60b2"; }; doCheck = false; buildInputs = [ ]; propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Python 2 and 3 compatibility utilities + Stateful programmatic web browsing. ''; - homepage = "http://pypi.python.org/pypi/six/"; - license = "UNKNOWN"; + homepage = "http://wwwsearch.sourceforge.net/mechanize/"; + license = "BSD"; }; }; - "Products.CMFEditions-2.2.8" = self.buildPythonPackage { - name = "Products.CMFEditions-2.2.8"; + "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage { + name = "Products.PlacelessTranslationService-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; - md5 = "1806f2e17e2527fad9364670b343bd11"; + url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.4.zip"; + md5 = "4b5a1ddc66eeaa02d32ee4a685905c10"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Versioning for Plone + PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. ''; - homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService"; license = "GPL"; }; }; @@ -575,26 +635,6 @@ in }; - "Products.PlacelessTranslationService-2.0.3" = self.buildPythonPackage { - name = "Products.PlacelessTranslationService-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip"; - md5 = "a94635eb712563c5a002520713f5d6dc"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService"; - license = "GPL"; - }; - }; - - "zope.deprecation-3.4.1" = self.buildPythonPackage { name = "zope.deprecation-3.4.1"; src = fetchurl { @@ -623,7 +663,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -643,7 +683,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -683,7 +723,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -735,22 +775,22 @@ in }; - "zope.component-4.1.0" = self.buildPythonPackage { - name = "zope.component-4.1.0"; + "Products.CMFCore-2.2.7" = self.buildPythonPackage { + name = "Products.CMFCore-2.2.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; - md5 = "8e185893699f9fa577bd9ada0a5302fa"; + url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; + md5 = "9320a4023b8575097feacfd4a400e930"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Component Architecture + Zope Content Management Framework core components ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/Products.CMFCore"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; }; }; @@ -763,7 +803,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -803,7 +843,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ]; + propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.19" self.setuptools self."zope.deprecation-3.4.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -843,7 +883,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -855,26 +895,6 @@ in }; - "Mako-0.8.1" = self.buildPythonPackage { - name = "Mako-0.8.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.8.1.tar.gz"; - md5 = "96d962464ce6316004af0cc48495d73e"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; - propagatedBuildInputs = [ self."MarkupSafe-0.18" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A super-fast templating language that borrows the best ideas from the existing templating languages. - ''; - homepage = "http://www.makotemplates.org/"; - license = "MIT"; - }; - }; - - "plone.transformchain-1.0.3" = self.buildPythonPackage { name = "plone.transformchain-1.0.3"; src = fetchurl { @@ -895,22 +915,22 @@ in }; - "zope.schema-4.3.2" = self.buildPythonPackage { - name = "zope.schema-4.3.2"; + "plone.indexer-1.0.2" = self.buildPythonPackage { + name = "plone.indexer-1.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; - md5 = "b63df4a3035f29113f8130c8ae28bb13"; + url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - zope.interface extension for defining data schemas + Hooks to facilitate managing custom index values in Zope 2/CMF applications ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.indexer"; + license = "BSD"; }; }; @@ -923,7 +943,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -955,15 +975,35 @@ in }; - "plone.app.form-2.2.2" = self.buildPythonPackage { - name = "plone.app.form-2.2.2"; + "Products.CMFEditions-2.2.8" = self.buildPythonPackage { + name = "Products.CMFEditions-2.2.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip"; - md5 = "6101e6a5bd4de6cc8cdef09ced2743eb"; + url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; + md5 = "1806f2e17e2527fad9364670b343bd11"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Versioning for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + license = "GPL"; + }; + }; + + + "plone.app.form-2.2.3" = self.buildPythonPackage { + name = "plone.app.form-2.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.3.zip"; + md5 = "4b7dcabcda1407a40185782a4d1f9a01"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.11" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -983,7 +1023,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1015,42 +1055,22 @@ in }; - "Products.PasswordResetTool-2.0.14" = self.buildPythonPackage { - name = "Products.PasswordResetTool-2.0.14"; + "zope.component-4.1.0" = self.buildPythonPackage { + name = "zope.component-4.1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; - md5 = "4267a5fef471d0ebe5ca848e86630702"; + url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; + md5 = "8e185893699f9fa577bd9ada0a5302fa"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Password reset tool for Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; - license = "GPL"; - }; - }; - - - "WSGIProxy2-0.2" = self.buildPythonPackage { - name = "WSGIProxy2-0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.2.tar.gz"; - md5 = "d8c764aa68173e0d4851874ed6021211"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - UNKNOWN + Zope Component Architecture ''; - homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + homepage = "http://pypi.python.org/pypi/zope.component"; + license = "ZPL 2.1"; }; }; @@ -1095,31 +1115,31 @@ in }; - "plone.stringinterp-1.0.10" = self.buildPythonPackage { - name = "plone.stringinterp-1.0.10"; + "tempstorage-2.12.2" = self.buildPythonPackage { + name = "tempstorage-2.12.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; - md5 = "595074e94944ad6860e2105a020a3b9a"; + url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; + md5 = "7a2b76b39839e229249b1bb175604480"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Adaptable string interpolation + A RAM-based storage for ZODB ''; - homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/tempstorage"; + license = "ZPL 2.1"; }; }; - "plonetheme.sunburst-1.4.4" = self.buildPythonPackage { - name = "plonetheme.sunburst-1.4.4"; + "plonetheme.sunburst-1.4.5" = self.buildPythonPackage { + name = "plonetheme.sunburst-1.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip"; - md5 = "f2cb3fdd66ecc14d1a542d2ca76252db"; + url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.5.zip"; + md5 = "a8438d6f4a27ad6c10dc3554a9145705"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -1183,7 +1203,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1195,46 +1215,6 @@ in }; - "plone.resourceeditor-1.0" = self.buildPythonPackage { - name = "plone.resourceeditor-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; - md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "https://github.com/plone/plone.resourceeditor"; - license = "GPL"; - }; - }; - - - "z3c.form-3.0" = self.buildPythonPackage { - name = "z3c.form-3.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; - md5 = "f9fa3cf56c83722425b3b1be4467ce46"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - An advanced form and widget framework for Zope 3 - ''; - homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; - }; - }; - - "zope.app.publication-3.12.0" = self.buildPythonPackage { name = "zope.app.publication-3.12.0"; src = fetchurl { @@ -1275,35 +1255,15 @@ in }; - "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { - name = "Products.ExternalEditor-1.1.0"; + "plone.app.content-2.1.3" = self.buildPythonPackage { + name = "plone.app.content-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.3.zip"; + md5 = "3463a245414518f058fa6d658a6b9caf"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope External Editor - ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = "ZPL 2.1"; - }; - }; - - - "plone.app.content-2.1.2" = self.buildPythonPackage { - name = "plone.app.content-2.1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip"; - md5 = "247eb174269b2ab03c05f318915f087e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1323,7 +1283,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1375,25 +1335,22 @@ in }; - "diazo-1.0.3" = self.buildPythonPackage { - name = "diazo-1.0.3"; + "Persistence-2.13.2" = self.buildPythonPackage { + name = "Persistence-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip"; - md5 = "d3c2b017af521db4c86fb360c86e0bc8"; + url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Diazo implements a Deliverance like language using a pure XSLT engine. With Diazo, you -"compile" your theme and ruleset in one step, then use a superfast/simple -transform on each request thereafter. Alternatively, compile your theme during -development, check it into Subversion, and not touch Diazo during deployment. + Persistent ExtensionClass ''; - homepage = "http://diazo.org"; - license = "New BSD"; + homepage = "http://pypi.python.org/pypi/Persistence"; + license = "ZPL 2.1"; }; }; @@ -1418,6 +1375,30 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "diazo-1.0.4" = self.buildPythonPackage { + name = "diazo-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.4.zip"; + md5 = "b5f07cfd928e06bcb964b3f830767bab"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Diazo implements a Deliverance like language using a pure + XSLT engine. With Diazo, you "compile" your theme and ruleset in one + step, then use a superfast/simple transform on each request thereafter. + Alternatively, compile your theme during development, check it into + Subversion, and not touch Diazo during deployment. + ''; + homepage = "http://diazo.org"; + license = "New BSD"; + }; + }; + + "zc.lockfile-1.0.2" = self.buildPythonPackage { name = "zc.lockfile-1.0.2"; src = fetchurl { @@ -1518,21 +1499,41 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.location-4.0.2" = self.buildPythonPackage { - name = "zope.location-4.0.2"; + "zope.configuration-3.7.4" = self.buildPythonPackage { + name = "zope.configuration-3.7.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; - md5 = "44d865b2c0b1e1cc93898c7df938d353"; + url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; + md5 = "5b0271908ef26c05059eda76928896ea"; }; - doCheck = true; + doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Location + Zope Configuration Markup Language (ZCML) ''; - homepage = "http://pypi.python.org/pypi/zope.location/"; + homepage = "http://pypi.python.org/pypi/zope.configuration"; + license = "ZPL 2.1"; + }; + }; + + + "Missing-2.13.1" = self.buildPythonPackage { + name = "Missing-2.13.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; + md5 = "9823cff54444cbbcaef8fc45d8e42572"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Special Missing objects used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/Missing"; license = "ZPL 2.1"; }; }; @@ -1546,7 +1547,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1558,21 +1559,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { - name = "Products.PortalTransforms-2.1.2"; + "python-openid-2.2.5" = self.buildPythonPackage { + name = "python-openid-2.2.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; - md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz"; + md5 = "393f48b162ec29c3de9e2973548ea50d"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.4" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.20" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - MIME based content transformations + OpenID support for servers and consumers. ''; - homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + homepage = "http://github.com/openid/python-openid"; license = "UNKNOWN"; }; }; @@ -1618,35 +1619,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "DocumentTemplate-2.13.2" = self.buildPythonPackage { - name = "DocumentTemplate-2.13.2"; + "Products.PythonScripts-2.13.2" = self.buildPythonPackage { + name = "Products.PythonScripts-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; + md5 = "04c86f2c45a29a162297a80dac61d14f"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Document Templating Markup Language (DTML) + Provides support for restricted execution of Python scripts in Zope 2. ''; - homepage = "http://pypi.python.org/pypi/DocumentTemplate"; + homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; license = "ZPL 2.1"; }; }; - "plone.app.controlpanel-2.3.6" = self.buildPythonPackage { - name = "plone.app.controlpanel-2.3.6"; + "plone.app.controlpanel-2.3.7" = self.buildPythonPackage { + name = "plone.app.controlpanel-2.3.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip"; - md5 = "ca5e0e0c8497d9860603e39e0eeba9b8"; + url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.7.zip"; + md5 = "537072fe22237a2148310b8714755356"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1678,26 +1679,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.MimetypesRegistry-2.0.4" = self.buildPythonPackage { - name = "Products.MimetypesRegistry-2.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; - md5 = "898166bb2aaececc8238ad4ee4826793"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - MIME type handling for Zope - ''; - homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; - license = "UNKNOWN"; - }; - }; - - "docutils-0.9.1" = self.buildPythonPackage { name = "docutils-0.9.1"; src = fetchurl { @@ -1738,6 +1719,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.app.upgrade-1.3.4" = self.buildPythonPackage { + name = "plone.app.upgrade-1.3.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip"; + md5 = "10c192ee4a2422f901e020fd5b39879a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Upgrade machinery for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; + license = "GPL version 2"; + }; + }; + + "nose-1.3.0" = self.buildPythonPackage { name = "nose-1.3.0"; src = fetchurl { @@ -1758,46 +1759,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Distutils2-1.0a4" = self.buildPythonPackage { - name = "Distutils2-1.0a4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/D/Distutils2/Distutils2-1.0a4.tar.gz"; - md5 = "52bc9dffb394970c27e02853ae3a3241"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Python Packaging Library - ''; - homepage = "http://wiki.python.org/moin/Distutils2"; - license = "Python license"; - }; - }; - - - "plone.app.upgrade-1.3.3" = self.buildPythonPackage { - name = "plone.app.upgrade-1.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; - md5 = "1c45e809fba27bec11e8a40f686f0f5b"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Upgrade machinery for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = "GPL version 2"; - }; - }; - - "zope.error-3.7.4" = self.buildPythonPackage { name = "zope.error-3.7.4"; src = fetchurl { @@ -1826,7 +1787,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."plone.app.portlets-2.4.4" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.app.portlets-2.4.5" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1838,42 +1799,42 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "five.globalrequest-1.0" = self.buildPythonPackage { - name = "five.globalrequest-1.0"; + "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { + name = "Products.PortalTransforms-2.1.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; + md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope 2 integration for zope.globalrequest + MIME based content transformations ''; - homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = "ZPL"; + homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + license = "UNKNOWN"; }; }; - "plone.indexer-1.0.2" = self.buildPythonPackage { - name = "plone.indexer-1.0.2"; + "zope.schema-4.3.2" = self.buildPythonPackage { + name = "zope.schema-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; + md5 = "b63df4a3035f29113f8130c8ae28bb13"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Hooks to facilitate managing custom index values in Zope 2/CMF applications + zope.interface extension for defining data schemas ''; - homepage = "http://pypi.python.org/pypi/plone.indexer"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; }; }; @@ -1898,15 +1859,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.portlets-2.4.4" = self.buildPythonPackage { - name = "plone.app.portlets-2.4.4"; + "plone.app.portlets-2.4.5" = self.buildPythonPackage { + name = "plone.app.portlets-2.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip"; - md5 = "c1144f7686cacf3d64fcd202ab2e5e2d"; + url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.5.zip"; + md5 = "409aeeed42d87af8338197514363ec76"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.10" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1918,6 +1879,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage { + name = "Products.PluggableAuthService-1.10.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; + md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Pluggable Zope2 authentication / authorization framework + ''; + homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + "plone.dexterity-2.1.3" = self.buildPythonPackage { name = "plone.dexterity-2.1.3"; src = fetchurl { @@ -1926,7 +1907,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.0.1" self."plone.supermodel-1.2.2" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1958,6 +1939,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "wicked-1.1.10" = self.buildPythonPackage { + name = "wicked-1.1.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone + ''; + homepage = "http://pypi.python.org/pypi/wicked"; + license = "GPL"; + }; + }; + + "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage { name = "Products.BTreeFolder2-2.13.3"; src = fetchurl { @@ -1966,7 +1967,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1998,6 +1999,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.formwidget.namedfile-1.0.7" = self.buildPythonPackage { + name = "plone.formwidget.namedfile-1.0.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.7.zip"; + md5 = "6fa3cd99bf9b30971034b0f6dc31cfb3"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Image widget for z3c.form and Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; + license = "GPL"; + }; + }; + + "zope.testing-3.9.7" = self.buildPythonPackage { name = "zope.testing-3.9.7"; src = fetchurl { @@ -2038,35 +2059,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "ExtensionClass-2.13.2" = self.buildPythonPackage { - name = "ExtensionClass-2.13.2"; + "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage { + name = "plone.app.viewletmanager-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; + url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip"; + md5 = "565a12ac71d20b2823b9e44daebe432f"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Metaclass for subclassable extension types + configurable viewlet manager ''; - homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; + license = "GPL version 2"; }; }; - "plone.app.contentrules-3.0.3" = self.buildPythonPackage { - name = "plone.app.contentrules-3.0.3"; + "plone.app.contentrules-3.0.4" = self.buildPythonPackage { + name = "plone.app.contentrules-3.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip"; - md5 = "518c1e22a9cfe187b6770e62be4f8bd8"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.4.zip"; + md5 = "15e86e2739096bff5bf0745590d5ebb0"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2226,7 +2247,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Persistence-2.13.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2258,15 +2279,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.search-1.1.4" = self.buildPythonPackage { - name = "plone.app.search-1.1.4"; + "plone.app.search-1.1.5" = self.buildPythonPackage { + name = "plone.app.search-1.1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip"; - md5 = "fb24320380ed2ba11e6f20cc1fe3b6df"; + url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.5.zip"; + md5 = "eeb42889464d35e9d8169e062bc9c827"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.5" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2306,7 +2327,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2358,26 +2379,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Persistence-2.13.2" = self.buildPythonPackage { - name = "Persistence-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; - md5 = "92693648ccdc59c8fc71f7f06b1d228c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Persistent ExtensionClass - ''; - homepage = "http://pypi.python.org/pypi/Persistence"; - license = "ZPL 2.1"; - }; - }; - - "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage { name = "Products.CMFDynamicViewFTI-4.0.5"; src = fetchurl { @@ -2386,7 +2387,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2418,21 +2419,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.browserpage-3.12.2" = self.buildPythonPackage { - name = "zope.browserpage-3.12.2"; + "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { + name = "Products.ExternalEditor-1.1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - ZCML directives for configuring browser views for Zope. + Zope External Editor ''; - homepage = "http://pypi.python.org/pypi/zope.browserpage/"; + homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; license = "ZPL 2.1"; }; }; @@ -2486,7 +2487,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2498,22 +2499,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.jquerytools-1.5.5" = self.buildPythonPackage { - name = "plone.app.jquerytools-1.5.5"; + "roman-1.4.0" = self.buildPythonPackage { + name = "roman-1.4.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip"; - md5 = "7a4957a3a8482e4963e49e2d02772e33"; + url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - jQuery Tools integration for Plone plus overlay and AJAX form helpers. + Integer to Roman numerals converter ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/roman"; + license = "Python 2.1.1"; }; }; @@ -2538,6 +2539,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.rfc822-1.1" = self.buildPythonPackage { + name = "plone.rfc822-1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.1.zip"; + md5 = "ba3e26cab9e751fb1cf40639d661d2f0"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + RFC822 marshalling for zope.schema fields + ''; + homepage = "http://pypi.python.org/pypi/plone.rfc822"; + license = "BSD"; + }; + }; + + "zope.viewlet-3.7.2" = self.buildPythonPackage { name = "zope.viewlet-3.7.2"; src = fetchurl { @@ -2586,7 +2607,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.18" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.5" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.19" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.7" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2598,6 +2619,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "WSGIProxy2-0.3" = self.buildPythonPackage { + name = "WSGIProxy2-0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.3.zip"; + md5 = "8b2cb207932eb8c341c3fa41f0cbe994"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."six-1.4.1" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/gawel/WSGIProxy2/"; + license = "MIT"; + }; + }; + + "zope.browserresource-3.10.3" = self.buildPythonPackage { name = "zope.browserresource-3.10.3"; src = fetchurl { @@ -2626,7 +2667,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2646,7 +2687,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2678,15 +2719,17 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "pyramid-1.4.3" = self.buildPythonPackage { - name = "pyramid-1.4.3"; + "pyramid" = self."pyramid-1.4.5"; + + "pyramid-1.4.5" = self.buildPythonPackage { + name = "pyramid-1.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.3.tar.gz"; - md5 = "28fabf42cf585ecec7a57b5acc1174e3"; + url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.5.tar.gz"; + md5 = "321731aad69e9788b7819e257a50be1a"; }; doCheck = true; - buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.7" self."zope.component-4.1.0" self."zope.interface-4.0.5" ]; - propagatedBuildInputs = [ self."Chameleon-2.11" self."Mako-0.8.1" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ]; + buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.9" self."zope.component-4.1.0" self."zope.interface-4.0.5" ]; + propagatedBuildInputs = [ self."Chameleon-2.12" self."Mako-0.9.0" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -2698,6 +2741,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage { + name = "Products.MimetypesRegistry-2.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.5.zip"; + md5 = "1be555ad13648e139174c034631fce34"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + MIME type handling for Zope + ''; + homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; + license = "UNKNOWN"; + }; + }; + + "python-dateutil-1.5" = self.buildPythonPackage { name = "python-dateutil-1.5"; src = fetchurl { @@ -2766,7 +2829,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.rfc822-1.0.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ]; + propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2818,6 +2881,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.app.theming-1.1.1" = self.buildPythonPackage { + name = "plone.app.theming-1.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; + md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."diazo-1.0.4" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.2" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Integrates the Diazo theming engine with Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.theming"; + license = "GPL"; + }; + }; + + "zope.globalrequest-1.0" = self.buildPythonPackage { name = "zope.globalrequest-1.0"; src = fetchurl { @@ -2838,26 +2921,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.rfc822-1.0.1" = self.buildPythonPackage { - name = "plone.rfc822-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip"; - md5 = "b5b79bb5a9181da624a7e88940a45424"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - RFC822 marshalling for zope.schema fields - ''; - homepage = "http://pypi.python.org/pypi/plone.rfc822"; - license = "BSD"; - }; - }; - - "zope.sendmail-3.7.5" = self.buildPythonPackage { name = "zope.sendmail-3.7.5"; src = fetchurl { @@ -2878,26 +2941,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.locking-2.0.4" = self.buildPythonPackage { - name = "plone.locking-2.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; - md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - webdav locking support - ''; - homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; - }; - }; - - "zope.annotation-3.5.0" = self.buildPythonPackage { name = "zope.annotation-3.5.0"; src = fetchurl { @@ -2926,7 +2969,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2938,26 +2981,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "WebTest-2.0.7" = self.buildPythonPackage { - name = "WebTest-2.0.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.7.zip"; - md5 = "4ca4e944a7f5f08b5aebd3bf90699890"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Helper to test WSGI applications - ''; - homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; - }; - }; - - "plone.app.registry-1.2.3" = self.buildPythonPackage { name = "plone.app.registry-1.2.3"; src = fetchurl { @@ -2966,7 +2989,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.registry-1.0.1" self."plone.supermodel-1.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.registry-1.0.1" self."plone.supermodel-1.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2986,7 +3009,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3026,7 +3049,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3038,6 +3061,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { + name = "Products.CMFPlacefulWorkflow-1.5.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; + md5 = "9041e1f52eab5b348c0dfa85be438722"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Workflow policies for CMF and Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; + license = "GPL"; + }; + }; + + "zope.filerepresentation-3.6.1" = self.buildPythonPackage { name = "zope.filerepresentation-3.6.1"; src = fetchurl { @@ -3118,6 +3161,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage { + name = "archetypes.referencebrowserwidget-2.4.19"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip"; + md5 = "b70af6b2da6d8c57c1138a52e94e588c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + A referencebrowser implementation for Archetypes + ''; + homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; + license = "ZPL 2.1"; + }; + }; + + "five.customerize-1.1" = self.buildPythonPackage { name = "five.customerize-1.1"; src = fetchurl { @@ -3126,7 +3189,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3166,7 +3229,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3186,7 +3249,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3198,11 +3261,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.locales-4.3.1" = self.buildPythonPackage { - name = "plone.app.locales-4.3.1"; + "plone.app.locales-4.3.2" = self.buildPythonPackage { + name = "plone.app.locales-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip"; - md5 = "c88b2da05361a24a564bdef30fb371aa"; + url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.2.zip"; + md5 = "c06d6574c1e1df4e253b80751a468ad5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3218,31 +3281,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "collective.z3cform.datetimewidget-1.2.3" = self.buildPythonPackage { - name = "collective.z3cform.datetimewidget-1.2.3"; + "plone.app.contentlisting-1.0.5" = self.buildPythonPackage { + name = "plone.app.contentlisting-1.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip"; - md5 = "439117021c93f26c677510504ee245d3"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - z3c.form date and datetime widgets - ''; - homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = "GPL version 2"; - }; - }; - - - "plone.app.contentlisting-1.0.4" = self.buildPythonPackage { - name = "plone.app.contentlisting-1.0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip"; - md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip"; + md5 = "9fc15b8ecad1c918778c3ea9a75bf533"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3258,15 +3301,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Zope2-2.13.20" = self.buildPythonPackage { - name = "Zope2-2.13.20"; + "Zope2-2.13.21" = self.buildPythonPackage { + name = "Zope2-2.13.21"; src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip"; - md5 = "557b08fec37620c37e32f2dc01020f29"; + url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.21.zip"; + md5 = "7d6e1661e365ee562fea9d3593f03f0e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3286,7 +3329,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3298,6 +3341,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.app.workflow-2.1.6" = self.buildPythonPackage { + name = "plone.app.workflow-2.1.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.6.zip"; + md5 = "68a76865382b9db82aaa60c16efb1d14"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + workflow and security settings for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.workflow"; + license = "GPL version 2"; + }; + }; + + "plone.browserlayer-2.1.2" = self.buildPythonPackage { name = "plone.browserlayer-2.1.2"; src = fetchurl { @@ -3306,7 +3369,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3338,11 +3401,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Chameleon-2.11" = self.buildPythonPackage { - name = "Chameleon-2.11"; + "Chameleon-2.12" = self.buildPythonPackage { + name = "Chameleon-2.12"; src = fetchurl { - url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.11.tar.gz"; - md5 = "df72458bf3dd26a744dcff5ad555c34b"; + url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.12.tar.gz"; + md5 = "c2947c7b615bf758fa4a710e759c658b"; }; doCheck = false; buildInputs = [ self."zope.event-4.0.2" ]; @@ -3352,7 +3415,7 @@ development, check it into Subversion, and not touch Diazo during deployment. description = '' Fast HTML/XML Template Compiler. ''; - homepage = "https://chameleon.readthedocs.org/en/latest/"; + homepage = "http://www.pagetemplates.org/"; license = "BSD-like (http://repoze.org/license.html)"; }; }; @@ -3366,7 +3429,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3398,22 +3461,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "tempstorage-2.12.2" = self.buildPythonPackage { - name = "tempstorage-2.12.2"; + "plone.stringinterp-1.0.10" = self.buildPythonPackage { + name = "plone.stringinterp-1.0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; - md5 = "7a2b76b39839e229249b1bb175604480"; + url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; + md5 = "595074e94944ad6860e2105a020a3b9a"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - A RAM-based storage for ZODB + Adaptable string interpolation ''; - homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.stringinterp"; + license = "GPL version 2"; }; }; @@ -3438,22 +3501,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Acquisition-2.13.8" = self.buildPythonPackage { - name = "Acquisition-2.13.8"; + "Products.PluginRegistry-1.3" = self.buildPythonPackage { + name = "Products.PluginRegistry-1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; + url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; + md5 = "5b166193ca1eb84dfb402051f779ebab"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. + Configure application plugins based on interfaces ''; - homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; }; }; @@ -3498,15 +3561,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.dexterity-2.0.8" = self.buildPythonPackage { - name = "plone.app.dexterity-2.0.8"; + "plone.app.dexterity-2.0.9" = self.buildPythonPackage { + name = "plone.app.dexterity-2.0.9"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; - md5 = "2e0ec48224a3a8afd51656c22d574359"; + url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.9.zip"; + md5 = "aa9d6ee719a6918f99f0aa0066ebf024"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."lxml-2.3.6" self."plone.app.content-2.1.3" self."plone.app.layout-2.3.7" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.7" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.3" self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3518,6 +3581,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "zope.location-4.0.2" = self.buildPythonPackage { + name = "zope.location-4.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; + md5 = "44d865b2c0b1e1cc93898c7df938d353"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Zope Location + ''; + homepage = "http://pypi.python.org/pypi/zope.location/"; + license = "ZPL 2.1"; + }; + }; + + "zope.app.locales-3.6.2" = self.buildPythonPackage { name = "zope.app.locales-3.6.2"; src = fetchurl { @@ -3538,15 +3621,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.layout-2.3.5" = self.buildPythonPackage { - name = "plone.app.layout-2.3.5"; + "five.globalrequest-1.0" = self.buildPythonPackage { + name = "five.globalrequest-1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; - md5 = "960665807ad60eb3e12c52a0cf092ceb"; + url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; + md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Zope 2 integration for zope.globalrequest + ''; + homepage = "http://pypi.python.org/pypi/five.globalrequest"; + license = "ZPL"; + }; + }; + + + "plone.app.layout-2.3.7" = self.buildPythonPackage { + name = "plone.app.layout-2.3.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.7.zip"; + md5 = "c68be1efeef54124211a676d0dbaa655"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.5" self."plone.app.viewletmanager-2.0.4" self."plone.i18n-2.0.9" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3578,22 +3681,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "mechanize-0.2.5" = self.buildPythonPackage { - name = "mechanize-0.2.5"; + "plone.locking-2.0.4" = self.buildPythonPackage { + name = "plone.locking-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; - md5 = "32657f139fc2fb75bcf193b63b8c60b2"; + url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; + md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Stateful programmatic web browsing. + webdav locking support ''; - homepage = "http://wwwsearch.sourceforge.net/mechanize/"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/plone.locking"; + license = "GPL version 2"; }; }; @@ -3606,7 +3709,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3618,15 +3721,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.z3cform-0.7.3" = self.buildPythonPackage { - name = "plone.app.z3cform-0.7.3"; + "plone.app.z3cform-0.7.4" = self.buildPythonPackage { + name = "plone.app.z3cform-0.7.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip"; - md5 = "deddc1af36efb26a6792c9803531c665"; + url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.4.zip"; + md5 = "6350db39b32c3bf6edbb820b91b70b0f"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3646,7 +3749,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.4" self."plone.app.layout-2.3.5" self."plone.app.vocabularies-2.1.10" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; + propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.7" self."plone.app.vocabularies-2.1.11" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3678,11 +3781,31 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.i18n-2.0.8" = self.buildPythonPackage { - name = "plone.i18n-2.0.8"; + "Products.PasswordResetTool-2.0.15" = self.buildPythonPackage { + name = "Products.PasswordResetTool-2.0.15"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip"; - md5 = "572c21e86b99316a06dc9998454d7750"; + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.15.zip"; + md5 = "74b46348d023052285124683bf122272"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Password reset tool for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; + license = "GPL"; + }; + }; + + + "plone.i18n-2.0.9" = self.buildPythonPackage { + name = "plone.i18n-2.0.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.9.zip"; + md5 = "8e8ceffc64f04beecf1579a24edc2670"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3698,11 +3821,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.contentmigration-2.1.4" = self.buildPythonPackage { - name = "Products.contentmigration-2.1.4"; + "Products.contentmigration-2.1.5" = self.buildPythonPackage { + name = "Products.contentmigration-2.1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.4.zip"; - md5 = "711f9d4ea3cc2130acaa74efb0f9da5e"; + url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip"; + md5 = "f08e5f2572fc6f4c61b930a17f99418f"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3718,46 +3841,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Missing-2.13.1" = self.buildPythonPackage { - name = "Missing-2.13.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Special Missing objects used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; - }; - }; - - - "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Method and property caching decorators - ''; - homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; - }; - }; - - "zope.browsermenu-3.9.1" = self.buildPythonPackage { name = "zope.browsermenu-3.9.1"; src = fetchurl { @@ -3798,42 +3881,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "archetypes.referencebrowserwidget-2.4.18" = self.buildPythonPackage { - name = "archetypes.referencebrowserwidget-2.4.18"; + "plone.app.jquery-1.7.2" = self.buildPythonPackage { + name = "plone.app.jquery-1.7.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip"; - md5 = "6eff85cbde401ff1566a76323792d514"; + url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; + md5 = "e204cf45456d26217263531832b5bdac"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.jquerytools-1.5.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - A referencebrowser implementation for Archetypes + jQuery integration for Plone ''; - homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = "ZPL 2.1"; - }; - }; - - - "zope.configuration-3.7.4" = self.buildPythonPackage { - name = "zope.configuration-3.7.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Configuration Markup Language (ZCML) - ''; - homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.jquery"; + license = "GPL version 2"; }; }; @@ -3858,6 +3921,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "WebTest-2.0.9" = self.buildPythonPackage { + name = "WebTest-2.0.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.9.zip"; + md5 = "bf0a04fcf8b2cdcaa13b04324cefb53d"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Helper to test WSGI applications + ''; + homepage = "http://webtest.pythonpaste.org/"; + license = "MIT"; + }; + }; + + "plone.app.contentmenu-2.0.8" = self.buildPythonPackage { name = "plone.app.contentmenu-2.0.8"; src = fetchurl { @@ -3866,7 +3949,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3906,7 +3989,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3938,42 +4021,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.theming-1.1.1" = self.buildPythonPackage { - name = "plone.app.theming-1.1.1"; + "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { + name = "zope.cachedescriptors-3.5.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; - md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; + url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Integrates the Diazo theming engine with Plone + Method and property caching decorators ''; - homepage = "http://pypi.python.org/pypi/plone.app.theming"; - license = "GPL"; - }; - }; - - - "plone.app.discussion-2.2.6" = self.buildPythonPackage { - name = "plone.app.discussion-2.2.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip"; - md5 = "36cf9cd22119282f49facd03fb3c2632"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.5" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Enhanced discussion support for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.discussion"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; + license = "ZPL 2.1"; }; }; @@ -3986,7 +4049,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4006,7 +4069,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4018,15 +4081,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.TinyMCE-1.3.4" = self.buildPythonPackage { - name = "Products.TinyMCE-1.3.4"; + "plone.app.discussion-2.2.8" = self.buildPythonPackage { + name = "plone.app.discussion-2.2.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip"; - md5 = "e697dfdd72f3b6238e26908bb455d39a"; + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.8.zip"; + md5 = "97cc5b204076f8803fcdaccbf0565bb6"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.5" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.10" self."Products.Archetypes-1.9.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; + propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.7" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Enhanced discussion support for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.discussion"; + license = "GPL"; + }; + }; + + + "Products.TinyMCE-1.3.5" = self.buildPythonPackage { + name = "Products.TinyMCE-1.3.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.5.zip"; + md5 = "b972ff26c90d99c13ded0aeb33af2a2e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.7" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.11.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4038,31 +4121,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "python-openid-2.2.5" = self.buildPythonPackage { - name = "python-openid-2.2.5"; + "plone.supermodel-1.2.3" = self.buildPythonPackage { + name = "plone.supermodel-1.2.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz"; - md5 = "393f48b162ec29c3de9e2973548ea50d"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - OpenID support for servers and consumers. - ''; - homepage = "http://github.com/openid/python-openid"; - license = "UNKNOWN"; - }; - }; - - - "plone.supermodel-1.2.2" = self.buildPythonPackage { - name = "plone.supermodel-1.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip"; - md5 = "6e829dc362d6ff8e3c7696277e11e322"; + url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.3.zip"; + md5 = "34610edccd7f93409b95a6b9ecd3da9e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4106,7 +4169,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.6" self."plone.app.layout-2.3.5" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.layout-2.3.7" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4126,7 +4189,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4138,22 +4201,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.caching-1.1.4" = self.buildPythonPackage { - name = "plone.app.caching-1.1.4"; + "AccessControl-3.0.8" = self.buildPythonPackage { + name = "AccessControl-3.0.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip"; - md5 = "bbb46c9dc36f0ac6cc833ee152203a81"; + url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.8.zip"; + md5 = "06bea3be59d1ce76c815661180b7ffd9"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.3" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Plone UI and default rules for plone.caching/z3c.caching + Security framework for Zope2. ''; - homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/AccessControl"; + license = "ZPL 2.1"; }; }; @@ -4178,61 +4241,41 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "AccessControl-3.0.6" = self.buildPythonPackage { - name = "AccessControl-3.0.6"; + "z3c.form-3.0.2" = self.buildPythonPackage { + name = "z3c.form-3.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip"; - md5 = "a8ce472482adabf9ec969f3971a39a19"; + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.2.zip"; + md5 = "8eab166766c6ae2e44e40f54136b3f79"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Security framework for Zope2. + An advanced form and widget framework for Zope 3 ''; - homepage = "http://pypi.python.org/pypi/AccessControl"; + homepage = "https://launchpad.net/z3c.form"; license = "ZPL 2.1"; }; }; - "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { - name = "Products.CMFPlacefulWorkflow-1.5.9"; + "plone.resourceeditor-1.0" = self.buildPythonPackage { + name = "plone.resourceeditor-1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; - md5 = "9041e1f52eab5b348c0dfa85be438722"; + url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; + md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Workflow policies for CMF and Plone + UNKNOWN ''; - homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; - license = "GPL"; - }; - }; - - - "plone.app.textfield-1.2.2" = self.buildPythonPackage { - name = "plone.app.textfield-1.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip"; - md5 = "f832887a40826d6f68c48b48f071fb9c"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Text field with MIME type support - ''; - homepage = "http://pypi.python.org/pypi/plone.app.textfield"; + homepage = "https://github.com/plone/plone.resourceeditor"; license = "GPL"; }; }; @@ -4406,7 +4449,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4438,15 +4481,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.collection-1.0.10" = self.buildPythonPackage { - name = "plone.app.collection-1.0.10"; + "plone.app.collection-1.0.11" = self.buildPythonPackage { + name = "plone.app.collection-1.0.11"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip"; - md5 = "1042ac059be2311d4758452a3fa4f82e"; + url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.11.zip"; + md5 = "3f97abc0cd5e370c4bbb1a73f7ee05a7"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.querywidget-1.0.8" self."plone.app.contentlisting-1.0.4" self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."archetypes.querywidget-1.0.9" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4466,7 +4509,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4478,35 +4521,17 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage { - name = "Products.PluggableAuthService-1.10.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; - md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Pluggable Zope2 authentication / authorization framework - ''; - homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; - }; - }; + "Plone" = self."Plone-4.3.2"; - - "Plone-4.3.1" = self.buildPythonPackage { - name = "Plone-4.3.1"; + "Plone-4.3.2" = self.buildPythonPackage { + name = "Plone-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip"; - md5 = "faefd5d2044a9f7660fd18388fd71a4e"; + url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip"; + md5 = "809f9fe8b8d23b49778e8ce304ea34f6"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.caching-1.1.4" self."plone.app.dexterity-2.0.8" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.1" self.setuptools self."wicked-1.1.10" ]; + propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.2" self.setuptools self."wicked-1.1.10" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4518,22 +4543,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "wicked-1.1.10" = self.buildPythonPackage { - name = "wicked-1.1.10"; + "plone.app.jquerytools-1.5.6" = self.buildPythonPackage { + name = "plone.app.jquerytools-1.5.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; - md5 = "f65611f11d547d7dc8e623bf87d3929d"; + url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip"; + md5 = "4ae9a72baa8e9899c1706b4fedbb516b"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone + jQuery Tools integration for Plone plus overlay and AJAX form helpers. ''; - homepage = "http://pypi.python.org/pypi/wicked"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; + license = "GPL version 2"; }; }; @@ -4558,95 +4583,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.formwidget.namedfile-1.0.6" = self.buildPythonPackage { - name = "plone.formwidget.namedfile-1.0.6"; + "ExtensionClass-2.13.2" = self.buildPythonPackage { + name = "ExtensionClass-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; - md5 = "afd20f030906a72fca7548876bdcbb48"; + url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Image widget for z3c.form and Plone + Metaclass for subclassable extension types ''; - homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/ExtensionClass"; + license = "ZPL 2.1"; }; }; - "plone.app.viewletmanager-2.0.3" = self.buildPythonPackage { - name = "plone.app.viewletmanager-2.0.3"; + "plone.schemaeditor-1.3.3" = self.buildPythonPackage { + name = "plone.schemaeditor-1.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip"; - md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; + url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.3.zip"; + md5 = "25a04a0bf6cd6411669dd3850a1d04b8"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.10" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - configurable viewlet manager - ''; - homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; - }; - }; - - - "Products.GenericSetup-1.7.3" = self.buildPythonPackage { - name = "Products.GenericSetup-1.7.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz"; - md5 = "c48967c81c880ed33ee16a14caab3b11"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Read Zope configuration state from profile dirs / tarballs - ''; - homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; - }; - }; - - - "plone.app.jquery-1.7.2" = self.buildPythonPackage { - name = "plone.app.jquery-1.7.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; - md5 = "e204cf45456d26217263531832b5bdac"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - jQuery integration for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = "GPL version 2"; - }; - }; - - - "plone.schemaeditor-1.3.2" = self.buildPythonPackage { - name = "plone.schemaeditor-1.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip"; - md5 = "ab9cb4e929f305063dc8f33e9a33fd21"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.autoform-1.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.autoform-1.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4658,6 +4623,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "zope.browserpage-3.12.2" = self.buildPythonPackage { + name = "zope.browserpage-3.12.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + ZCML directives for configuring browser views for Zope. + ''; + homepage = "http://pypi.python.org/pypi/zope.browserpage/"; + license = "ZPL 2.1"; + }; + }; + + "zope.structuredtext-3.5.1" = self.buildPythonPackage { name = "zope.structuredtext-3.5.1"; src = fetchurl { @@ -4778,26 +4763,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.CMFCore-2.2.7" = self.buildPythonPackage { - name = "Products.CMFCore-2.2.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; - md5 = "9320a4023b8575097feacfd4a400e930"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.3" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Zope Content Management Framework core components - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; - }; - }; - - "plone.scale__storage-1.3.2" = self.buildPythonPackage { name = "plone.scale__storage-1.3.2"; src = fetchurl { @@ -4826,7 +4791,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.i18n-2.0.8" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4898,15 +4863,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "archetypes.querywidget-1.0.8" = self.buildPythonPackage { - name = "archetypes.querywidget-1.0.8"; + "archetypes.querywidget-1.0.9" = self.buildPythonPackage { + name = "archetypes.querywidget-1.0.9"; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip"; - md5 = "3416b6b4948c624e1b5b8dd8d7e33f59"; + url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.9.zip"; + md5 = "67e51c20990bb3eefbc9e8e953d7c9f5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.6" self."plone.app.querystring-1.0.8" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4918,22 +4883,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PluginRegistry-1.3" = self.buildPythonPackage { - name = "Products.PluginRegistry-1.3"; + "Acquisition-2.13.8" = self.buildPythonPackage { + name = "Acquisition-2.13.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; + url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Configure application plugins based on interfaces + Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; - homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + homepage = "http://pypi.python.org/pypi/Acquisition"; + license = "ZPL 2.1"; }; }; @@ -5078,15 +5043,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.vocabularies-2.1.10" = self.buildPythonPackage { - name = "plone.app.vocabularies-2.1.10"; + "plone.app.vocabularies-2.1.11" = self.buildPythonPackage { + name = "plone.app.vocabularies-2.1.11"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz"; - md5 = "166a0d6f9a3e3cd753efa56aaef585be"; + url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.11.tar.gz"; + md5 = "08c773a5093780aaa27709a890f1e21f"; }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5098,6 +5063,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "DocumentTemplate-2.13.2" = self.buildPythonPackage { + name = "DocumentTemplate-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; + md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Document Templating Markup Language (DTML) + ''; + homepage = "http://pypi.python.org/pypi/DocumentTemplate"; + license = "ZPL 2.1"; + }; + }; + + "plone.registry-1.0.1" = self.buildPythonPackage { name = "plone.registry-1.0.1"; src = fetchurl { @@ -5126,7 +5111,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5158,11 +5143,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.linkintegrity-1.5.2" = self.buildPythonPackage { - name = "plone.app.linkintegrity-1.5.2"; + "plone.app.linkintegrity-1.5.3" = self.buildPythonPackage { + name = "plone.app.linkintegrity-1.5.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip"; - md5 = "f97c61da9f243391cafdfe3fe1cf6d6c"; + url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.3.zip"; + md5 = "f2eed92f433fe73b4056d3ba48ba8eb0"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -5186,7 +5171,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5226,7 +5211,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5238,22 +5223,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PythonScripts-2.13.2" = self.buildPythonPackage { - name = "Products.PythonScripts-2.13.2"; + "plone.outputfilters-1.11.1" = self.buildPythonPackage { + name = "plone.outputfilters-1.11.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; - md5 = "04c86f2c45a29a162297a80dac61d14f"; + url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.11.1.zip"; + md5 = "6b7506f09ad98621f8bb388c55183d6d"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Provides support for restricted execution of Python scripts in Zope 2. + Transformations applied to HTML in Plone text fields as they are rendered ''; - homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + homepage = "http://github.com/plone/plone.outputfilters"; + license = "GPL"; }; }; diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index a87f7eb78be..f6733ace2e8 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -82,7 +82,7 @@ } }, { "name": "Plone", - "extends": "http://dist.plone.org/release/4.3.1/versions.cfg", + "extends": "http://dist.plone.org/release/4.3.2/versions.cfg", "doCheck": false, "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .", "override": { @@ -122,8 +122,5 @@ ] } } - }, - { "name": "Distutils2", - "doCheck": false } ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dea65b5fe51..205abaa14be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1259,7 +1259,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ sphinx ]; }; - googlecl = buildPythonPackage rec { version = "0.9.14"; name = "googlecl-${version}"; @@ -1280,6 +1279,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ gdata ]; }; + gtimelog = buildPythonPackage rec { + name = "gtimelog-0.8.1"; + src = fetchurl { + url = https://launchpad.net/gtimelog/devel/0.8.1/+download/gtimelog-0.8.1.tar.gz; + sha256 = "010sbw4rmslf5ifg9bgicn0f6mgsy76v8218xi0jndi9z6pva7y6"; + }; + propagatedBuildInputs = [ pygtk ]; + meta = with stdenv.lib; { + description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible."; + homepage = http://mg.pov.lt/gtimelog/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ocharles ]; + platforms = platforms.unix; + }; + }; logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.1"; @@ -2189,17 +2203,18 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - - flexget = buildPythonPackage (rec { - name = "FlexGet-1.0.3353"; + flexget = buildPythonPackage rec { + name = "FlexGet-1.1.121"; src = fetchurl { - url = "http://download.flexget.com/archive/${name}.tar.gz"; - md5 = "cffc4e51b5c5efddb339d265524e46b8"; + url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; + md5 = "44521bcbc2c1e941b656ecfa358adcaa"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ]; + propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil + beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge + python_tvrage jsonschema ]; meta = { homepage = http://flexget.com/; @@ -2207,8 +2222,51 @@ pythonPackages = modules // import ./python-packages-generated.nix { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; + }; + + python_tvrage = buildPythonPackage (rec { + version = "0.4.1"; + name = "tvrage-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-tvrage/python-tvrage-${version}.tar.gz"; + md5 = "cdfec252158c5047b626861900186dfb"; + }; + + # has mostly networking dependent tests + doCheck = false; + propagatedBuildInputs = [ beautifulsoup ]; + + meta = { + homepage = https://github.com/ckreutzer/python-tvrage; + description = "Client interface for tvrage.com's XML-based api feeds"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; }); + jsonschema = buildPythonPackage (rec { + version = "2.0.0"; + name = "jsonschema-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz"; + md5 = "1793d97a668760ef540fadd342aa08e5"; + }; + + buildInputs = [ nose mock ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = https://github.com/Julian/jsonschema; + description = "An implementation of JSON Schema validation for Python"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); flup = buildPythonPackage (rec { name = "flup-1.0.2"; @@ -2553,10 +2611,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; ipdbplugin = buildPythonPackage { - name = "ipdbplugin-1.2"; + name = "ipdbplugin-1.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz"; - md5 = "39169b00a2186b99469249c5b0613753"; + url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; + md5 = "f9a41512e5d901ea0fa199c3f648bba7"; }; propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipython ]; }; @@ -3334,17 +3392,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); nose = buildPythonPackage rec { - name = "nose-1.3.0"; + version = "1.3.0"; + name = "nose-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf"; }; - meta = { - description = "A unittest-based testing framework for python that makes writing and running tests easier"; - }; - buildInputs = [ coverage ]; doCheck = ! stdenv.isDarwin; @@ -3353,6 +3408,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { '' else "" + '' ${python}/bin/${python.executable} selftest.py ''; + + meta = { + description = "A unittest-based testing framework for python that makes writing and running tests easier"; + }; }; nose2 = if isPy26 then null else (buildPythonPackage rec { @@ -4113,13 +4172,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyblock = stdenv.mkDerivation rec { - name = "python-pyblock-${version}"; - version = "0.52-1"; + name = "pyblock-${version}"; + version = "0.53"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/pyblock.git/snapshot/" - + "pyblock-${version}.tar.bz2"; - sha256 = "1jj5hd1dcr8xx00rg3jynsf4ak88wwr5id3fmb0qf6zvim1whj7l"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "f6d33a8362dee358517d0a9e2ebdd044"; }; postPatch = '' @@ -4348,12 +4407,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { pykickstart = buildPythonPackage rec { name = "pykickstart-${version}"; - version = "1.99.32-1"; + version = "1.99.39"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/pykickstart.git/snapshot/" - + "r${version}.tar.bz2"; - sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + + "${name}.tar.gz/${md5}/${name}.tar.gz"; + md5 = "d249f60aa89b1b4facd63f776925116d"; }; postPatch = '' @@ -5107,10 +5166,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { selenium = buildPythonPackage rec { - name = "selenium-2.25.0"; + name = "selenium-2.35.0"; src = pkgs.fetchurl { - url = http://pypi.python.org/packages/source/s/selenium/selenium-2.25.0.tar.gz; - sha256 = "0iinpry1vr4dydh44sc0ny22sa9fqhy2302hf56pf8fakvza9m0a"; + url = "http://pypi.python.org/packages/source/s/selenium/${name}.tar.gz"; + sha256 = "0c8apd538ji8kmryvcdiz0dndf33mnf8wzpp9k8zmkpmfdfcwnk0"; }; buildInputs = [pkgs.xlibs.libX11]; @@ -5200,6 +5259,118 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + sigal = buildPythonPackage rec { + name = "sigal-0.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; + md5 = "93c93725674c0702583a638f5a09c9e4"; + }; + + propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh ]; + + meta = with stdenv.lib; { + description = "Yet another simple static gallery generator"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.mit; + maintainers = [ maintainers.iElectric ]; + }; + }; + + pilkit = buildPythonPackage rec { + name = "pilkit-1.1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pilkit/${name}.tar.gz"; + md5 = "659dd67440f4b576889f2cd350f43d7b"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' + ''; + + # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 + doCheck = false; + + buildInputs = [ pillow nose_progressive nose mock blessings ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + clint = buildPythonPackage rec { + name = "clint-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz"; + md5 = "7dcd43fb08bfb84c7d63e9356ada7b73"; + }; + + checkPhase = '' + nosetests + ''; + + buildInputs = [ pillow nose_progressive nose mock blessings nose ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + argh = buildPythonPackage rec { + name = "argh-0.23.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz"; + md5 = "25bb02c6552b42875f2c36714e0ff16c"; + }; + + preCheck = '' + export LANG="en_US.UTF-8" + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + ''; + + buildInputs = [ pytest py mock ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + nose_progressive = buildPythonPackage rec { + name = "nose-progressive-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose-progressive/${name}.tar.gz"; + md5 = "180be93929c5962044a35489f193259d"; + }; + + buildInputs = [ pillow blessings nose ]; + propagatedBuildInputs = [ modules.curses ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + blessings = buildPythonPackage rec { + name = "blessings-1.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/blessings/${name}.tar.gz"; + md5 = "fbbddbf20b1f9a13e3fa612b1e086fd8"; + }; + + # 4 failing tests + doCheck = false; + + buildInputs = [ nose modules.curses ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; @@ -7020,16 +7191,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { pypi2nix = pythonPackages.buildPythonPackage rec { - rev = "e85eb9e75e7290c17e89822d6a5c1c52c1b59269"; + rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003"; name = "pypi2nix-1.0_${rev}"; src = pkgs.fetchurl { url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0wk9019pgpc2467819cz98fdvihjkpihlh1yywfxlvn04ymb315q"; + sha256 = "1fv85x2bz442iyxsvka2g75zibjcq48gp2fc7szaqcfqxq42syy9"; }; - propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; doCheck = false; meta = { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 1de3a8aff8b..2453712584a 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1166,7 +1166,6 @@ let monodoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; monotone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; monotoneViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mountall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozplugger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a9a45b9d57a..8c74ab344a8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -217,8 +217,6 @@ let ncat = linux; netcat = all; nfsUtils = linux; - nix = all; - nixUnstable = all; nmap = linux; nss_ldap = linux; nssmdns = linux;