Commit graph

620 commits

Author SHA1 Message Date
Eelco Dolstra f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Peter Simons 48b86237e5 mod_fastcgi, mod_wsgi: these modules don't build on Darwin, and I don't know how to fix that
According to Hydra:

  at `mod_fastcgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_fastcgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

  at `mod_wsgi' [system = "x86_64-darwin"]:
  assertion failed at `/nix/store/jjbzdiilypsb8z38647hav2fxlp0bwfd-nixpkgs-r27790/pkgs/servers/http/apache-httpd/default.nix:8:1'

svn path=/nixpkgs/trunk/; revision=27793
2011-07-14 21:54:58 +00:00
Peter Simons 1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Evgeny Egorochkin 5c4590fa50 MediaTomb: packaged
svn path=/nixpkgs/trunk/; revision=27700
2011-07-11 00:42:02 +00:00
Eelco Dolstra 4b19a1980f * Pulseaudio: disable the dependencies on GTK+, GConf and X11. It's
not clear what they're good for, and we don't want other packages
  depending on GTK+ or Gnome if it's not necessary.  Also, updated to
  0.9.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27629
2011-07-07 17:24:31 +00:00
Ludovic Courtès b3ef7901c4 GNU SIP Witch 1.0.3.
svn path=/nixpkgs/trunk/; revision=27585
2011-07-04 11:52:22 +00:00
Eelco Dolstra c81069e9d5 * apr updated to 1.4.5.
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.

svn path=/nixpkgs/trunk/; revision=27487
2011-06-16 15:19:53 +00:00
Eelco Dolstra 12c9ba62ac * Fix some evaluation problems.
svn path=/nixpkgs/trunk/; revision=27457
2011-06-14 15:55:11 +00:00
Karn Kallio b8950a9504 Fix some semicolons.
svn path=/nixpkgs/trunk/; revision=27456
2011-06-14 15:29:40 +00:00
Nicolas Pierron ae548e8bcb Add freepops.
svn path=/nixpkgs/trunk/; revision=27450
2011-06-14 02:41:28 +00:00
Alexander Tsamutali 5c08bd40db servers/mpd: Updated to 0.16.3.
svn path=/nixpkgs/trunk/; revision=27434
2011-06-13 16:05:03 +00:00
Yury G. Kudryashov f0688ef3bc gpsd-2.95
svn path=/nixpkgs/trunk/; revision=27390
2011-06-07 21:51:13 +00:00
Ludovic Courtès bd1459a557 GNU SIP Witch 1.0.2.
svn path=/nixpkgs/trunk/; revision=27329
2011-05-30 21:49:50 +00:00
Michael Raskin e0a4f988a4 Make Ekiga build
svn path=/nixpkgs/trunk/; revision=27305
2011-05-27 05:39:44 +00:00
Evgeny Egorochkin f69142b396 Polipo: packaged
svn path=/nixpkgs/trunk/; revision=27177
2011-05-07 23:41:34 +00:00
Eelco Dolstra b1e93d013c * Get rid of those annoying "not an attrSet" trace messages.
svn path=/nixpkgs/trunk/; revision=27141
2011-05-04 12:43:31 +00:00
Lluís Batlle i Rossell f28be20395 Updating samba.
svn path=/nixpkgs/trunk/; revision=27082
2011-05-02 07:25:29 +00:00
Lluís Batlle i Rossell a6518956f9 Attempt to fix the vsftpd build on i686-linux
svn path=/nixpkgs/trunk/; revision=27054
2011-04-29 18:18:56 +00:00
Ludovic Courtès 6300c72a20 Add GNU Pies.
svn path=/nixpkgs/trunk/; revision=26942
2011-04-23 21:15:11 +00:00
Yury G. Kudryashov 9d87a3059d vsftpd-2.3.4, make ssl optional, do not hardcode userlist
svn path=/nixpkgs/trunk/; revision=26927
2011-04-23 06:58:57 +00:00
Sander van der Burg 57fee7d679 Bumped tomcat to 6.0.32
svn path=/nixpkgs/trunk/; revision=26845
2011-04-14 15:37:04 +00:00
Lluís Batlle i Rossell 918f68b99a Making samba build with cups support.
svn path=/nixpkgs/trunk/; revision=26839
2011-04-14 07:25:06 +00:00
Lluís Batlle i Rossell 7ed30ce04b Making samba have the ldap schema in $out. And I enable parallel building.
svn path=/nixpkgs/trunk/; revision=26821
2011-04-13 15:31:22 +00:00
Michael Raskin 13a1c3a69b Update Nginx
svn path=/nixpkgs/trunk/; revision=26813
2011-04-13 04:51:35 +00:00
Ludovic Courtès 2c9f084d24 GNU SIP Witch 0.10.5.
svn path=/nixpkgs/trunk/; revision=26795
2011-04-12 08:05:38 +00:00
Lluís Batlle i Rossell ccd2316471 Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.
svn path=/nixpkgs/trunk/; revision=26764
2011-04-09 14:59:06 +00:00
Lluís Batlle i Rossell 450ef3730c Adding ldap support to apache (true by default).
I imagine noone would mind this 'addon' in their nixos apache installations.


svn path=/nixpkgs/trunk/; revision=26763
2011-04-09 14:24:25 +00:00
Eelco Dolstra 7359ed1671 * Added rabbitmq-server.
svn path=/nixpkgs/branches/modular-python/; revision=26623
2011-03-31 11:09:20 +00:00
Eelco Dolstra 353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Eelco Dolstra 1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Eelco Dolstra 968496e69b * wrapPythonPrograms: rewrite the common "#! .../env python" idiom to
"#! .../python".

svn path=/nixpkgs/branches/modular-python/; revision=26583
2011-03-28 17:19:27 +00:00
Ludovic Courtès 4626c7eca3 GNU SIP Witch 0.10.4.
svn path=/nixpkgs/trunk/; revision=26479
2011-03-23 21:55:48 +00:00
Sander van der Burg 981c8e94d4 Bumped Apache Tomcat connectors to 1.2.31
svn path=/nixpkgs/trunk/; revision=26437
2011-03-21 12:07:42 +00:00
Michael Raskin 04d5aed6d0 Add intel driver prerelease
svn path=/nixpkgs/trunk/; revision=26418
2011-03-18 09:10:53 +00:00
Eelco Dolstra 5382f8e934 * xorg-server updated to 1.9.5.
svn path=/nixpkgs/trunk/; revision=26417
2011-03-18 09:07:46 +00:00
Michael Raskin ee75c32a3b More needed propagations noted for future big update
svn path=/nixpkgs/trunk/; revision=26409
2011-03-18 05:32:14 +00:00
Michael Raskin 92a26c823c Comment about incomplete set of propagatedBuildInputs
svn path=/nixpkgs/trunk/; revision=26406
2011-03-17 22:00:22 +00:00
Michael Raskin 1d99933141 Fix xbacklight
svn path=/nixpkgs/trunk/; revision=26402
2011-03-17 18:46:25 +00:00
Michael Raskin 3fa36ea4a1 Fix TWM build
svn path=/nixpkgs/trunk/; revision=26399
2011-03-17 15:51:13 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Ludovic Courtès 8254ae7c3e GNU SIP Witch 0.10.1.
svn path=/nixpkgs/trunk/; revision=26264
2011-03-10 16:27:58 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Michael Raskin b3acca85fd Remove wrong fix for a problem of disappearing tools...
svn path=/nixpkgs/trunk/; revision=26171
2011-03-05 22:32:18 +00:00
Michael Raskin 6b10954921 Adding Joseki: HTTP/SparQL server based on Jena framework. Just a unpack/mix/fix paths expression relying on compiled JAR releases.
svn path=/nixpkgs/trunk/; revision=26168
2011-03-05 22:05:00 +00:00
Ludovic Courtès e7fc725ddb GNU MyServer: Make the binary installable.
svn path=/nixpkgs/trunk/; revision=26162
2011-03-04 13:19:04 +00:00
Ludovic Courtès 69e259eaf2 GNU MyServer: Kill the test suite.
svn path=/nixpkgs/trunk/; revision=26161
2011-03-04 13:19:00 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26018
2011-02-17 16:33:39 +00:00
Eelco Dolstra 9bc4c552a6 * Zabbix 1.8.4.
svn path=/nixpkgs/trunk/; revision=26013
2011-02-17 13:57:15 +00:00
Eelco Dolstra 6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
2011-02-15 15:54:57 +00:00
Eelco Dolstra a5aa96c3a3 * xorgserver: propagate dri2proto.
svn path=/nixpkgs/branches/x-updates/; revision=25980
2011-02-15 14:34:26 +00:00
Eelco Dolstra 1566609a1a * libXft: propagate libXrender.
svn path=/nixpkgs/branches/x-updates/; revision=25950
2011-02-14 10:14:34 +00:00
Eelco Dolstra 47aa6890d2 * libXaw: propagates libXmu.
svn path=/nixpkgs/branches/x-updates/; revision=25948
2011-02-14 10:04:37 +00:00
Eelco Dolstra 0f0d3f9543 * Fix xorg-server.
svn path=/nixpkgs/branches/x-updates/; revision=25907
2011-02-11 15:54:01 +00:00
Eelco Dolstra 337e26fea0 * xkbcomp 1.2.1.
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra 8ca86a8114 * Remove libX11 docs.
svn path=/nixpkgs/branches/x-updates/; revision=25855
2011-02-09 15:17:15 +00:00
Eelco Dolstra 6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra 0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Lluís Batlle i Rossell 9df13d6bba I remove a commented line for freeswitch parallel build. It failed once
building, for me, with that option, so I take that off.

svn path=/nixpkgs/trunk/; revision=25665
2011-01-21 22:12:39 +00:00
Lluís Batlle i Rossell 8cb0db3589 Adding freeswitch
svn path=/nixpkgs/trunk/; revision=25664
2011-01-21 22:12:34 +00:00
Lluís Batlle i Rossell 39506a095d Telling those GNU SIP Witch related packages to use gnutls.
svn path=/nixpkgs/trunk/; revision=25635
2011-01-19 21:48:05 +00:00
Lluís Batlle i Rossell 02f2fd1837 Adding GNU SIP Witch.
svn path=/nixpkgs/trunk/; revision=25634
2011-01-19 21:17:05 +00:00
Sander van der Burg 87c5470d94 Bumped Axis2 to 1.5.4. This subrelease finally seems to work properly again
svn path=/nixpkgs/trunk/; revision=25523
2011-01-12 15:56:05 +00:00
Lluís Batlle i Rossell 8dc9474e4d Making bind use /var/run/named instead of $out/var/run/named for the runtime temporary files.
svn path=/nixpkgs/trunk/; revision=25509
2011-01-11 22:08:43 +00:00
Lluís Batlle i Rossell a9345a51c5 Updating bind
svn path=/nixpkgs/trunk/; revision=25457
2011-01-07 11:33:04 +00:00
Peter Simons 12676e68d8 pkgs/servers/sql/mysql51/default.nix: updated to version 5.1.54
The previous used version, 5.1.51, doesn't exist anymore on the server.

svn path=/nixpkgs/trunk/; revision=25378
2011-01-04 12:35:06 +00:00
Alexander Tsamutali 5b6f88d1a9 servers/mpd: Updated to 0.16.
svn path=/nixpkgs/trunk/; revision=25359
2011-01-03 11:34:08 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Sander van der Burg 4e0c2cc3c6 Seems that this URL gives some trouble, fixed it to a better one...
svn path=/nixpkgs/trunk/; revision=25161
2010-12-16 21:04:13 +00:00
Sander van der Burg 5dd26bfdc6 Bumped MySQL JDBC connector to version 5.1.14
svn path=/nixpkgs/trunk/; revision=25160
2010-12-16 20:41:04 +00:00
Evgeny Egorochkin 77eb09e9cb Ghost One: packaged
svn path=/nixpkgs/trunk/; revision=25137
2010-12-15 02:19:59 +00:00
Eelco Dolstra 975ec6c177 * Added PostgreSQL 9.0.1.
svn path=/nixpkgs/trunk/; revision=25106
2010-12-13 21:55:34 +00:00
Eelco Dolstra b2fa805948 * PostgreSQL updates.
svn path=/nixpkgs/trunk/; revision=25104
2010-12-13 19:02:49 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Eelco Dolstra c4d731f52b * Samba updated to 3.5.6. Build with --localstatedir=/var to prevent
smbd from writing in $out/var at runtime.  Also added --with-fhs.

svn path=/nixpkgs/trunk/; revision=25015
2010-12-06 18:59:07 +00:00
Lluís Batlle i Rossell f7cfcbd1f9 Making gpm generate proper files in $out/lib, that allow good cross-linking. I
had to do this to get the FB driver in links2 - it wants gpm to build, and
without these changes, the "-lgpm" did not work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24932
2010-11-29 23:51:24 +00:00
Evgeny Egorochkin 5e994b9153 ekiga: fix build failure. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24897
2010-11-28 09:21:36 +00:00
Lluís Batlle i Rossell 5103335a61 Making gpm crossbuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=24879
2010-11-26 17:55:22 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Michael Raskin e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
svn path=/nixpkgs/trunk/; revision=24714
2010-11-16 21:05:54 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Michael Raskin 4f920af24a create logs symlink later so that builder doesn't stumble on it
svn path=/nixpkgs/trunk/; revision=24665
2010-11-11 19:57:46 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Peter Simons 3f1392cb5a mod_wsgi: fixed build on Darwin
The configure script had an hard-coded impure path to the lipo binary. If that
binary was found -- and it was --, then the script decided to pass an invalid
"-arch i386" flag to libtool, which subsequently failed. There is probably
another way to pass that -arch flag, but I didn't look hard because it's
redundant anyway.

svn path=/nixpkgs/trunk/; revision=24530
2010-10-29 14:46:40 +00:00
Peter Simons 90490b0603 pkgs/servers/http/apache-httpd: updated to version 2.2.17
svn path=/nixpkgs/trunk/; revision=24468
2010-10-25 13:13:15 +00:00
Peter Simons 2bdf5c4fec pkgs/servers/http/apache-modules/mod_wsgi: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24467
2010-10-25 13:13:09 +00:00
Peter Simons e75b4e4c91 pkgs/servers/http/apache-modules/mod_fastcgi: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24466
2010-10-25 13:13:03 +00:00
Peter Simons 4fa49d4e8f pkgs/servers/http/apache-httpd: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24465
2010-10-25 13:12:57 +00:00
Peter Simons 3527fd782a pkgs/servers/http/apache-httpd: dropped obsolete comment
svn path=/nixpkgs/trunk/; revision=24464
2010-10-25 13:12:33 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Peter Simons 7b630f442c Added an expression for mod_wsgi-3.3, to be used with Apache 2.
svn path=/nixpkgs/trunk/; revision=24408
2010-10-21 15:39:58 +00:00
Peter Simons b6693acfb2 pkgs/servers/http/apache-httpd: added meta.license information
svn path=/nixpkgs/trunk/; revision=24407
2010-10-21 15:39:53 +00:00
Peter Simons c7a87b1669 Added an expression for mod_fastcgi-2.4.6, to be used with Apache 2.
svn path=/nixpkgs/trunk/; revision=24406
2010-10-21 15:39:48 +00:00
Ludovic Courtès 346dbcdad3 GNU MyServer 0.10.
svn path=/nixpkgs/trunk/; revision=24359
2010-10-19 08:09:41 +00:00
Rob Vermaas 5a54c03c82 update mysql51 to mysql 5.1.51
svn path=/nixpkgs/trunk/; revision=24355
2010-10-19 07:06:16 +00:00
Michael Raskin fada13658f Fix xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24274
2010-10-14 10:51:52 +00:00
Michael Raskin 8a191cddd8 Fix include paths for xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24259
2010-10-13 11:43:59 +00:00
Eelco Dolstra 4788fc9298 * Some X.org updates.
svn path=/nixpkgs/trunk/; revision=24252
2010-10-12 21:52:57 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Eelco Dolstra 0bd5f00696 * Updated Tomcat to 5.0.27.
svn path=/nixpkgs/trunk/; revision=24066
2010-10-05 10:39:12 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00