philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

237 commits

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