Commit graph

464 commits

Author SHA1 Message Date
Eelco Dolstra
b1fb08569f * X.org server updated to 1.7.5.
svn path=/nixpkgs/trunk/; revision=20050
2010-02-16 13:34:30 +00:00
Ludovic Courtès
859d2702b9 GNU MyServer 0.9.2.
svn path=/nixpkgs/trunk/; revision=20042
2010-02-16 10:48:06 +00:00
Eelco Dolstra
65aecdd00b * Zabbix updated to 1.8.1.
svn path=/nixpkgs/trunk/; revision=20009
2010-02-15 14:20:28 +00:00
Eelco Dolstra
91184831a9 * Using the en_US locale gives a lot of warnings (because we don't
have it without glibc-locales).

svn path=/nixpkgs/trunk/; revision=19940
2010-02-11 16:18:14 +00:00
Eelco Dolstra
554549de5b * Latest PostgreSQL.
svn path=/nixpkgs/trunk/; revision=19931
2010-02-11 13:40:20 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Marco Maggesi
f278489e98 Fix bugs and improve pkgs/servers/openafs-client
svn path=/nixpkgs/trunk/; revision=19750
2010-02-01 16:27:35 +00:00
Lluís Batlle i Rossell
d47aead668 Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Eelco Dolstra
78718b5a3d * xorg-server updated to 1.7.4, along with some other X.org packages.
svn path=/nixpkgs/trunk/; revision=19387
2010-01-13 11:51:45 +00:00
Eelco Dolstra
3535899507 * Added xinit.
svn path=/nixpkgs/trunk/; revision=19236
2010-01-05 14:49:23 +00:00
Ludovic Courtès
4b31ecfb74 Rename kernel*' to linux*'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19068
2009-12-21 14:12:00 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Rob Vermaas
377b034541 enable max-nondb plugins for mysql 5.1.41
svn path=/nixpkgs/trunk/; revision=19019
2009-12-17 20:15:02 +00:00
Rob Vermaas
d1e9045571 mysql 5.1.41
svn path=/nixpkgs/trunk/; revision=19017
2009-12-17 18:54:12 +00:00
Ludovic Courtès
bc05fb3160 PulseAudio: Add maintainer and platform.
svn path=/nixpkgs/trunk/; revision=18926
2009-12-13 21:14:45 +00:00
Ludovic Courtès
c7991b8a2b PulseAudio 0.9.21.
svn path=/nixpkgs/trunk/; revision=18923
2009-12-13 20:19:19 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Peter Simons
d21a4d14fc pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
2009-12-09 15:56:20 +00:00
Michael Raskin
13b91e2ca8 Update CouchDB; add Apache-related snippets to update-upstream-data.
svn path=/nixpkgs/trunk/; revision=18851
2009-12-09 12:59:23 +00:00
Eelco Dolstra
bf7a38f3ff * X.org server 1.7.3.
svn path=/nixpkgs/trunk/; revision=18792
2009-12-03 15:51:40 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell
b4e31ce1bf fixing the name in the openchrome expression.
svn path=/nixpkgs/trunk/; revision=18573
2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell
d8aa5b5db1 Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
2009-11-23 19:45:18 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
d0d2c6e3fe Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell
ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell
3136303d63 Fixing the libxcb native build: missing dependency.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
2009-11-21 10:11:44 +00:00
Eelco Dolstra
b19ada9e05 * Fix the GPM URL.
svn path=/nixpkgs/trunk/; revision=18413
2009-11-18 12:47:58 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Sander van der Burg
52e9488541 Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments
svn path=/nixpkgs/trunk/; revision=18396
2009-11-17 16:54:04 +00:00
Lluís Batlle i Rossell
4acd0bdb8c Making xorgserver build also Xnest.
svn path=/nixpkgs/trunk/; revision=18395
2009-11-17 16:46:51 +00:00
Sander van der Burg
88a90ec1c5 Upgraded Axis2 to 1.5.1
svn path=/nixpkgs/trunk/; revision=18373
2009-11-16 12:50:04 +00:00
Sander van der Burg
ac64ef2275 Upgraded JBoss to 5.1.0
svn path=/nixpkgs/trunk/; revision=18329
2009-11-11 15:52:26 +00:00
Marco Maggesi
c0a6058122 Add package OpenAFS (added forgotten files)
svn path=/nixpkgs/trunk/; revision=18323
2009-11-10 16:00:52 +00:00
Wouter den Breejen
3259101fc0 Added par2, unzip/rar as dependencies so they are not picked up from PATH
svn path=/nixpkgs/trunk/; revision=18303
2009-11-08 23:37:49 +00:00
Wouter den Breejen
d24e7434ec Added sabnzbd usenet download tool :)
svn path=/nixpkgs/trunk/; revision=18295
2009-11-08 19:59:56 +00:00
Wouter den Breejen
a83def2812 Added sabnzbd usenet download tool :)
svn path=/nixpkgs/trunk/; revision=18293
2009-11-08 19:53:54 +00:00
Lluís Batlle i Rossell
c28701c3d9 Fixing the xdriinfo build.
svn path=/nixpkgs/trunk/; revision=18287
2009-11-08 11:34:17 +00:00
Lluís Batlle i Rossell
b02ba2aff8 Updating the xorg dri path patch for dri2.
svn path=/nixpkgs/trunk/; revision=18225
2009-11-06 21:15:59 +00:00
Lluís Batlle i Rossell
bbcd6e2728 Fixing the url for the xorg video unichrome driver.
prefetching and then realising the expression does not test the url,
I've to keep that in mind.

svn path=/nixpkgs/trunk/; revision=18222
2009-11-06 19:26:00 +00:00
Lluís Batlle i Rossell
9240b56a61 Fixing fonts.alias in the new xorg, and adding a check for the next time
they change the fonts.alias path.

svn path=/nixpkgs/trunk/; revision=18210
2009-11-06 15:16:47 +00:00
Rob Vermaas
ab8fd754c6 svn path=/nixpkgs/trunk/; revision=18209 2009-11-06 14:50:41 +00:00
Lluís Batlle i Rossell
91c8df91bf Adding the Unichrome xorg video driver, and updating the Openchrome.
svn path=/nixpkgs/trunk/; revision=18161
2009-11-05 21:34:31 +00:00
Rob Vermaas
3bfd5b2d9c added couchdb 0.8.1-incubating
svn path=/nixpkgs/trunk/; revision=18141
2009-11-05 14:41:05 +00:00
Eelco Dolstra
9a4cd33d10 * Fix the synaptics driver.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18115
2009-11-04 19:53:23 +00:00
Eelco Dolstra
b98502f06a * Fix xf86inputsynaptics.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18085
2009-11-03 23:54:08 +00:00
Eelco Dolstra
390548d708 * Fix the font packages. They need a --with-fontrootdir flag now.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18043
2009-10-30 08:20:03 +00:00
Eelco Dolstra
1829882a24 svn path=/nixpkgs/branches/xorg-7.5/; revision=18042 2009-10-30 07:41:09 +00:00
Eelco Dolstra
05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
2009-10-29 18:25:53 +00:00
Eelco Dolstra
28d718aceb * X.org 7.5.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Sander van der Burg
9f659e14d2 Upgraded Jetty 6.1.x to 6.1.21
svn path=/nixpkgs/trunk/; revision=17886
2009-10-19 15:24:55 +00:00
Eelco Dolstra
c5b198300d * Postgres updated to 8.3.8 and 8.4.1. Dropped the "with args" and
"version" argument.  Added a few Postgres mirrors.

svn path=/nixpkgs/trunk/; revision=17804
2009-10-14 14:38:16 +00:00
Michael Raskin
bc3c78536e Update ejabberd source revision
svn path=/nixpkgs/trunk/; revision=17788
2009-10-13 20:43:14 +00:00
Sander van der Burg
223789d411 Cleaned the expression of tomcat a bit
svn path=/nixpkgs/trunk/; revision=17777
2009-10-13 13:21:51 +00:00
Eelco Dolstra
fa9d33b8cc * Apache 2.2.14.
svn path=/nixpkgs/trunk/; revision=17768
2009-10-12 17:57:49 +00:00
Eelco Dolstra
c6efc69ad2 * -lgcc_s is also needed on i686-linux.
svn path=/nixpkgs/trunk/; revision=17754
2009-10-12 11:22:16 +00:00
Lluís Batlle i Rossell
9d71e990a1 Updating the openchrome xorg video driver
svn path=/nixpkgs/trunk/; revision=17743
2009-10-11 14:41:31 +00:00
Michael Raskin
edbbddce1d A case study in transitive overrides. WebKit needs fresh glib. This means it needs a whole slice of system built against glib-2.22.. Added overrides are generic enough, though. So the same way can be used to override everything. I have failed (so far?) to add mkOverridable into stdenv, though.
svn path=/nixpkgs/trunk/; revision=17661
2009-10-06 05:43:51 +00:00
Peter Simons
b9b57c6149 Move libXaw fix from default.nix to overrides.nix.
svn path=/nixpkgs/trunk/; revision=17620
2009-10-02 18:03:23 +00:00
Peter Simons
1570ccf3cf libXaw: fixed broken installation in MacOS X
See comments in file for further details.

svn path=/nixpkgs/trunk/; revision=17609
2009-10-02 13:57:21 +00:00
Eelco Dolstra
317fd0edd5 * Revert the manual changes to default.nix
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
2009-10-02 13:06:35 +00:00
Peter Simons
f2c6df33ba pkgs/servers/x11/xorg/default.nix: strip trailing white-space
svn path=/nixpkgs/trunk/; revision=17601
2009-10-02 12:45:04 +00:00
Peter Simons
abe32ecf99 libSM: use native libuuid when building on MacOS X
On Linux, <uuid/uuid.h> and related functions are provided by the util-linux-ng
package, which doesn't build on other operating systems, such as MacOS X. That
platform provides libuuid as part of the system. Hence, to build libSM on
MacOS, we define (empty) variables LIBUUID_CFLAGS and LIBUUID_CFLAGS. Those
settings disable ./configure's attempt to detect libuuid with pkgconfig --
which would fail.

svn path=/nixpkgs/trunk/; revision=17600
2009-10-02 12:44:59 +00:00
Ludovic Courtès
effabb0950 MyServer: Restrict to GNU/*.
svn path=/nixpkgs/trunk/; revision=17224
2009-09-17 10:33:09 +00:00
Michael Raskin
5c2fbcacd1 Update Nginx because of a vulnerability
svn path=/nixpkgs/trunk/; revision=17146
2009-09-15 07:05:32 +00:00
Eelco Dolstra
9d15693163 * Make sure that the X server can write the compiled xkb keymap. This
requires $out/share/X11/xkb/compiled to be writable, so symlink it
  to /var/tmp.  Using --with-xkb-output doesn't work in a chroot build
  because `make install' tries to write a README.compiled file to
  /var/tmp, which doesn't exist in the chroot.

svn path=/nixpkgs/trunk/; revision=17000
2009-09-09 22:16:09 +00:00
Rob Vermaas
c0e46e52ba * added postgresql 8.4.0
svn path=/nixpkgs/trunk/; revision=16956
2009-09-04 12:55:03 +00:00
Eelco Dolstra
ced7a48e5d * glx: make the XORG_DRI_DRIVER_PATH environment variable work for the
software renderer as well.

svn path=/nixpkgs/trunk/; revision=16943
2009-09-02 22:32:56 +00:00
Eelco Dolstra
df5cd8776a * Apache 2.2.13.
svn path=/nixpkgs/trunk/; revision=16889
2009-08-28 16:05:48 +00:00
Marc Weber
08d98a9972 Revert "mod-python unfinished"
reverting -r 16808 (unfinished mod_python). Sth working does already exist

svn path=/nixpkgs/trunk/; revision=16882
2009-08-27 23:46:15 +00:00
Marc Weber
159eebd808 mod-python unfinished
svn path=/nixpkgs/trunk/; revision=16808
2009-08-22 09:33:35 +00:00
Ludovic Courtès
4ad3ea4107 Add GNU MyServer.
svn path=/nixpkgs/trunk/; revision=16801
2009-08-21 10:20:40 +00:00
Lluís Batlle i Rossell
116c1e4bdd Adding the proper derivation name to the openchrome xorg driver override.
svn path=/nixpkgs/trunk/; revision=16781
2009-08-19 20:19:33 +00:00
Lluís Batlle i Rossell
f474284147 Adding the xinetd package.
svn path=/nixpkgs/trunk/; revision=16779
2009-08-19 20:19:17 +00:00
Sander van der Burg
f8b01c81dc Upgraded tomcat connector module to 1.2.28
svn path=/nixpkgs/trunk/; revision=16659
2009-08-10 20:14:34 +00:00
Eelco Dolstra
223bce6491 * Latest httpd, apr, apr-util.
svn path=/nixpkgs/trunk/; revision=16615
2009-08-07 15:26:13 +00:00
Sander van der Burg
d8e017cbb3 Upgraded tomcat to 6.0.20
svn path=/nixpkgs/trunk/; revision=16600
2009-08-06 17:15:38 +00:00
Marc Weber
05259ed635 Monetdb: enabling Java support
svn path=/nixpkgs/trunk/; revision=16479
2009-07-27 16:05:39 +00:00
Lluís Batlle i Rossell
dab4dc0de1 Using openchrome trunk instead of that distributed with xorg. That
doesn't work in K8N800, and trunk even does a bit of 3D by hw.

svn path=/nixpkgs/trunk/; revision=16329
2009-07-11 10:32:27 +00:00
Marc Weber
4f81282226 adding monetdb database
svn path=/nixpkgs/trunk/; revision=16262
2009-07-09 03:50:44 +00:00
Eelco Dolstra
645c91708f * Updated some drivers.
svn path=/nixpkgs/trunk/; revision=16002
2009-06-18 17:20:01 +00:00
Sander van der Burg
262f696a42 Updated axis2 to 1.5
svn path=/nixpkgs/trunk/; revision=15987
2009-06-17 14:02:37 +00:00
Sander van der Burg
891991a1d9 Link lgcc_s to mysql in order to make it work on x86-64-linux
svn path=/nixpkgs/trunk/; revision=15973
2009-06-16 13:36:10 +00:00
Eelco Dolstra
85978b1efa * e2fsprogs updated to 1.41.6. Also keep the previous version around
so that we don't have to rebuild everything that depends on libuuid
  (such as all X programs).

svn path=/nixpkgs/trunk/; revision=15964
2009-06-15 16:45:48 +00:00
Ludovic Courtès
e0586a7936 gpsd: Fix client programs.
svn path=/nixpkgs/trunk/; revision=15812
2009-06-01 00:03:08 +00:00
Ludovic Courtès
1660db54ff Add `gpsd', a GPS service daemon.
svn path=/nixpkgs/trunk/; revision=15809
2009-05-31 11:29:42 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Michael Raskin
5fff65dce9 As newest ejabberd will not run with Erlang R13B, use SVN version
svn path=/nixpkgs/trunk/; revision=15655
2009-05-19 17:08:10 +00:00
Ludovic Courtès
a80578b312 Propagate GDBM from PulseAudio to make hints from `.la' files work.
svn path=/nixpkgs/trunk/; revision=15556
2009-05-11 21:11:25 +00:00
Michael Raskin
d54c4a8189 Fix old typo
svn path=/nixpkgs/trunk/; revision=15512
2009-05-09 15:37:50 +00:00
Michael Raskin
4fb36441e2 Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
2009-05-05 12:38:04 +00:00
Lluís Batlle i Rossell
7e53d1062f Adding mesa to compile the openchrome driver.
svn path=/nixpkgs/trunk/; revision=15386
2009-04-28 22:15:44 +00:00
Eelco Dolstra
c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Lluís Batlle i Rossell
44f19bc1b4 Making the latest xorg cope well with xkbcomp.
svn path=/nixpkgs/trunk/; revision=15347
2009-04-28 08:05:28 +00:00
Eelco Dolstra
5f9014cc7f * Updated evdev to the latest version. Otherwise, the arrow keys and
others break under KDE and Gnome unless you set the keyboard type to
  evdev (e.g. in the KDE System Settings).  See
  
    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
2009-04-27 23:06:02 +00:00
Marc Weber
3c05ea1a4b readding and updating xorg.xfs. It's required to run tightvnc
1.0.8 is latest version

svn path=/nixpkgs/trunk/; revision=15329
2009-04-27 01:44:30 +00:00
Eelco Dolstra
914f2d6cf6 * Last sync.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15320
2009-04-26 17:21:58 +00:00
Marc Weber
8d6fd9cb2b samba: Use /etc/samba as default configuration directory
svn path=/nixpkgs/trunk/; revision=15315
2009-04-26 11:06:41 +00:00