From 4788fc929817948cd1e5827d7e34612e724060fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Oct 2010 21:52:57 +0000 Subject: * Some X.org updates. svn path=/nixpkgs/trunk/; revision=24252 --- pkgs/servers/x11/xorg/default.nix | 68 ++++++++++++++++----------------- pkgs/servers/x11/xorg/tarballs-7.5.list | 19 ++++----- 2 files changed, 44 insertions(+), 43 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b0c4b325dfbc..f8de24193748 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -98,51 +98,51 @@ let })) // {inherit xextproto ;}; fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) { - name = "font-adobe-100dpi-1.0.1"; + name = "font-adobe-100dpi-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2; - sha256 = "0b5m5iwc6925ysf0ljghx5znh9nkl792l77i26spdyzqsslbqhm7"; + url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.2.tar.bz2; + sha256 = "0xb767577698d9ribv4p4lgi7f8sjb8y6nvd357i5g23404nw0bi"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) { - name = "font-adobe-75dpi-1.0.1"; + name = "font-adobe-75dpi-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-adobe-75dpi-1.0.1.tar.bz2; - sha256 = "0wczvzn5pc3c46xxp4328s207giisy4vwwv5if574w3bs9jigrad"; + url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.2.tar.bz2; + sha256 = "1z8h2gq7r553lf1fphk3pya6g4n8rs5f00kffyqdy284j77wlj9d"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) { - name = "font-adobe-utopia-100dpi-1.0.2"; + name = "font-adobe-utopia-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-100dpi-1.0.2.tar.bz2; - sha256 = "0plmfm3x5lsaa27slslw0sxx4jv9wb6zwwv2n8r957sq15akz36x"; + url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.3.tar.bz2; + sha256 = "1b4cdjynwzrlsnqfi930gpvbs2mvjrawak801385pf0hfb9x2j70"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) { - name = "font-adobe-utopia-75dpi-1.0.2"; + name = "font-adobe-utopia-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-75dpi-1.0.2.tar.bz2; - sha256 = "0mv5pa2x7xvz8cjkcfihnfnl98ljx8bbxdb26qxy2wsvbfxa8g1v"; + url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.3.tar.bz2; + sha256 = "1qs2jp6vw9j07qk38f0ambjd9g6d3ph4ichfgjjkaymmvd5bwk97"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) { - name = "font-adobe-utopia-type1-1.0.2"; + name = "font-adobe-utopia-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-type1-1.0.2.tar.bz2; - sha256 = "0cz2aqknq4r923v77s9r61bxvxi1jy7igz2c3ff23xjawi92fpwc"; + url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.3.tar.bz2; + sha256 = "1y8h0v15m3j0d83c3rp14bg5shx7kpg34vjaky8gvwndjdr4dyjh"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; @@ -1318,11 +1318,11 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.4.0"; + name = "xf86-input-evdev-2.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2; - sha256 = "0sl02sx755j5kg9sd762sgqk2gnvkhj3pm76l47qhw0a2jvqmx4f"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.5.0.tar.bz2; + sha256 = "0cq34rk3fqlbjnakwzw2138xvwzmf52ffy9grgsrxl6qr4x1gv4x"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; @@ -1358,21 +1358,21 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.2.2"; + name = "xf86-input-synaptics-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2; - sha256 = "1a1dvdc1g8fgkhr3fn3rnly1bz3f6kz1qjxyrmm22qmsair4w2yj"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2; + sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh"; }; - buildInputs = [pkgconfig inputproto recordproto libX11 libXi xorgserver xproto libXtst ]; - })) // {inherit inputproto recordproto libX11 libXi xorgserver xproto libXtst ;}; + buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; + })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-12.6.5"; + name = "xf86-input-vmmouse-12.6.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2; - sha256 = "03ccsqs5hyrjspfaww8dwia01iz98nczqj27bd1bpxs7vjww66iq"; + url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.6.10.tar.bz2; + sha256 = "0409lkwk1ws8vw4axxilwmcs8qxj8lq5dma2i2iz49q6hrd9sdm6"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; @@ -1528,14 +1528,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.12.0"; + name = "xf86-video-intel-2.13.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2; - sha256 = "1pzzzpw0i55m6s48ac8c3a0453rskqrdb4v6s9dq5bvj3ywpysz1"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.13.0.tar.bz2; + sha256 = "11y85xsm21zaadn7di8vkglbi5d9ibgghzfbjhlkgbn4s3lgmcnq"; }; - buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; @@ -1798,11 +1798,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-11.0.1"; + name = "xf86-video-vmware-11.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2; - sha256 = "1gp7gj1a1jdcqr8qa9z57h1zjf0wjhr78b7fyxbl9fl1rdd1sdx6"; + url = mirror://xorg/individual/driver/xf86-video-vmware-11.0.2.tar.bz2; + sha256 = "1lkmyichry4kz4mhj35ry482rflz622gq8j788iq8j5rcjjrvcga"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index c542576d900a..7c0748893ee4 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -7,11 +7,11 @@ mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2 mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-adobe-75dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-100dpi-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-75dpi-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-type1-1.0.2.tar.bz2 +mirror://xorg/individual/font/font-adobe-100dpi-1.0.2.tar.bz2 +mirror://xorg/individual/font/font-adobe-75dpi-1.0.2.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/font-alias-1.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/font-arabic-misc-1.0.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/font-bh-100dpi-1.0.1.tar.bz2 @@ -114,11 +114,12 @@ mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.5.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-vmmouse-12.6.10.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2 @@ -134,7 +135,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.13.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2 @@ -161,7 +162,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-11.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2 -- cgit 1.4.1 From 8a191cddd874be0709494b37870ff5d7cb269446 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 13 Oct 2010 11:43:59 +0000 Subject: Fix include paths for xf86inputsynaptics svn path=/nixpkgs/trunk/; revision=24259 --- pkgs/servers/x11/xorg/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/servers') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f8de24193748..5829a55f239f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1364,6 +1364,7 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2; sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh"; }; + preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg"''; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; -- cgit 1.4.1 From fada13658f6b66a10e8a97370eb141be04039b4d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 14 Oct 2010 10:51:52 +0000 Subject: Fix xf86inputsynaptics svn path=/nixpkgs/trunk/; revision=24274 --- pkgs/servers/x11/xorg/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5829a55f239f..14be8c440a11 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1364,7 +1364,10 @@ let url = mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2; sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh"; }; - preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg"''; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg" + ''; + configureFlags = [ "--with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ]; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; -- cgit 1.4.1 From 5a54c03c820473a875a1d275a03776ec122cf31b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 19 Oct 2010 07:06:16 +0000 Subject: update mysql51 to mysql 5.1.51 svn path=/nixpkgs/trunk/; revision=24355 --- pkgs/servers/sql/mysql51/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix index 64ffac0439b1..b1dda007fef8 100644 --- a/pkgs/servers/sql/mysql51/default.nix +++ b/pkgs/servers/sql/mysql51/default.nix @@ -3,11 +3,11 @@ # Note: zlib is not required; MySQL can use an internal zlib. stdenv.mkDerivation { - name = "mysql-5.1.41"; + name = "mysql-5.1.51"; src = fetchurl { - url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.1/mysql-5.1.41.tar.gz; - sha256 = "05mwinpq35iaglylw5n772vv2p1kxyni6f2hv081gxm58gdj3dsw"; + url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.1/mysql-5.1.51.tar.gz; + sha256 = "10i8ljsv7j1ggbqjmi7h6ahlgnaihh70z58n8rnl53065wi65n9r"; }; buildInputs = [ps ncurses zlib perl openssl]; -- cgit 1.4.1 From 346dbcdad392a6118cf528da48522b06cd849d82 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 Oct 2010 08:09:41 +0000 Subject: GNU MyServer 0.10. svn path=/nixpkgs/trunk/; revision=24359 --- pkgs/servers/http/myserver/default.nix | 15 ++++++---- .../myserver/disable-dns-lookup-in-chroot.patch | 12 ++++++++ pkgs/servers/http/myserver/tests-in-chroot.patch | 35 ---------------------- 3 files changed, 22 insertions(+), 40 deletions(-) create mode 100644 pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch delete mode 100644 pkgs/servers/http/myserver/tests-in-chroot.patch (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 45e7f33681f0..776c121399e2 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,22 +1,27 @@ { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, texinfo, cppunit, xz }: +, libxml2, zlib, guile, texinfo, cppunit, xz }: -let version = "0.9.2"; in +let version = "0.10"; in stdenv.mkDerivation rec { name = "myserver-${version}"; src = fetchurl { url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; - sha256 = "110001ssyrvmvqrkxbz09a5m945ahh478v1l7aq31gh1l9j0cf6n"; + sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb"; }; - patches = [ ./tests-in-chroot.patch ]; + patches = [ ./disable-dns-lookup-in-chroot.patch ]; - buildInputs = [ libgcrypt libevent libidn gnutls libxml2 zlib texinfo xz ] + buildInputs = + [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ] ++ stdenv.lib.optional doCheck cppunit; + makeFlags = [ "V=1" ]; + doCheck = true; + enableParallelBuilding = true; + meta = { description = "GNU MyServer, a powerful and easy to configure web server"; diff --git a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch new file mode 100644 index 000000000000..31b24915c4da --- /dev/null +++ b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch @@ -0,0 +1,12 @@ +Disable this test because it attempts to do a DNS lookup, which fails +in a chroot. + +--- myserver-0.10/tests/test_socket.cpp 2010-10-19 00:12:59.000000000 +0200 ++++ myserver-0.10/tests/test_socket.cpp 2010-10-19 00:13:07.000000000 +0200 +@@ -56,7 +56,6 @@ class TestSocket : public CppUnit::TestF + + CPPUNIT_TEST (testGethostname); + CPPUNIT_TEST (testRecv); +- CPPUNIT_TEST (testGetLocalIPsList); + + CPPUNIT_TEST_SUITE_END (); diff --git a/pkgs/servers/http/myserver/tests-in-chroot.patch b/pkgs/servers/http/myserver/tests-in-chroot.patch deleted file mode 100644 index 83d1adf7c5b6..000000000000 --- a/pkgs/servers/http/myserver/tests-in-chroot.patch +++ /dev/null @@ -1,35 +0,0 @@ -Some of the tests can't be run in a chroot: - - - `test_homedir' wants to access /etc/passwd. - - `test_socket' would want /etc/hosts. - ---- myserver-0.9.2/tests/test_homedir.cpp 2010-02-14 21:04:14.000000000 +0100 -+++ myserver-0.9.2/tests/test_homedir.cpp 2010-02-16 11:22:23.000000000 +0100 -@@ -58,6 +58,7 @@ public: - * if it doesn't handle this differently. */ - username.assign ("root"); - #endif -+#if 0 - string dir; - - CPPUNIT_ASSERT_EQUAL (homeDir->getHomeDir (username, dir), 0); -@@ -65,6 +66,7 @@ public: - CPPUNIT_ASSERT (dir.length ()); - - homeDir->clear (); -+#endif - } - - }; - ---- myserver-0.9.2/tests/test_socket.cpp 2010-02-14 21:04:14.000000000 +0100 -+++ myserver-0.9.2/tests/test_socket.cpp 2010-02-16 11:31:00.000000000 +0100 -@@ -178,7 +178,7 @@ static DEFINE_THREAD (testRecvClient, pP - { - int ret; - Socket *obj2 = new Socket; -- char host[] = "localhost"; -+ char host[] = "127.0.0.1"; - - ret = obj2->socket (AF_INET, SOCK_STREAM, 0); - CPPUNIT_ASSERT (ret != -1); -- cgit 1.4.1 From c7a87b1669f875e9d84830a1bd8d98bb48147d87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Oct 2010 15:39:48 +0000 Subject: Added an expression for mod_fastcgi-2.4.6, to be used with Apache 2. svn path=/nixpkgs/trunk/; revision=24406 --- .../http/apache-modules/mod_fastcgi/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/http/apache-modules/mod_fastcgi/default.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix new file mode 100644 index 000000000000..5c32b2c4572f --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, apacheHttpd }: + +stdenv.mkDerivation { + name = "mod_fastcgi-2.4.6"; + + src = fetchurl { + url = "http://www.fastcgi.com/dist/mod_fastcgi-2.4.6.tar.gz"; + sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; + }; + + buildInputs = [ apacheHttpd ]; + + preBuild = '' + cp Makefile.AP2 Makefile + makeFlags="top_dir=${apacheHttpd} prefix=$out" + ''; + + meta = { + homepage = "http://www.fastcgi.com/"; + description = "Provide support for the FastCGI protocol"; + + longDescription = '' + mod_fastcgi is a module for the Apache web server that enables + FastCGI - a standards based protocol for communicating with + applications that generate dynamic content for web pages. FastCGI + provides a superset of CGI functionality, but a subset of the + functionality of programming for a particular web server API. + Nonetheless, the feature set is rich enough for programming + virtually any type of web application, but the result is generally + more scalable. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e479dda7eca..20f787cfb28d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,6 +4189,8 @@ let mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; + mpd = callPackage ../servers/mpd { }; myserver = callPackage ../servers/http/myserver { }; -- cgit 1.4.1 From b6693acfb21d67ab49905aa8222ecda3c96da019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Oct 2010 15:39:53 +0000 Subject: pkgs/servers/http/apache-httpd: added meta.license information svn path=/nixpkgs/trunk/; revision=24407 --- pkgs/servers/http/apache-httpd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 6048a2fa81b0..b4cc2332e836 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -36,9 +36,10 @@ stdenv.mkDerivation rec { passthru = { inherit apr aprutil sslSupport proxySupport; }; - + meta = { description = "Apache HTTPD, the world's most popular web server"; homepage = http://httpd.apache.org/; + license = "ASL2.0"; }; } -- cgit 1.4.1 From 7b630f442ccc854bbd561000d6d32ef4f0b5258c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Oct 2010 15:39:58 +0000 Subject: Added an expression for mod_wsgi-3.3, to be used with Apache 2. svn path=/nixpkgs/trunk/; revision=24408 --- .../http/apache-modules/mod_wsgi/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/http/apache-modules/mod_wsgi/default.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix new file mode 100644 index 000000000000..c866c79e10d8 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, apacheHttpd, python }: + +stdenv.mkDerivation { + name = "mod_wsgi-3.3"; + + src = fetchurl { + url = "http://modwsgi.googlecode.com/files/mod_wsgi-3.3.tar.gz"; + sha256 = "0hrjksym0dlqn1ka1yf3x6ar801zqxfykwcxazjwz104k5w10vnr"; + }; + + buildInputs = [ apacheHttpd python ]; + + patchPhase = '' + sed -r -i "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" configure + ''; + + meta = { + homepage = "http://code.google.com/p/modwsgi/"; + description = "Host Python applications in Apache through the WSGI interface"; + license = "ASL2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f787cfb28d..fb72f78e358e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4191,6 +4191,8 @@ let mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; + mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; + mpd = callPackage ../servers/mpd { }; myserver = callPackage ../servers/http/myserver { }; -- cgit 1.4.1