3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

581 commits

Author SHA1 Message Date
Thomas Tuegel 3d919a002d zotero: build standalone from cross-platform XPI with latest firefox 2015-01-24 13:42:19 -06:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Pascal Wittmann 58513cc380 abiword: update from 3.0.0 to 3.0.1 2015-01-18 18:20:28 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Evgeny Egorochkin 9aeb2cdc2b calligra: fix dependencies, and add several new ones 2015-01-11 17:03:14 +02:00
Jos van den Oever ad2a2c0986 Better description for calligra. Closes #5666.
It now names the applications so they can be found more easily.
2015-01-09 19:03:15 +02:00
Peter Simons d05329620f hledger-irr: broken by hledegr 0.24. 2015-01-08 20:17:04 +01:00
Peter Simons 96a94276c7 haskell-hledger-interest: update to version 1.4.4 2015-01-08 20:17:04 +01:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Michael Raskin f329eb0137 LibreOffice: install icons 2015-01-01 01:39:31 +03:00
Michael Raskin d7bc5835c8 LibreOffice: 4.3.3.2->4.3.5.2 2014-12-31 23:19:29 +03:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Evgeny Egorochkin 7a726a9b02 kde4.calligra: update from 2.8.6 to 2.8.7 2014-12-19 08:38:52 +02:00
Domen Kožar 179c7344cc skrooge: add boost dependency 2014-12-17 20:13:45 +01:00
Thomas Tuegel 23b387236d zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:49:34 -06:00
Bjørn Forsman 64661f0597 libreoffice: fix Exec= in .desktop files
Before we do substitutions, the Exec= line is (currently)
"Exec=libreofficedev4.3 --some-arg". Our substitution logic doesn't handle
that, resulting in broken "Exec=$out/bin/sofficedev4.3 --some-arg"
($out/bin/sofficedev4.3 doesn't exist).

Looking at libreoffice source, the .desktop files refer to a UNIXBASISROOTNAME
variable which come from instsetoo_native/util/openoffice.lst.in. Currently, it
can have one of two values, presumably depending on whether the build is
"normal" or "development":

  libreoffice${major}.${minor}

  libreofficedev${major}.${minor}

Handle both these cases, and also leave the old non-versioned substitution
around, just in case.

Fixes issue #3463.
2014-12-14 18:05:24 +01:00
Michael Raskin b4084d4913 Just use old glm for LO, the rest of LO is not keen on using C++ git add -A 1 2014-12-05 10:51:40 +03:00
Michael Raskin 761e5309b5 Set c++11 standard for LibreOffice build - needed by glm 2014-12-05 09:42:06 +03:00
Thomas Tuegel 5c9de38488 zotero: use private firefox and xulrunner
Zotero breaks every time firefox is updated (about every six weeks). It
is always fixed with the next zotero update, but that can take weeks.
Sometimes, upstream even skips firefox releases. This will stop zotero
breaking every time.
2014-12-04 09:40:57 -06:00
Jos van den Oever f12e2d1e66 Update gnumeric
goffice is also updated. goffice is maintained by the gnumeric people
and released in sync with gnumeric. gnumeric 1.12.x corresponds to
goffice 0.10.x.
2014-12-03 09:12:39 +01:00
Vincent Laporte bc95472fb7 skrooge: update from 1.3.2 to 1.10.0 2014-12-02 19:28:11 +01:00
Vincent Laporte 1bd68c4478 zim: update from 0.61 to 0.62 2014-11-26 13:08:01 +00:00
Jos van den Oever 5611996172 Update Calligra to 2.8.6. 2014-11-24 16:26:37 +01:00
Michael Raskin 45387d7143 Apparently there is no need to unpack the tarballs on our own as LibreOffice would prefer to unpack them on its own and sometimes fails if we do unpack them 2014-11-09 15:18:12 +03:00
Domen Kožar 555a094326 fix libreoffice build 2014-11-08 14:24:32 +01:00
Moritz Ulrich df995253e3 ledger3: Update to 3.1
This commit also adds pkgs.ledger2 and pkgs.ledger3 plus a default
attribute pkgs.ledger pointing at ledger3.
2014-11-07 16:29:15 +01:00
Brian McKenna f8dd99cf83 Add Pinpoint presentation software 2014-11-06 20:50:40 -07:00
Vincent Laporte 9ad81702f7 scribus: update from 1.4.3 to 1.4.4 2014-11-05 23:59:11 +00:00
John Wiegley a4ee94b741 boost: correct the install names for darwin
This also makes the recent change for ledger unnecessary.
2014-11-04 02:28:35 -06:00
John Wiegley d9de60d1bd ledger3: reference the right lib directory... 2014-11-04 00:09:55 -06:00
John Wiegley 28d0908bfb ledger3: On darwin, change boost lib paths to absolute references 2014-11-04 00:06:26 -06:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Michael Raskin b61d8d620f Update LibreOffice 2014-11-04 00:37:43 +03:00
William A. Kennington III a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Domen Kožar 20a7c54c87 zotero: upgrade to fix xulrunner compatibility 2014-10-22 20:51:10 +02:00
Vincent Laporte a50da1bfc8 tagainijisho: new derivation
Tagaini Jisho is a free, open-source Japanese dictionary and kanji
lookup tool that aims at becoming your Japanese study assistant.

Homepage: http://www.tagaini.net/

Closes #4509
2014-10-14 01:42:23 +01:00
Domen Kožar bbf3a18746 Revert "tagainijisho: new derivation"
This reverts commit d62b63d319.

Fails to download dependencies. See http://hydra.nixos.org/build/15845724
2014-10-13 21:29:18 +02:00
Vincent Laporte d62b63d319 tagainijisho: new derivation
Tagaini Jisho is a free, open-source Japanese dictionary and kanji
lookup tool that aims at becoming your Japanese study assistant.

Homepage: http://www.tagaini.net/
2014-10-13 02:55:35 +01:00
Luca Bruno b86fdea43e gnucash: delete icon theme cache 2014-09-27 13:48:09 +02:00
Pascal Wittmann 239760ab98 abiword: update from 2.8.6 to 3.0.0 and adopt it 2014-09-26 22:26:32 +02:00
Domen Kožar 505400eafe ledger3: fix hash 2014-09-26 15:38:41 +02:00
John Wiegley c436d3d045 ledger: 3.0.2 -> 3.0.4 2014-09-23 08:21:38 -05:00
William A. Kennington III 2de4144bf7 More boost fixes 2014-09-22 19:57:15 -07:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
lethalman 8f8f99bcc8 Revert "keepnote: add myself as a maintainer" 2014-09-18 10:44:01 +02:00
Longrin Wischnewski 23db66e792 keepnote: add myself as a maintainer 2014-09-18 08:24:55 +02:00
Pascal Wittmann 701cd70502 zim: fixed build; it also runs find now but the solution is hacky 2014-09-04 23:54:14 +02:00
Thomas Tuegel ad83a961ae zotero: update to 4.0.22
Drop firefox-30.0, which we were only keeping around for
xulrunner-30.0. New Zotero version is compatible up to firefox-32.0.
2014-09-04 11:52:24 -05:00
Raymond Gauthier 7727a3fe1d Added support for minimal zim desktop wiki package. 2014-09-02 02:07:23 +04:00
Lluís Batlle i Rossell ba0c5e7b9e Updating homebank to 4.6.3. 2014-09-01 12:59:34 +02:00
Michael Raskin 43654cba2c Update LibreOffice to 4.3.1 2014-08-30 18:47:02 +04:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Vladimír Čunát 05b4882255 zotero: add check to detect xul version breakages 2014-08-15 02:03:52 +02:00
Vladimír Čunát 36a9fb094f merge #3462: zotero update and resurrect xulrunner 2014-08-15 01:55:56 +02:00
Michael Raskin d06eef88c9 Update libreoffice to the version 4.3.0.4
Also update its dependencies.

Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0

These updates are require by LO update and also require each other.

Note that many of these libraries now require librevenge.

In LibreOffice expression per se:

- Note that liborcus is built separately because it wants Boost to be
  specified in a way that main LO build doesn't ensure.

- libixion from 0.7.0 tarball has libixion-0.8 package version.

- libgltf is in src/libgltf but listed in download.lst without any
  comments.

- Make variable with the name libreoffice-translations-${version}.tar.xz
  and the same value is inserted; the same for -help-. Fetching gives
  a strange error without that. Apparently everyone just builds git
  checkouts.

- There are some conditionals in download.lst that require manual
  handling. I am not sure there is a simple way to process them in
  generate-libreoffice-srcs.sh.
2014-08-12 01:49:54 +04:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Thomas Tuegel 77c99b10fc zotero: version bump 4.0.21.1 -> 4.0.21.2 2014-08-04 05:56:58 -05:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin a72bb396a2 Do not create unneeded local-scope packages; disable a failing test
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
2014-06-28 23:33:42 +04:00
Michael Raskin 7788afd571 Libreoffice update: not succesful yet 2014-06-27 16:37:34 +04:00
Bjørn Forsman ba9254fcf3 abiword: add to channel 2014-06-23 12:54:46 +02:00
Bjørn Forsman 5dea7f0ed5 abiword: fix typo in description (Microsof -> Microsoft) 2014-06-23 12:45:13 +02:00
Thomas Tuegel e07fde4017 Update zotero 4.0.20 -> 4.0.21.1 2014-06-20 08:00:06 -05:00
Robert Stark 53ab15b560 keepnote: update to version 0.7.8 2014-05-18 13:43:21 +02:00
Thomas Tuegel 3a9917bf18 zotero: version bump 4.0.19 -> 4.0.20 (close #2581) 2014-05-08 22:31:56 +02:00
Peter Simons 2b11ec44e8 haskell-hledger-irr: update to version 0.1.1.4 2014-05-03 10:53:21 +02:00
Vladimír Čunát d4e1bd4aa6 libreoffice: fix build after mesa update
This is because it uses vanilla pkgconfig,
so it needs Reqires.private deps from mesa during configuration.
2014-05-01 13:08:05 +02:00
Peter Simons b9921ab08a ledger-3.0.nix: cosmetic fix of syntax highlighting in Emacs 2014-05-01 12:58:30 +02:00
Peter Simons c10a424bdd ledger-2.6.3: rename the derivation to "ledger2" to allow installing
this version instead of ledger 3.x (which doesn't support reading
GNUCash files)

Discussed in <https://github.com/NixOS/nixpkgs/pull/2305>.
2014-05-01 12:56:45 +02:00
John Wiegley 5c18bbe34f Update ledger expression, add myself as a maintainer 2014-04-17 21:47:15 -05:00
Luca Bruno 8dbdebb50f gnumeric: fix gsettings schemas 2014-04-17 13:42:51 +02:00
Thomas Tuegel 5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00
Vladimír Čunát db9599c4a0 gnumeric: minor update 1.12.9 -> .12 2014-03-13 22:55:52 +01:00
Vladimír Čunát 73eead9f13 libreoffice: add deps needed now (libXdmcp, libpthreadstubs)
Configure phase passes now.
2014-03-08 21:25:30 +01:00
Evgeny Egorochkin 2291ae241c homebank: update from 4.5.4 to 4.5.5 2014-03-01 05:25:28 +02:00
Cillian de Róiste 9f08c21c2b gnucash: enable aqbanking support for online banking
This requires recent versions of aqbanking and gwenhywfar:
https://devel.aqbanking.de/trac/aqbanking/ticket/197

It seems as if the developers have changed their version numbering
scheme in 2012 and have only released versions with the "beta" suffix
since then.
2014-02-23 12:21:32 +01:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Evgeny Egorochkin 279e4e0a06 kde4.kmymoney: update from 4.6.2 to 4.6.4, add documentation 2014-02-13 19:09:47 +02:00
Nixpkgs Monitor 65fe5331f4 kde4_next.calligra: update from 2.7.2 to 2.7.5 2014-02-05 20:23:07 +02:00
Eelco Dolstra f03ca20916 libreoffice: Fix path to the JDK 2014-01-25 18:29:21 +01:00
Eelco Dolstra 07a3993e14 libreoffice: Fix path to Ant 2014-01-25 14:19:42 +01:00
Peter Simons 4664108f8e gnucash: revert update from 2.4.15 to 2.6.0
The 2.6.0 version doesn't compile, and the error doesn't seem to be easy to fix.
2014-01-16 20:35:26 +01:00
Shea Levy 32721cd3df Add todo.txt-cli, a cli todo list manager
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-15 19:44:37 -05:00
Lluís Batlle i Rossell 8e70746d61 homebank: update to 4.5.4. 2014-01-15 21:17:55 +01:00
Peter Simons 93b9b7a39f gnucash: update from 2.4.15 to 2.6.0 2014-01-15 17:29:14 +01:00
Peter Simons 0a9e4d0ccc gnucash: update to version 2.4.15 2014-01-13 17:05:45 +01:00
Moritz Ulrich 93d73aec51 ledger3: Update to latest git (3b5f496536). 2014-01-10 00:38:32 +00:00
Vladimír Čunát 9f735bdf57 gnumeric: add platforms, maintainer 2013-12-28 15:49:19 +01:00
Vladimír Čunát a126ce011a gnumeric: add schemas and icons, refactor
Also move goffice under gnome3,
as it's released in the same way.
2013-12-28 15:45:20 +01:00
Moritz Ulrich 5331088ba1 ledger3: Update to latest git (8d38060968) 2013-12-28 00:57:17 +00:00
Nixpkgs Monitor 270acdc682 gnumeric: update from 1.12.0 to 1.12.9, potentially fixes CVE-2013-6836 2013-12-21 18:13:03 +02:00
Nixpkgs Monitor 59c3fb01f5 scribus: update from 1.4.1 to 1.4.3 2013-12-21 02:28:28 +02:00
Nixpkgs Monitor d315309339 impressive: update from 0.10.2 to 0.10.3 2013-12-18 18:18:32 +02:00
Peter Simons b7e3905d28 haskell-hledger-irr: update to version 0.1.1.3 2013-12-14 22:08:27 +01:00
Moritz Ulrich 9b609beec1 Ledger3: Update to latest git.
Works good here.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-27 01:53:06 +01:00
Eelco Dolstra 359e2e3add gnucash: Enable support for Finance::Quote 2013-11-16 17:29:55 +01:00
Matija Šuklje c8a9b0069f Eventlist: Renamed accordingly and fixed the description. 2013-10-07 00:26:27 +02:00
Matija Šuklje 4f74888a9f Eventlist: First working package 0.6.96.
Added boost as buildInputs.
Removed uneeded doCheck.
2013-10-06 23:57:16 +02:00
Matija Šuklje 525a6fc8a8 Eventlist: Added more dependencies. 2013-10-06 22:09:35 +02:00
Matija Šuklje 5a70214bb5 Merge branch 'eventlist' 2013-10-06 21:29:19 +02:00
Matija Šuklje 5b4a8ff6cc Eventlist: Updated version to 0.6.96. 2013-10-06 21:27:23 +02:00
Matija Šuklje 28a1e45ec7 Added proper dependencies. 2013-10-06 21:20:24 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Matija Šuklje 12470a0499 Fixed the sha line. 2013-09-30 00:22:31 +02:00
Matija Šuklje 3abea9036c Changed the hash checker to sha256 and fixed (hopefully) all-packages.nix. 2013-09-29 15:30:08 +02:00
Matija Šuklje f2000007b3 New package started, should not work yet. 2013-09-28 02:45:20 +02:00
Evgeny Egorochkin 8b9269ef66 libreoffice: unbreak .desktop files. Hopefully fixes nixos/nixos#252. 2013-09-18 10:11:54 +03:00
Domen Kožar cf9601dff7 libreoffice: fix build 2013-09-15 00:38:09 +02:00
Domen Kožar 784bda6d30 libreoffice: don't build all languages until we use multiple-outputs to minimize disk usage 2013-09-14 21:49:35 +02:00
Moritz Ulrich bf9b36b616 ledger3: Don't run tests on Darwin (they fail).
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
close #914
2013-09-06 16:17:15 +02:00
Peter Simons e55c0bcaaa Merge pull request #911 from the-kenny/ledger3
Ledger 3: Update to latest git & fixes
2013-09-04 02:08:36 -07:00
Moritz Ulrich b77be3f3fe ledger3: Install emacs-lisp files manually.
Build process is currently broken for emacs lisp files.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-04 00:46:08 +02:00
Moritz Ulrich a7ba6d655d ledger3: Use short git rev.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-04 00:45:06 +02:00
Rickard Nilsson d5881add32 libreoffice: Put .desktop-files in correct place 2013-09-03 08:41:52 +02:00
Domen Kožar 43f965f50e libreoffice: correct python version 2013-09-01 20:00:48 +02:00
Domen Kožar 91e98c269f libreoffice: specify number of build cores 2013-09-01 19:56:02 +02:00
Domen Kožar 5e8fbb3dc4 libreoffice: correctly pick python executable 2013-09-01 19:56:01 +02:00
Moritz Ulrich 06f80c77e2 Update ledger3 to latest HEAD.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-01 14:23:56 +02:00
Domen Kožar 670be4c4bc libreoffice: more configure phase dependencies 2013-09-01 12:30:17 +02:00
Domen Kožar 7caf3daafa libreoffice: add missing deps 2013-09-01 11:10:40 +02:00
Domen Kožar 0f06117349 libreoffice: fix eval 2013-09-01 09:59:58 +02:00
Domen Kožar ef8a149b6f libreoffice: 3.6.6.2 -> 4.0.5.2 2013-09-01 01:57:58 +02:00
Evgeny Egorochkin b86b1b81f5 Calligra: update to 2.7.2 2013-08-23 19:01:18 +03:00
Danylo Hlynskyi 21bd48f439 Add convenient executable name to libreoffice
... so you can run libreoffice from command-line with `libreoffice` instead of `soffice`
2013-08-23 17:14:44 +03:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Mathijs Kwik 04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Mathijs Kwik 6937609391 clucene_core: upgrade some packages to clucene_core_2
on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs.
so perhaps we can soon drop v1?
2013-07-01 07:52:13 +02:00
Shea Levy f3f447ac6f ledger3: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-28 20:16:39 -04:00
Peter Simons 819dbd2539 haskell-hledger-irr: add version 0.1.1.2 2013-06-22 15:41:37 +02:00
Peter Simons d815e5eba2 gnucash: fix build (by removing the obsolete potfiles patch) 2013-06-18 13:11:03 +02:00
Domen Kozar cd1b531867 gnucash: add me as maintainer 2013-06-18 13:04:05 +02:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Peter Simons e049b5b972 gnucash: update to version 2.4.13 2013-06-15 11:53:13 +02:00
Mathijs Kwik a479aafb75 Revert "Fixing LibreOffice configure for now"
This reverts commit 9e4bee5270.
2013-06-05 22:51:21 +02:00
Michael Raskin 9e4bee5270 Fixing LibreOffice configure for now 2013-06-04 20:00:13 +04:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Lluís Batlle i Rossell a6781e121f libreoffice: update from 3.6.2.2 to 3.6.6.2 2013-05-13 16:07:01 +02:00
Evgeny Egorochkin f948351946 Calligra: update to 2.5.5 this time for real 2013-05-10 16:36:12 +03:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Evgeny Egorochkin 0223566f6e Calligra: bump to 2.5.5. Should be a bugfix release with no surprises. 2013-05-08 18:46:17 +03:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Evgeny Egorochkin d32fafc9e4 Calligra: fix build with KDE 4.10 2013-05-07 17:23:46 +03:00
Evgeny Egorochkin eb4c9efb50 KOffice: superceded by Calligra long time ago. Removing. 2013-05-07 09:27:23 +03:00
Peter Simons ddbcefd927 haskell-hledger-interest: update to version 1.4.3 2013-05-03 11:38:52 +02:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Peter Simons c9182f112a ledger: update 3.x version to the latest Git snapshot 2013-04-21 20:37:53 +02:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Vladimír Čunát c8b940072d koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Vladimír Čunát 60e52fd8db gnucash: fix for new intltool 2013-02-16 15:35:14 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Rickard Nilsson cb4c42e9c3 gnumeric: Update to 1.12.0
Also update dependencies (goffice, libgsf) to required versions.
2013-02-06 01:26:24 +01:00
Eelco Dolstra be412fc789 Rename openoffice directory to libreoffice 2013-01-29 12:43:53 +01:00
Eelco Dolstra 6dba65b51f openoffice: Remove
It's superseded by LibreOffice and doesn't build anymore.
2013-01-29 12:43:53 +01:00
Peter Simons b5ce83d38d ledger-2.6.3: update the location of the source code tarball some more
I found the original tarball at a different URL. This one doesn't
require Autoconf et al to compile.
2013-01-28 18:05:54 +01:00
Peter Simons bb7a5a1a9e ledger-2.6.3: update location of the source code tarball
The source code tarball we used to rely on has disappeared.
2013-01-28 18:00:11 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
aszlig c6dd35c2ac
abiword: Enable parallel building.
Shouldn't take _that_ long to build, but I was impatient during fixing the
build and it doesn't hurt anyway, does it?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
aszlig c91662f979
abiword: Fix glib/gdx_pixbuf related build errors.
A bunch of these includes expect extra prefixes which we don't have in Nix, so
we are going to batch-fix them with sed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons 94acd42209 haskell-hledger-interest: update to version 1.4.2 2012-11-26 15:32:13 +01:00
Eelco Dolstra b713d13bb4 gnucash: Update to 2.4.11 2012-10-09 11:24:38 -04:00
Michael Raskin 3ab23d9542 LibreOffice 3.6.2.2 bugfix update. 2012-10-05 00:50:02 +04:00
Lluís Batlle i Rossell 510b86f387 libreoffice: trying to enable parallel building
I use the nix approach about the number of cores, as enableParallelBuilding.
2012-09-03 15:53:07 +02:00
Lluís Batlle i Rossell a683b2f6b4 libreoffice: update to 3.6.1.2
I've not tried if it works; I'll revert it if it fails.
2012-09-03 15:10:37 +02:00
Yury G. Kudryashov 7a9def2829 LibreOffice-3.6.0.4
* Use more system libraries
* Enable KDE4 desktop integration
* Split preparation between postUnpack, patchPhase and preConfigure

Viric, feel free to revert (parts of) this commit.
2012-08-31 12:11:41 +04:00
Yury G. Kudryashov ebf190e793 calligra-2.5.0 2012-08-31 12:08:31 +04:00
Yury G. Kudryashov 97c6a2fd4f skrooge-1.3.2 2012-08-31 12:08:04 +04:00
Lluís Batlle i Rossell 87a3bcd470 libreoffice: trying to make it build with openjdk 2012-08-24 09:20:53 +02:00
Vladimír Čunát cf3ea80e1f Scribus minor update, modifying dependencies.
- using the boostHeaders dep to build scribus with 2geom (internal)
- adding more xorg deps to build with XCB support
2012-08-07 17:41:18 +02:00
Yury G. Kudryashov 7ad2658f83 zanshin-0.2.1, fix advertised version
svn path=/nixpkgs/trunk/; revision=34491
2012-06-13 07:09:07 +00:00
Yury G. Kudryashov 63deb1d30a skrooge-1.3.0
svn path=/nixpkgs/trunk/; revision=34406
2012-06-09 13:09:53 +00:00
Yury G. Kudryashov baff5fc9f3 calligra-2.4.2
svn path=/nixpkgs/trunk/; revision=34405
2012-06-09 13:09:50 +00:00
Yury G. Kudryashov f6e6e4287d Add kbibtex
svn path=/nixpkgs/trunk/; revision=34404
2012-06-09 13:09:45 +00:00
Peter Simons 272753809c haskell-hledger-interest: updated to version 1.4.1
svn path=/nixpkgs/trunk/; revision=34285
2012-05-29 20:47:29 +00:00
Andres Löh 854ebba387 Whitespace.
svn path=/nixpkgs/trunk/; revision=34274
2012-05-29 14:02:31 +00:00
Andres Löh 4e10015cab Added gnumeric.
svn path=/nixpkgs/trunk/; revision=34272
2012-05-29 12:21:33 +00:00
Lluís Batlle i Rossell 45b546c83d It looks like libreoffice was still providing a catalan interface for en_US
locale users.
I was told en_US was always included, but it seems like not so.


svn path=/nixpkgs/trunk/; revision=33496
2012-03-31 13:53:34 +00:00
Yury G. Kudryashov ea335bb574 Calligra-2.4 RC2
Blind commit. Let Hydra build it.

svn path=/nixpkgs/trunk/; revision=33391
2012-03-24 06:35:16 +00:00
Eelco Dolstra acf3b221a7 * Make English the default language for LibreOffice.
svn path=/nixpkgs/trunk/; revision=33352
2012-03-22 10:44:57 +00:00
Lluís Batlle i Rossell 2ce433c26c Removing go-oo. It neither builds neither upstream continues it.
svn path=/nixpkgs/trunk/; revision=33314
2012-03-20 22:19:48 +00:00
Lluís Batlle i Rossell 1677493301 Libreoffice wants a newer libvisio.
svn path=/nixpkgs/trunk/; revision=33126
2012-03-15 21:41:40 +00:00
Lluís Batlle i Rossell 8849219c81 Trying to update libreoffice to the version today released. Cross fingers; we can revert this, if it does not work.
svn path=/nixpkgs/trunk/; revision=33117
2012-03-15 19:50:23 +00:00
Lluís Batlle i Rossell 6fe531299e Avoiding the wrapper in libreoffice, and trying to use '-lcups'.
svn path=/nixpkgs/trunk/; revision=33113
2012-03-15 16:45:04 +00:00
Lluís Batlle i Rossell 3337fa7b87 Adding the cups lib path to ld_libraray_path for libreoffice to be able to
print with cups.

That would have been also the fix for go-oo for this problem, I think.


svn path=/nixpkgs/trunk/; revision=33112
2012-03-15 16:38:24 +00:00
Lluís Batlle i Rossell 1ebf45400a Making more symlinks in libreoffice.
svn path=/nixpkgs/trunk/; revision=33105
2012-03-15 11:29:13 +00:00
Lluís Batlle i Rossell 5c0c0ff632 Adding a '$out/bin/soffice' link to the libreoffice soffice binary.
svn path=/nixpkgs/trunk/; revision=33104
2012-03-15 11:02:52 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
2012-03-14 22:44:52 +00:00
Lluís Batlle i Rossell fd1867ec92 The libreoffice expression needs the 'help' package, or it fails on install.
(or pass --disable-help, I think).

Thus, the fontconfig tests now pass, I remove the disabletests patch.

I also removed some configure options that configure did not understand
anymore. They were picked from older openoffice expressions.


svn path=/nixpkgs/trunk/; revision=33087
2012-03-14 21:51:33 +00:00
Lluís Batlle i Rossell a288984843 Fixing another script shebang in libreoffice. And the lang configure parameter.
svn path=/nixpkgs/trunk/; revision=33074
2012-03-14 18:51:59 +00:00
Lluís Batlle i Rossell 73f9e302a0 I think libreoffice does not want the 'en-US' language anymore.
svn path=/nixpkgs/trunk/; revision=33071
2012-03-14 17:49:23 +00:00
Lluís Batlle i Rossell 3418970f3b Making libreoffice have a configured fontconfig. I hope this will make some cppunit tests work, and thus we would not need to disable them.
I update the patch that disables tests with one more test disabled, but I don't
use it because I hope the build with fonts.conf will work fine. If that is the case,
I'll remove the patch file later. If the fonts.conf trick does not work, I may want
to extend the patch to disable all failing cases.


svn path=/nixpkgs/trunk/; revision=33062
2012-03-14 09:40:26 +00:00
Lluís Batlle i Rossell 63b934c36f Next attempt at building libreoffice. I reached it to build it in the build environment,
but I don't know if make install will succeed.

I also added the translations, that could work with luck.

I removed the force field.


svn path=/nixpkgs/trunk/; revision=33048
2012-03-13 21:23:25 +00:00
Lluís Batlle i Rossell 1b7e6447f9 Fix for an early build failure of libreoffice. Enabling it for hydra to see if it builds further.
svn path=/nixpkgs/trunk/; revision=33026
2012-03-12 21:38:00 +00:00
Lluís Batlle i Rossell 6b88ad4b16 I try to package libreoffice 3.5, as there was a weird segfault in 3.4, and they
changed the build system in 3.5. It still does not build either... hopefully
by more reachable troubles.

svn path=/nixpkgs/trunk/; revision=33022
2012-03-12 20:15:08 +00:00
Lluís Batlle i Rossell 9d2d98aab2 Libreoffice is still broken. Setting back the 'force' wall.
svn path=/nixpkgs/trunk/; revision=32979
2012-03-11 10:36:50 +00:00
Lluís Batlle i Rossell 251b9b6472 I made libreoffice build further... Let's see if further enough. I make hydra build it regardless of 'force'. Tomorrow we'll see the result.
svn path=/nixpkgs/trunk/; revision=32977
2012-03-10 21:18:07 +00:00
Lluís Batlle i Rossell b73a6999d0 Adding a patch for go-oo, so it does not dislike gcc 4.6.
svn path=/nixpkgs/trunk/; revision=32892
2012-03-08 13:35:42 +00:00
Lluís Batlle i Rossell dc0fd8219c I take back r32860; I'll try to fix libwpd_08
svn path=/nixpkgs/trunk/; revision=32870
2012-03-07 22:34:54 +00:00
Lluís Batlle i Rossell c62d643520 Let's see if go_oo will build without system libwpd. The libwpd required by oo.org fails to build.
svn path=/nixpkgs/trunk/; revision=32860
2012-03-07 21:48:26 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Eelco Dolstra 5178c6fcc6 * GNUcash updated to 2.4.10.
svn path=/nixpkgs/trunk/; revision=32388
2012-02-18 18:47:42 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Yury G. Kudryashov 19dde94ddc Add calligra suite
KOffice, rebranded. Let hydra build it.

svn path=/nixpkgs/trunk/; revision=32264
2012-02-13 19:34:42 +00:00
Yury G. Kudryashov fc21cca549 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
2012-02-12 09:33:54 +00:00
Yury G. Kudryashov af62434159 kmymoney-4.6.2, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32230
2012-02-11 21:15:16 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov e9974606a5 kmymoney: explicitly pass pkgconfig
svn path=/nixpkgs/trunk/; revision=32173
2012-02-10 10:13:52 +00:00
Yury G. Kudryashov 912637f33a Enable/disable libreoffice build in nixpkgs.config, not in tree.
I've tried to use override instead of getConfig but failed because exception is
thrown before the function is called with force = true.

svn path=/nixpkgs/trunk/; revision=32131
2012-02-07 21:03:25 +00:00
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
Peter Simons 412e5dd87d haskell-hledger-interest: updated to version 1.4
svn path=/nixpkgs/trunk/; revision=32015
2012-02-03 21:00:16 +00:00
Lluís Batlle i Rossell 3c5fee5243 I revert the previous change to libreoffice.
svn path=/nixpkgs/trunk/; revision=31885
2012-01-27 15:14:29 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Lluís Batlle i Rossell 06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Lluís Batlle i Rossell 7fc001306c I add some little code to fetch the srcs of libreoffice.
svn path=/nixpkgs/trunk/; revision=31838
2012-01-25 19:12:27 +00:00
Peter Simons 7f062680e4 ledger3: updated to current HEAD
svn path=/nixpkgs/trunk/; revision=31782
2012-01-21 19:25:50 +00:00
Peter Simons 83fef2d3fa ledger3: added some kind of date-based fake version number to help nix-env decide when to update
svn path=/nixpkgs/trunk/; revision=31781
2012-01-21 19:25:45 +00:00
Peter Simons cf287936ac ledger: renamed 2.6.3 version's nix file for consistency
svn path=/nixpkgs/trunk/; revision=31780
2012-01-21 19:25:41 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov a398e2a401 Add skrooge
svn path=/nixpkgs/trunk/; revision=31438
2012-01-08 19:29:28 +00:00
Yury G. Kudryashov 532930a55f kmymoney-4.6.1
No aqbanking nor gwenhywfar since aqbanking FTBFS

svn path=/nixpkgs/trunk/; revision=31437
2012-01-08 19:29:17 +00:00
Shea Levy d788929c64 ledger3: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31351
2012-01-06 15:55:24 +00:00
Shea Levy b884e56aa2 Enable parallel building of ledger 3
svn path=/nixpkgs/trunk/; revision=31350
2012-01-06 15:44:14 +00:00
Shea Levy 06c29d5ae7 Ledger isn't Linux-specific
svn path=/nixpkgs/trunk/; revision=31338
2012-01-06 05:52:21 +00:00
Yury G. Kudryashov 5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Eelco Dolstra 621963488f * GnuCash updated to 2.4.8.
svn path=/nixpkgs/trunk/; revision=30780
2011-12-06 18:44:05 +00:00
Lluís Batlle i Rossell b931fd862d Updating scribus to 1.4.0rc6. The developers say they abandoned 1.3 long ago.
svn path=/nixpkgs/trunk/; revision=30190
2011-11-02 15:00:11 +00:00
Peter Simons 6942491296 haskell-hledger-interest: updated to version 1.3
svn path=/nixpkgs/trunk/; revision=28982
2011-09-02 18:12:31 +00:00
Peter Simons 614551f9b4 antiword: patch source code so that the tool can find it's data files
svn path=/nixpkgs/trunk/; revision=28939
2011-08-31 12:06:27 +00:00
Peter Simons 577ddef0be antiword: added version 0.37
svn path=/nixpkgs/trunk/; revision=28938
2011-08-31 11:55:51 +00:00
Yury G. Kudryashov 94c6bb3ed4 Add kmymoney
svn path=/nixpkgs/trunk/; revision=28910
2011-08-29 22:43:11 +00:00
Peter Simons d81cab0003 haskell-hledger-interest: updated to version 1.2
svn path=/nixpkgs/trunk/; revision=28737
2011-08-22 11:54:23 +00:00
Peter Simons c67ce898cf pkgs/applications/office/hledger-interest: initial version 1.0
svn path=/nixpkgs/trunk/; revision=28724
2011-08-21 18:01:13 +00:00
David Guibert 2a06c97e90 abiword: add libjpeg to fix the compilation
svn path=/nixpkgs/trunk/; revision=28379
2011-08-08 12:11:46 +00:00
Peter Simons 99a9a4b8bc all-packages.nix: added ledger 3.0 via Git
svn path=/nixpkgs/trunk/; revision=27861
2011-07-20 22:56:39 +00:00