Commit graph

10813 commits

Author SHA1 Message Date
Yury G. Kudryashov
cc6ca8b2ae Add gnupg1 compatibility wrapper
Gnupg1compat is symlinked gnupg2 with two additional symlinks:
gpg->gpg2 and gpgv->gpgv2.

Move original gnupg 1.x to gnupg1orig.
Set default gnupg1 to gnupg1compat.

svn path=/nixpkgs/trunk/; revision=21888
2010-05-19 20:59:20 +00:00
Yury G. Kudryashov
6a0318fead Add libassuan1 back
opensc needs it

svn path=/nixpkgs/trunk/; revision=21887
2010-05-19 20:59:15 +00:00
Yury G. Kudryashov
b7a54122ef Pass coreutils explicitly instead of using stdenv.coreutils
I hope that this fixes tarball creation for hydra

svn path=/nixpkgs/trunk/; revision=21886
2010-05-19 20:59:07 +00:00
Yury G. Kudryashov
fd63f04e4e Remove gpg->gpg2 symlink
Also make gpgme compile&find gpg2

svn path=/nixpkgs/trunk/; revision=21885
2010-05-19 20:59:03 +00:00
Yury G. Kudryashov
d0b56edcf2 Mass GnuPG upgrade
gnupg tests fail. Will try to fix later.

svn path=/nixpkgs/trunk/; revision=21884
2010-05-19 20:58:56 +00:00
Yury G. Kudryashov
ea1953d744 Move gnupg to gnupg1 and gnupg2 to gnupg
Also add gnupg1-compatibility symlinks to gnupg2.
Most packages should be able to use gnupg2 instead of gnupg1.

svn path=/nixpkgs/trunk/; revision=21883
2010-05-19 20:58:47 +00:00
Yury G. Kudryashov
7751f8bd62 Upgrade pinentry to 0.8.0
Also add optional pinentry-qt4

svn path=/nixpkgs/trunk/; revision=21882
2010-05-19 20:58:35 +00:00
Lluís Batlle i Rossell
0ff12ea30b Trying to fix the build of openoffice 3.2.0
svn path=/nixpkgs/trunk/; revision=21880
2010-05-19 16:46:48 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
2010-05-19 15:26:00 +00:00
Lluís Batlle i Rossell
e283f86174 Making nixUnstable ready to cross build.
That requires bzip2 to cross build properly, and this is done only in stdenv-updates.

svn path=/nixpkgs/trunk/; revision=21878
2010-05-19 15:13:46 +00:00
Eelco Dolstra
90b3af3bd7 * Bittorrent updated to 5.2.2 (5.3 seems too hard to build).
svn path=/nixpkgs/trunk/; revision=21877
2010-05-19 14:42:52 +00:00
Eelco Dolstra
f8a818bf20 * Remove a redundant version of ktorrent (it's already in
kde/extra-gear).

svn path=/nixpkgs/trunk/; revision=21876
2010-05-19 13:57:20 +00:00
Eelco Dolstra
1c862f34f8 * Remove empty KDE 4.3 directories. (Where do these come from?)
svn path=/nixpkgs/trunk/; revision=21875
2010-05-19 13:55:59 +00:00
Eelco Dolstra
a310fc9ed0 * Latest kernels.
svn path=/nixpkgs/trunk/; revision=21874
2010-05-19 12:28:54 +00:00
Peter Simons
8d1637de33 pkgs/top-level/all-packages.nix, pkgs/applications/editors/emacs-23: prefer makeOverridable over getPkgConfig to customize GNU Emacs
Changed 'emacs23' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the actual build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21873
2010-05-19 12:26:21 +00:00
Peter Simons
5e4bf97212 pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull
The required perl libraries don't build on Darwin.

svn path=/nixpkgs/trunk/; revision=21872
2010-05-19 12:26:17 +00:00
Peter Simons
dd5add68e1 pkgs/os-specific/linux/hal/default.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21871
2010-05-19 12:26:15 +00:00
Peter Simons
f90d6ec47d pkgs/os-specific/linux/hal/default.nix: deal with 'udev' being null
svn path=/nixpkgs/trunk/; revision=21870
2010-05-19 12:26:12 +00:00
Peter Simons
d6201c6aac pkgs/os-specific/linux/hal/default.nix: prefer explicit function arguments over implicit with style
svn path=/nixpkgs/trunk/; revision=21869
2010-05-19 12:26:09 +00:00
Peter Simons
3353ed9c88 pkgs/top-level/all-packages.nix, pkgs/tools/networking/openssh: prefer makeOverridable over getPkgConfig to customize openssh
Changed 'openssh' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21868
2010-05-19 12:26:06 +00:00
Peter Simons
3104ba89de pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize pdsh
Changed 'pdsh' expression to allow for argument overriding instead of relying
on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21867
2010-05-19 12:26:00 +00:00
Peter Simons
2508c95763 pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize distcc
Changed 'distcc' expression to allow for argument overriding instead of relying
on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21866
2010-05-19 12:25:57 +00:00
Peter Simons
7f0dc973f4 pkgs/top-level/all-packages.nix: prefer makeOverridable over getConfig to customize libc version
Previously, the getConfig variable 'brokenRedHatKernel' was used to switch back
to glibc 2.5, which fixes various run-time problems on Red Hat Linux. Now, the
same can be achieved by configuring

  {
    packageOverrides = pkgs:
    {
      glibc = pkgs.useFromStdenv "glibc" pkgs.glibc25;
    };
  }

in $NIXPKGS_CONFIG. Similarly, the argument 'installLocales' can be overridden
by setting:

  {
    packageOverrides = pkgs:
    {
      glibc = pkgs.useFromStdenv "glibc" (pkgs.glibc25.override { installLocales = true; });
    };
  }

svn path=/nixpkgs/trunk/; revision=21865
2010-05-19 12:25:54 +00:00
Peter Simons
aa600ed8f7 pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU plot
Changed 'gnuplot' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the actual build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21864
2010-05-19 12:25:51 +00:00
Peter Simons
d9c1f1b118 pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize ipmitool
Changed 'ipmitool' expression to allow for argument overriding instead of
relying on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21863
2010-05-19 12:25:48 +00:00
Peter Simons
9c812655ce pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU Privacy Guard
Changed 'gnupg' and 'gnupg2' expressions to allow for argument overriding
instead of relying on getPkgConfig.

svn path=/nixpkgs/trunk/; revision=21862
2010-05-19 12:25:45 +00:00
Peter Simons
807ed4dea3 pkgs/desktops/gnome-2.28/default.nix: strip trailing white space
svn path=/nixpkgs/trunk/; revision=21861
2010-05-19 12:25:41 +00:00
Peter Simons
af899f1956 pkgs/desktops/gnome-2.28/platform/libIDL: fixed build failure on Darwin
The build needs gettext, or it will fail to link libintl.

svn path=/nixpkgs/trunk/; revision=21860
2010-05-19 12:25:38 +00:00
Peter Simons
0db2caa183 pkgs/desktops/gnome-2.28/platform/gnome-vfs: don't require hal unless the host OS is Linux
svn path=/nixpkgs/trunk/; revision=21859
2010-05-19 12:25:35 +00:00
Peter Simons
6d7f97bd0b pkgs/applications/editors/emacs-23: Darwin builds require libXaw to avoid link-time errors
svn path=/nixpkgs/trunk/; revision=21858
2010-05-19 12:25:31 +00:00
Sander van der Burg
953469729f Removed the VBoxRandR tool which does not exists anymore
svn path=/nixpkgs/trunk/; revision=21857
2010-05-19 11:10:15 +00:00
Eelco Dolstra
ad48452ee1 * NVIDIA drivers updated to 195.36.24.
svn path=/nixpkgs/trunk/; revision=21856
2010-05-19 10:35:44 +00:00
Marc Weber
26e718ba23 move assertions so that buildign the NixOS manual doesn't fail
svn path=/nixpkgs/trunk/; revision=21855
2010-05-19 10:01:07 +00:00
Peter Simons
fa9b6ef08d Fix ledger to compile with recent gcc.
Also makes ledger overridable.

svn path=/nixpkgs/trunk/; revision=21854
2010-05-19 07:50:45 +00:00
Lluís Batlle i Rossell
b4536c217f Fixing openoffice urls for 3.2.0
svn path=/nixpkgs/trunk/; revision=21853
2010-05-19 07:31:07 +00:00
Michael Raskin
e2736a0888 DMTX now needs libjasper.. pass that lib to dmtx
svn path=/nixpkgs/trunk/; revision=21852
2010-05-18 21:15:13 +00:00
Michael Raskin
ae476d641a DMTX now needs libjasper..
svn path=/nixpkgs/trunk/; revision=21851
2010-05-18 21:08:19 +00:00
Lluís Batlle i Rossell
84f61fadd1 OpenOffice.org update attempt to 3.2.0 - maybe it will work
I'll wait for the hydra report.

svn path=/nixpkgs/trunk/; revision=21850
2010-05-18 20:57:00 +00:00
Michael Raskin
ad1684ae13 Replace codegen script which was failing with EACCESS. Test Gajim build worked fine
svn path=/nixpkgs/trunk/; revision=21849
2010-05-18 20:13:39 +00:00
Marc Weber
6361b3a682 adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixpkgs/trunk/; revision=21848
2010-05-18 19:36:55 +00:00
Sander van der Burg
202e36f856 Update VirtualBox + guest additions to version 3.1.8
svn path=/nixpkgs/trunk/; revision=21846
2010-05-18 19:10:28 +00:00
Lluís Batlle i Rossell
8523c93081 Fixing the build of consolekit (it wants libgcc_s)
svn path=/nixpkgs/trunk/; revision=21843
2010-05-18 16:40:40 +00:00
Yury G. Kudryashov
c270663fec Move polkit-1 libexec files into libexec/polkit-1/
svn path=/nixpkgs/trunk/; revision=21842
2010-05-18 16:40:17 +00:00
Eelco Dolstra
cfd6e0f21b * The desktop item should be named "Firefox", not "firefox".
svn path=/nixpkgs/trunk/; revision=21840
2010-05-18 14:58:45 +00:00
Peter Simons
1fc724cc5c pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux
svn path=/nixpkgs/trunk/; revision=21839
2010-05-18 14:41:18 +00:00
Peter Simons
1295493b18 pkgs/applications/science/logic/coq: install coqide libraries
Patch courtesy of Russell O'Connor.

svn path=/nixpkgs/trunk/; revision=21838
2010-05-18 13:40:19 +00:00
Peter Simons
5f36663ecc pkgs/top-level/perl-packages.nix: updated Digest-SHA1 to version 2.12
svn path=/nixpkgs/trunk/; revision=21837
2010-05-18 13:35:06 +00:00
Rob Vermaas
a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
2010-05-18 12:36:23 +00:00
Peter Simons
0563e08996 pkgs/development/libraries/pango/1.26.x.nix: enable hydra builds on all platforms, not just Linux
svn path=/nixpkgs/trunk/; revision=21835
2010-05-18 12:07:48 +00:00
Eelco Dolstra
5f9542583f * MPlayer updated (from David Brown).
svn path=/nixpkgs/trunk/; revision=21829
2010-05-18 08:48:43 +00:00