Commit Graph

325 Commits

Author SHA1 Message Date
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
Michael Raskin
88c725ad84 Forward port of Apache changes.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10736
2008-02-18 20:07:32 +00:00
Eelco Dolstra
1bd2f3e93e * Enable building of mod_proxy.
svn path=/nixpkgs/trunk/; revision=10730
2008-02-18 14:59:48 +00:00
Eelco Dolstra
90a5f1fec4 * Go back to the previous Jetty, this one produces several megabytes
of debug info per request and I can't be bothered to figure out
  how to turn it off.

svn path=/nixpkgs/trunk/; revision=10728
2008-02-18 14:26:03 +00:00
Eelco Dolstra
4b009da5fd * Jetty 5.1.12 (couldn't get 5.1.14 to work quickly).
svn path=/nixpkgs/trunk/; revision=10702
2008-02-15 10:56:31 +00:00
Eelco Dolstra
8022e84568 * Postgresql 8.3.0.
svn path=/nixpkgs/trunk/; revision=10699
2008-02-15 07:08:05 +00:00
Sander van der Burg
74adfd6239 Also install the axis2 libraries
svn path=/nixpkgs/trunk/; revision=10654
2008-02-13 09:27:19 +00:00
Yury G. Kudryashov
b5b189bed8 postgresql: forgotten to remove unused default.nix and builder.sh
svn path=/nixpkgs/branches/stdenv-updates/; revision=10610
2008-02-10 17:41:45 +00:00
Yury G. Kudryashov
2c0bf029fb Postgresql: 8.3.0 added, using selectVersion
svn path=/nixpkgs/branches/stdenv-updates/; revision=10606
2008-02-10 17:41:23 +00:00
Yury G. Kudryashov
156b7f93ef * Updated Apache-related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10589
2008-02-10 17:39:07 +00:00
Yury G. Kudryashov
150ea51a9c Added Apache Axis2
svn path=/nixpkgs/branches/stdenv-updates/; revision=10582
2008-02-10 17:37:50 +00:00
Michael Raskin
4df190c703 Various fixes and updates to build that all.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
2008-02-10 16:44:43 +00:00
Eelco Dolstra
cb0c387ce2 * Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
2008-02-05 11:41:49 +00:00
Sander van der Burg
b52c792004 Added Apache Axis2
svn path=/nixpkgs/trunk/; revision=10493
2008-02-04 12:24:41 +00:00
Yury G. Kudryashov
c0496c0413 X.Org: added dbus, hal; removed unused gettext
svn path=/nixpkgs/branches/stdenv-updates/; revision=10467
2008-02-02 20:42:55 +00:00
Yury G. Kudryashov
aa83977d83 vsftpd: builds with gcc-4.2 now
svn path=/nixpkgs/trunk/; revision=10435
2008-01-31 14:08:02 +00:00
Yury G. Kudryashov
fbfab88e04 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
2008-01-31 10:41:04 +00:00
Yury G. Kudryashov
671fd9e721 Added Apache Tomcat 6.0
svn path=/nixpkgs/branches/stdenv-updates/; revision=10425
2008-01-31 10:39:47 +00:00
Yury G. Kudryashov
50f0ca2d9b * Apache 2.2.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10423
2008-01-31 10:39:16 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Sander van der Burg
75ae1c3a58 Added Apache Tomcat 6.0
svn path=/nixpkgs/trunk/; revision=10400
2008-01-30 09:41:33 +00:00
Yury G. Kudryashov
c1b675a085 Fixed typo (missing space)
svn path=/nixpkgs/trunk/; revision=10396
2008-01-29 23:31:23 +00:00
Eelco Dolstra
637851fec1 * Apache 2.2.8.
svn path=/nixpkgs/trunk/; revision=10394
2008-01-29 23:28:06 +00:00