Commit graph

394 commits

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