diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dict/1.9.15.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/dns/bind/9.5.0.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/gpm/1.20.6.nix | 22 | ||||
-rw-r--r-- | pkgs/servers/gpm/default.nix | 22 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 16 |
7 files changed, 34 insertions, 38 deletions
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix index 9eb0fe3dff9d..de9c4f7eeae8 100644 --- a/pkgs/servers/dict/1.9.15.nix +++ b/pkgs/servers/dict/1.9.15.nix @@ -11,7 +11,7 @@ args : with args; with builderDefs; }) // args); in with localDefs; stdenv.mkDerivation rec { - name = "dict-"+version; + name = "dict-1.9.15"; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); diff --git a/pkgs/servers/dns/bind/9.5.0.nix b/pkgs/servers/dns/bind/9.5.0.nix index 9e73895d8d91..b6361864d10b 100644 --- a/pkgs/servers/dns/bind/9.5.0.nix +++ b/pkgs/servers/dns/bind/9.5.0.nix @@ -12,7 +12,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doConfigure" "doMakeInstall"]; - name = "bind-" + version; + name = "bind-9.5.0"; meta = { description = "ISC BIND: a domain name server"; }; diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix deleted file mode 100644 index 6e9e6e64d518..000000000000 --- a/pkgs/servers/gpm/1.20.6.nix +++ /dev/null @@ -1,22 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://linux.schottelius.org/gpm/archives/gpm-1.20.6.tar.lzma; - sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7"; - }; - - buildInputs = [lzma flex bison ncurses]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - - preConfigure = fullDepEntry ('' - sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in - '') ["addInputs" "doUnpack" "minInit"]; - - name = "gpm-" + version; - meta = { - description = "Mouse daemon"; - }; -} diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix new file mode 100644 index 000000000000..5ab57b2cb3ef --- /dev/null +++ b/pkgs/servers/gpm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, flex, bison, ncurses }: + +stdenv.mkDerivation rec { + name = "gpm-1.20.6"; + + src = fetchurl { + url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; + sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; + }; + + buildInputs = [ flex bison ncurses ]; + + preConfigure = + '' + sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in + ''; + + meta = { + homepage = http://www.nico.schottelius.org/software/gpm/; + description = "A daemon that provides mouse support on the Linux console"; + }; +} diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index c35295245756..066dfff36a73 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, apacheAnt, jdk, unzip}: stdenv.mkDerivation { - name = "axis2-1.5"; + name = "axis2-1.5.1"; src = fetchurl { - url = http://apache.mirror.easycolocate.nl/ws/axis2/1_5/axis2-1.5-bin.zip; - sha256 = "0f0a471xfsjx7s3i9awhajl1kli8y8pd8aiki7cwb9n4g467rwmc"; + url = http://www.bizdirusa.com/mirrors/apache/ws/axis2/1_5_1/axis2-1.5.1-bin.zip; + sha256 = "04zcn9g4r7pxfpp5g5rpjjlddr5mibqmsz4lfbkz2vjf3jrldgy5"; }; buildInputs = [ unzip apacheAnt jdk ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 33bf8e4aa806..5986a937c477 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -100,7 +100,7 @@ [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto - xorg.libdmx xorg.xf86vidmodeproto + xorg.libdmx xorg.xf86vidmodeproto xorg.libXext ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 405afc189c2e..7d81dd0accfd 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,15 +1,10 @@ -{stdenv, fetchurl, fetchsvn, expat, erlang, zlib, openssl, pam}: +{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: stdenv.mkDerivation rec { - name = "ejabberd-2.0.5"; - #src = fetchurl { - # url = http://www.process-one.net/downloads/ejabberd/2.0.5/ejabberd-2.0.5.tar.gz; - # sha256 = "130rjl93l54c7p4glsfn3j7xwpwdyinhj6pp1di3mdx2mzi91vrp"; - #}; - src = fetchsvn { - url = http://svn.process-one.net/ejabberd/trunk; - rev = "2666"; - sha256 = "c927ddc08c9cd748db93f48bcae96f9bd1c36e1ce107c9b4774e5423574ab7cb"; + name = "ejabberd-2.1.0"; + src = fetchurl { + url = http://www.process-one.net/downloads/ejabberd/2.1.0/ejabberd-2.1.0.tar.gz; + sha256 = "16gn5ag3zyv578bqbz134l13cy1gl1xfa5y7dnqxgpr9gkdyrp5q"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' @@ -24,5 +19,6 @@ stdenv.mkDerivation rec { description = "Open-source XMPP application server written in Erlang"; license = "GPLv2"; homepage = http://www.ejabberd.im; + maintainers = [ lib.maintainers.sander ]; }; } |