Commit graph

283 commits

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