nixpkgs-suyu/pkgs/applications/office
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
abiword abiword: add libjpeg to fix the compilation 2011-08-08 12:11:46 +00:00
antiword antiword: patch source code so that the tool can find it's data files 2011-08-31 12:06:27 +00:00
basket Add kde4.basket 2012-01-06 00:55:30 +00:00
gnucash * GnuCash updated to 2.4.8. 2011-12-06 18:44:05 +00:00
hledger-interest haskell-hledger-interest: updated to version 1.4 2012-02-03 21:00:16 +00:00
homebank
impressive * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
keepnote * keepnote: depend on pythonPackages.sqlite3 rather than pythonFull. 2011-03-28 16:48:31 +00:00
kmymoney kmymoney-4.6.1 2012-01-08 19:29:17 +00:00
koffice
ledger ledger3: updated to current HEAD 2012-01-21 19:25:50 +00:00
mmex * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
openoffice I revert the previous change to libreoffice. 2012-01-27 15:14:29 +00:00
scribus Updating scribus to 1.4.0rc6. The developers say they abandoned 1.3 long ago. 2011-11-02 15:00:11 +00:00
skrooge Add skrooge 2012-01-08 19:29:28 +00:00
zanshin Add skrooge 2012-01-08 19:29:28 +00:00