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

547 commits

Author SHA1 Message Date
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
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Sander van der Burg 5b9c5c62be Added some MySQL fixes in order to have a working libmysqld library on x86_64-linux 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15215
 2009-04-21 13:22:38 +00:00
Eelco Dolstra 0296fabb9e * Added dri2proto to the list of tarballs and reran 
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
 2009-04-20 21:59:42 +00:00
Lluís Batlle i Rossell 15f1feb702 Fixing mesa and xorgserver 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
 2009-04-20 18:46:32 +00:00
Eelco Dolstra 8f12b8abf9 * Fixed libXext; it needs newer headers. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15197
 2009-04-20 18:09:37 +00:00
Eelco Dolstra 077b0157a0 * Updated the generator to handle some missing dependencies. 
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
 2009-04-20 16:02:50 +00:00
Eelco Dolstra 406cacbb87 * printproto has a dependency on libXau which our generator 
doesn't see for some reason.  Will have to fix the 
  generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15187
 2009-04-20 14:37:05 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
 2009-04-15 13:25:01 +00:00
Michael Raskin 60dceccc9f Use PAM in ejabberd 
svn path=/nixpkgs/trunk/; revision=15008
 2009-04-13 09:36:07 +00:00
Michael Raskin 9619e184cf Added xmpppy - python XMPP library and pyIRCt - python IRC transport 
svn path=/nixpkgs/trunk/; revision=15005
 2009-04-12 23:27:55 +00:00
Michael Raskin a452680a31 Updated OpenFire 
svn path=/nixpkgs/trunk/; revision=15002
 2009-04-12 20:15:37 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Sander van der Burg 5ebbf90878 Added embedded server option which is required by applications such as amarok 
svn path=/nixpkgs/trunk/; revision=14923
 2009-04-08 09:41:18 +00:00
Michael Raskin 152e2f36ec Nginx update to 0.7.47 
svn path=/nixpkgs/trunk/; revision=14896
 2009-04-06 08:04:57 +00:00
Eelco Dolstra 8d44988427 * Samba updated to 3.3.3. Don't install SWAT - it's not very useful 
on NixOS.

svn path=/nixpkgs/trunk/; revision=14880
 2009-04-04 00:59:55 +00:00
Eelco Dolstra acf5563f10 * Reduce the installed size of mysql from 80 MB to 17 MB by leaving 
out some less important stuff, such as the statically linked
  embedded binaries and some test data.  This is important because
  mysql is currently a dependency of lots of other packages, such as
  Qt.  Of course, the real fix would be to split off the mysql client
  libraries into a separate package.

svn path=/nixpkgs/trunk/; revision=14878
 2009-04-04 00:02:38 +00:00
Marc Weber 75e277ac15 make samba built the pam_smbpass.so file by default 
svn path=/nixpkgs/trunk/; revision=14852
 2009-04-03 10:02:30 +00:00
Ludovic Courtès 25f22ceed6 Add GNU Dico, a DICT server and client. 
svn path=/nixpkgs/trunk/; revision=14825
 2009-04-01 17:31:44 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more. 
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
 2009-03-31 15:30:47 +00:00
Wouter den Breejen 8190c46e15 Samba version update 
svn path=/nixpkgs/trunk/; revision=14769
 2009-03-29 21:44:21 +00:00
Wouter den Breejen eec829aad5 vsftpd userlist options added 
svn path=/nixpkgs/trunk/; revision=14649
 2009-03-22 15:32:28 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
 2009-03-20 16:49:02 +00:00
Eelco Dolstra 3be3abe6ab * Removed makePortmap; use makeOverridable. 
svn path=/nixpkgs/trunk/; revision=14631
 2009-03-20 16:17:08 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Michael Raskin 1dd385c5b9 Updated Squid 
svn path=/nixpkgs/trunk/; revision=14451
 2009-03-08 12:29:34 +00:00
Armijn Hemel a952ab93ab bump to 5.0.77 
svn path=/nixpkgs/trunk/; revision=14437
 2009-03-07 14:11:45 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14427
 2009-03-06 23:21:24 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Marc Weber daf2cd23dc gpm updated to version 1.20.6 so it compiles on x86_64 
svn path=/nixpkgs/trunk/; revision=14252
 2009-02-25 21:17:25 +00:00
Ludovic Courtès 858bd31ac1 Really update Pixman. 
svn path=/nixpkgs/trunk/; revision=14092
 2009-02-17 11:09:00 +00:00
Eelco Dolstra 987c01630a svn path=/nixpkgs/branches/stdenv-updates/; revision=13971 2009-02-03 10:39:48 +00:00
Eelco Dolstra 37b9b420cb * Sync with trunk. Back to gtkLibs214. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
 2009-02-02 15:44:04 +00:00
Ludovic Courtès 05963ee44b PulseAudio: Tell `padsp' the right library path. 
svn path=/nixpkgs/trunk/; revision=13909
 2009-01-29 19:27:31 +00:00
Eelco Dolstra c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Armijn Hemel 6ab7f33f23 update to 3.2.7 -- untested 
svn path=/nixpkgs/trunk/; revision=13893
 2009-01-28 14:51:26 +00:00
Ludovic Courtès 05e01abc75 Xorg Pixman 0.13.2. 
svn path=/nixpkgs/trunk/; revision=13834
 2009-01-24 21:29:57 +00:00
Lluís Batlle i Rossell 5a9098ea36 Fixing the dict-1.9.15 url, setting it to sourceforge mirror. 
The old didn't work for me for several days.

svn path=/nixpkgs/trunk/; revision=13830
 2009-01-24 20:58:29 +00:00
Ludovic Courtès 5bc0b549f0 PulseAudio: Use new ALSA, disable ConsoleKit. 
svn path=/nixpkgs/trunk/; revision=13809
 2009-01-19 20:22:54 +00:00
Ludovic Courtès 2034ecb046 PulseAudio: Remove aDNS since what it really wants is `libasyncns'. 
svn path=/nixpkgs/trunk/; revision=13801
 2009-01-17 21:25:26 +00:00
Ludovic Courtès 443bb3960a PulseAudio: Use aDNS and X11 libraries. 
svn path=/nixpkgs/trunk/; revision=13800
 2009-01-17 21:17:57 +00:00
Ludovic Courtès 417303c201 PulseAudio: Set the right `localstatedir'. 
svn path=/nixpkgs/trunk/; revision=13798
 2009-01-17 18:22:30 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Sander van der Burg 2d0881a5ff Updated Apache Tomcat to 6.0.18 
svn path=/nixpkgs/trunk/; revision=13776
 2009-01-15 15:06:20 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting 
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
 2009-01-12 21:12:07 +00:00
Marc Weber 5b4a355362 squid update. Proposal for multiple versions 
svn path=/nixpkgs/trunk/; revision=13666
 2008-12-21 16:36:47 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead 
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
 2008-12-20 01:20:35 +00:00
Ludovic Courtès 2887933c8b Add PulseAudio, an audio server. 
svn path=/nixpkgs/trunk/; revision=13659
 2008-12-19 14:56:37 +00:00
Eelco Dolstra 9ba80ff346 * Apache 2.2.11. 
svn path=/nixpkgs/trunk/; revision=13658
 2008-12-19 12:52:55 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
 2008-12-10 09:59:21 +00:00
Michael Raskin 8c90c64e94 Added nginx - lightweight http server 
svn path=/nixpkgs/trunk/; revision=13518
 2008-11-30 09:06:53 +00:00
Eelco Dolstra 2211a319e4 * Samba 3.2.4. 
svn path=/nixpkgs/trunk/; revision=13216
 2008-11-07 13:05:05 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru 
svn path=/nixpkgs/trunk/; revision=13190
 2008-11-04 21:24:10 +00:00
Eelco Dolstra 964b969066 * Remove ... for now. 
svn path=/nixpkgs/trunk/; revision=13143
 2008-10-29 09:42:11 +00:00
Michael Raskin 8c3f202c09 Made it easy to build custom xf86videoati version 
svn path=/nixpkgs/trunk/; revision=13112
 2008-10-25 07:19:07 +00:00
Michael Raskin b38742e0c2 Adding a more stable X.org ati driver version (more stable for dualview) 
svn path=/nixpkgs/trunk/; revision=13108
 2008-10-24 05:13:23 +00:00
Eelco Dolstra c9c2045610 * Cairo: build with XCB support. 
* Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
 2008-10-14 14:46:56 +00:00
Eelco Dolstra dbc0d399bf * Add some more packages that have been apparently deprecated from X.org. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13043
 2008-10-10 08:55:45 +00:00
Eelco Dolstra 0e68610feb * libXp has been removed from X.org 7.4 but some packages still need it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13032
 2008-10-09 16:24:51 +00:00
Eelco Dolstra 5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix 
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
 2008-10-09 12:12:58 +00:00
Eelco Dolstra 9fa8276ae5 * X.org 7.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
 2008-10-08 17:02:48 +00:00
Eelco Dolstra 781bb5a6e1 * Apache httpd: build against apr, aputil and pcre instead of using 
its own copies.

svn path=/nixpkgs/trunk/; revision=12971
 2008-10-06 13:38:45 +00:00
Eelco Dolstra 9fdecb1296 * mirror://apache/. 
svn path=/nixpkgs/trunk/; revision=12968
 2008-10-06 12:58:21 +00:00
Eelco Dolstra 6591cc2640 * Subversion 1.5.2, Neon 0.28.3, Apache 2.2.9. 
svn path=/nixpkgs/trunk/; revision=12966
 2008-10-06 12:35:05 +00:00
Marc Weber ffd1f5000b added lighthttpd 
svn path=/nixpkgs/trunk/; revision=12907
 2008-09-24 00:42:50 +00:00
Sander van der Burg 8d679b6351 Created simplified ejabberd Nix expression 
svn path=/nixpkgs/trunk/; revision=12899
 2008-09-22 14:07:25 +00:00
Eelco Dolstra bb45f8360f * Samba 3.0.32. 
svn path=/nixpkgs/trunk/; revision=12716
 2008-08-26 11:10:10 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner. 
svn path=/nixpkgs/trunk/; revision=12655
 2008-08-19 05:54:09 +00:00
Eelco Dolstra ee17d755ca * Zabbix updated to 1.4.6. 
svn path=/nixpkgs/trunk/; revision=12536
 2008-08-07 15:05:52 +00:00
Sander van der Burg 63b9500b88 Added support for custom context.xml for Tomcat 
svn path=/nixpkgs/trunk/; revision=12512
 2008-08-06 14:59:45 +00:00
Sander van der Burg c282368077 Some tomcat common lib fixes 
svn path=/nixpkgs/trunk/; revision=12510
 2008-08-06 13:25:51 +00:00
Sander van der Burg 6dd7896b4e Added shared JDBC driver support for tomcat 
svn path=/nixpkgs/trunk/; revision=12476
 2008-08-04 12:04:24 +00:00
Sander van der Burg b23b849ba3 Updated MySQL JDBC driver 
svn path=/nixpkgs/trunk/; revision=12475
 2008-08-04 11:50:57 +00:00
Michael Raskin c4216c4aba Updated OpenFire 
svn path=/nixpkgs/trunk/; revision=12470
 2008-08-03 17:08:52 +00:00
Sander van der Burg d5e78c3787 Shared lib path should be relative to catalina base, not home 
svn path=/nixpkgs/trunk/; revision=12289
 2008-07-06 21:06:31 +00:00
Sander van der Burg 927898b6f1 Minor update to tomcat and added support for shared libraries 
svn path=/nixpkgs/trunk/; revision=12285
 2008-07-06 20:08:27 +00:00
Wouter den Breejen 70b50b9f52 Another version bump (because of another 404) 
svn path=/nixpkgs/trunk/; revision=12281
 2008-07-06 18:32:42 +00:00
Sander van der Burg 1c1ca49356 Upgrade to Axis2 1.4 
svn path=/nixpkgs/trunk/; revision=12265
 2008-07-05 12:42:51 +00:00
Michael Raskin 594b087c5f Added dovecot-1.1.1; not making it default as it is too fd hungry for Upstart.. 
svn path=/nixpkgs/trunk/; revision=12236
 2008-07-01 14:40:53 +00:00
Michael Raskin cd9f816c08 Some security options added to mail-related servers.. 
svn path=/nixpkgs/trunk/; revision=12222
 2008-06-30 21:11:07 +00:00
Michael Raskin e1f4d60dca Added fresh radeonhd to X.org expression. 
svn path=/nixpkgs/trunk/; revision=12205
 2008-06-28 07:10:51 +00:00
Michael Raskin c750b3e602 Added dependencies to build ATi driver.. 
svn path=/nixpkgs/trunk/; revision=12113
 2008-06-16 06:27:21 +00:00
Michael Raskin 7c840c0f0f Fixing evdev X11 input driver build 
svn path=/nixpkgs/trunk/; revision=12103
 2008-06-15 16:55:27 +00:00
Michael Raskin f7ccbf7c80 Update X.org server: security fix 
svn path=/nixpkgs/trunk/; revision=12082
 2008-06-13 17:24:14 +00:00
Eelco Dolstra 06e406212c * Hack to fix i686-freebsd. 
svn path=/nixpkgs/trunk/; revision=12076
 2008-06-13 12:03:55 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Michael Raskin 25e5b832dd Hopefully made Postfix installable again 
svn path=/nixpkgs/trunk/; revision=12068
 2008-06-13 04:30:57 +00:00
Michael Raskin 3d7f5dd7d6 Added BIND 
svn path=/nixpkgs/trunk/; revision=12064
 2008-06-12 18:10:08 +00:00
Eelco Dolstra 7d0bc40935 * Install the Zabbix PHP frontend and the SQL schemata/data. 
svn path=/nixpkgs/trunk/; revision=11965
 2008-06-04 08:45:00 +00:00
Eelco Dolstra b4bd1c888a * Added Zabbix, a system and network monitoring tool. 
svn path=/nixpkgs/trunk/; revision=11963
 2008-06-03 21:59:35 +00:00
Michael Raskin 47e9ed0386 Fixed tailor expression 
svn path=/nixpkgs/trunk/; revision=11941
 2008-05-31 07:26:13 +00:00
Michael Raskin ad848d5a01 Added general purpose mouse daemon. 
svn path=/nixpkgs/trunk/; revision=11873
 2008-05-21 13:26:42 +00:00
Michael Raskin 5b98b7ac77 Added 3.Head version of Squid. Supports IPv6 servers. 
svn path=/nixpkgs/trunk/; revision=11828
 2008-05-15 17:51:22 +00:00
Michael Raskin 2e1be8618b Upgraded Squid. IPv6 does not work fully yet. 
svn path=/nixpkgs/trunk/; revision=11756
 2008-05-06 07:02:33 +00:00
Eelco Dolstra 319feed942 * Latest Cairo / GTK. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
 2008-04-23 10:48:10 +00:00
Eelco Dolstra fc56e69590 * Remove some obsolete stuff. 
svn path=/nixpkgs/trunk/; revision=11689
 2008-04-23 07:22:55 +00:00
Michael Raskin 6f35c8fdf8 Added option for newer ATi drivers in X.org 
svn path=/nixpkgs/trunk/; revision=11558
 2008-04-11 09:24:16 +00:00
Michael Raskin 3001f31b44 Fixed my stupid mistake.. 
svn path=/nixpkgs/trunk/; revision=11266
 2008-03-22 19:51:19 +00:00
Michael Raskin 58a31ca341 Fixes to OpenFire 
svn path=/nixpkgs/trunk/; revision=11263
 2008-03-22 17:53:27 +00:00
Eelco Dolstra cb01d8b23b * Oops! Fixed an accidental commit. 
svn path=/nixpkgs/trunk/; revision=11244
 2008-03-20 18:49:33 +00:00
Ludovic Courtès 95f0e6a1a7 Differentiate between longDescription' and description'. 
svn path=/nixpkgs/trunk/; revision=11230
 2008-03-20 14:35:03 +00:00
Ludovic Courtès d9fb721e1a Add `makePortmap' function, for use by NixOS. 
svn path=/nixpkgs/trunk/; revision=11139
 2008-03-15 23:39:18 +00:00
Ludovic Courtès fa2f6c5272 Add portmap, an ONC RPC directory service. 
svn path=/nixpkgs/trunk/; revision=11138
 2008-03-15 22:51:46 +00:00
Eelco Dolstra 54a46e4c50 * Samba updated to 3.0.28a. Removed the static config file. 
svn path=/nixpkgs/trunk/; revision=11062
 2008-03-11 17:01:55 +00:00
Michael Raskin 07cad2fc45 Now Dictd dictionary collection works to full extent. 
svn path=/nixpkgs/trunk/; revision=11007
 2008-03-07 07:30:56 +00:00
Michael Raskin 7786a5ad1e Some updates to dict dictionaries. 
svn path=/nixpkgs/trunk/; revision=11005
 2008-03-07 05:54:54 +00:00
Michael Raskin 7b6c7dd65f Made entries for a few dictd dictionaries 
svn path=/nixpkgs/trunk/; revision=10979
 2008-03-06 12:02:10 +00:00
Michael Raskin a463854cd7 Commented out work in progress 
svn path=/nixpkgs/trunk/; revision=10977
 2008-03-06 04:44:46 +00:00
Michael Raskin 3b2f272341 Added dict and working on adding dictionaries 
svn path=/nixpkgs/trunk/; revision=10976
 2008-03-06 04:39:05 +00:00
Sander van der Burg ad0f90ccc0 Updated to the stable 2.0.0 
svn path=/nixpkgs/trunk/; revision=10920
 2008-03-02 22:11:19 +00:00
Michael Raskin 71f8e0911a Added src to meta for builderDefs-based packages. 
svn path=/nixpkgs/trunk/; revision=10913
 2008-03-02 18:49:31 +00:00
Sander van der Burg a40f5bee8a Added jetty 6.1 
svn path=/nixpkgs/trunk/; revision=10858
 2008-02-26 09:26:17 +00:00
Eelco Dolstra a62b2564ba * Merge the makeFlags check. 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10810
 2008-02-21 16:23:47 +00:00
Michael Raskin ed3cf0a497 Fixed setup.sh - non-default Makefile may be passed in makeFlags. OpenFire added, doesn't work yet 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10795
 2008-02-21 04:48:55 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
 2008-02-20 23:02:41 +00:00
Sander van der Burg 92910e461e Extract war archive so that it can be deployed from a nix profile 
svn path=/nixpkgs/trunk/; revision=10773
 2008-02-20 12:33:17 +00:00
Yury G. Kudryashov ab3fc34bce mysql: +libmysqld, +openssl 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10752
 2008-02-18 20:54:08 +00:00