Commit graph

577 commits

Author SHA1 Message Date
Sander van der Burg
a0c03edcd9 Removed test stuff from MySQL + add to releases
svn path=/nixpkgs/trunk/; revision=28149
2011-08-04 11:58:49 +00:00
Eelco Dolstra
237b2b8a30 * Merged the KDE 4.7 branch.
This adds KDE 4.7 (and updates many dependencies), but KDE 4.5 is
  still the default.  To use 4.7, set the following in
  configuration.nix:

    nixpkgs.config.packageOverrides = pkgs: {
      kde4 = pkgs.kde47;
    };
  

svn path=/nixpkgs/trunk/; revision=28147
2011-08-04 00:08:22 +00:00
Sander van der Burg
d9572cfb6b Added MySQL 5.5. It's still a bit experimental though
svn path=/nixpkgs/trunk/; revision=28145
2011-08-03 22:10:06 +00:00
Eelco Dolstra
1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Cillian de Roiste
415be547b3 Enabling optional jackaudio support for pulseaudio
svn path=/nixpkgs/trunk/; revision=28010
2011-07-30 18:51:42 +00:00
Eelco Dolstra
af40854825 * PulseAudio: use configuration files in /etc/pulse to allow NixOS to
override them.

svn path=/nixpkgs/branches/kde-4.7/; revision=27965
2011-07-26 15:25:21 +00:00
Eelco Dolstra
626b7cd9f4 * Fix the xvinfo build.
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
2011-07-26 00:04:46 +00:00
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