Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
abiword	abiword: update from 3.0.0 to 3.0.1	2015-01-18 18:20:28 +01:00
antiword
basket
calligra	calligra: fix dependencies, and add several new ones	2015-01-11 17:03:14 +02:00
eventlist	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnucash	gnucash: delete icon theme cache	2014-09-27 13:48:09 +02:00
gnumeric	Update gnumeric	2014-12-03 09:12:39 +01:00
hledger-interest	haskell-hledger-interest: update to version 1.4.4	2015-01-08 20:17:04 +01:00
hledger-irr	hledger-irr: broken by hledegr 0.24.	2015-01-08 20:17:04 +01:00
homebank	Updating homebank to 4.6.3.	2014-09-01 12:59:34 +02:00
impressive	unmaintain a bunch of packages	2015-01-13 22:33:49 +01:00
kbibtex
keepnote	Revert "keepnote: add myself as a maintainer"	2014-09-18 10:44:01 +02:00
kmymoney
ledger	Fix license attribute of many bsd-like licensed packages	2014-12-21 00:00:35 +01:00
libreoffice	fix 404 URLs (close #6105)	2015-02-02 22:05:51 +01:00
mendeley	restrict platforms to Linux	2015-01-25 12:27:53 -05:00
mmex	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
pinpoint	Add Pinpoint presentation software	2014-11-06 20:50:40 -07:00
scribus	scribus: update from 1.4.3 to 1.4.4	2014-11-05 23:59:11 +00:00
skrooge	skrooge: add boost dependency	2014-12-17 20:13:45 +01:00
tagainijisho	tagainijisho: new derivation	2014-10-14 01:42:23 +01:00
todo.txt-cli
zanshin
zim	zim: update from 0.61 to 0.62	2014-11-26 13:08:01 +00:00
zotero	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00