3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

477 commits

Author SHA1 Message Date
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