diff options
author | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
commit | 9229e9c6563d88f1b9413ce128e022921089413f (patch) | |
tree | cc1ce2eda51dd7cebe7a75e342cfcaf88c45e2f5 /pkgs/servers | |
parent | 051662610104c2c57b89783084b9f31f5e978c71 (diff) | |
parent | 6205f17ea43fd74e4aff14a24a5734ec33415fd7 (diff) | |
download | nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.gz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.bz2 nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.lz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.xz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.zst nixlib-9229e9c6563d88f1b9413ce128e022921089413f.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/plex/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/quagga/default.nix | 72 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 42 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 36 |
6 files changed, 118 insertions, 46 deletions
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 2aeb9379e10f..29cd45714d7f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "plex-${version}"; - version = "0.9.14.6.1620"; - vsnHash = "e0b7243"; + version = "0.9.15.2.1663"; + vsnHash = "7efd046"; src = fetchurl { url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; - sha256 = "0br82yxnvjapvsrb0mbfd12mx7qqi9zh623jnivsjk2gxbfd3ki1"; + sha256 = "f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf"; }; buildInputs = [ rpmextract glibc ]; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix new file mode 100644 index 000000000000..cdc2905d62db --- /dev/null +++ b/pkgs/servers/quagga/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }: + +stdenv.mkDerivation rec { + name = "quagga-${version}"; + version = "0.99.24.1"; + + src = fetchurl { + url = "mirror://savannah/quagga/${name}.tar.gz"; + sha256 = "0kvmc810m7ssrvgb3213271rpywyxb646v5bzjl1jl88vx3imbl4"; + }; + + buildInputs = + [ readline net_snmp ] + ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; + + nativeBuildInputs = [ perl texinfo ]; + + configureFlags = [ + "--sysconfdir=/etc/quagga" + "--localstatedir=/run/quagga" + "--sbindir=$(out)/libexec/quagga" + "--disable-exampledir" + "--enable-user=quagga" + "--enable-group=quagga" + "--enable-configfile-mask=0640" + "--enable-logfile-mask=0640" + "--enable-vtysh" + "--enable-vty-group=quaggavty" + "--enable-snmp" + "--enable-multipath=64" + "--enable-rtadv" + "--enable-irdp" + "--enable-opaque-lsa" + "--enable-ospf-te" + "--enable-pimd" + "--enable-isis-topology" + ]; + + preConfigure = '' + substituteInPlace vtysh/vtysh.c --replace \"more\" \"${less}/bin/less\" + ''; + + postInstall = '' + rm -f $out/bin/test_igmpv3_join + mv -f $out/libexec/quagga/ospfclient $out/bin/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite"; + longDescription = '' + GNU Quagga is free software which manages TCP/IP based routing protocols. + It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as + well as the IPv6 versions of these. + + As the predecessor Zebra has been considered orphaned, the Quagga project + has been formed by members of the zebra mailing list and the former + zebra-pj project to continue developing. + + Quagga uses threading if the kernel supports it, but can also run on + kernels that do not support threading. Each protocol has its own daemon. + + It is more than a routed replacement, it can be used as a Route Server and + a Route Reflector. + ''; + homepage = http://www.quagga.net/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ tavyc ]; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b9ea5d7c5828..bb9e73d31cd3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1568,11 +1568,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.0"; + name = "xf86-input-evdev-2.10.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2; - sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2; + sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index ddda39c76f7f..d0a812e45d6a 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2 diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 4481ad4a14a6..f732e29acc95 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,37 +1,39 @@ -a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } : + +stdenv.mkDerivation rec { + name = "pyIRCt-${version}"; + version = "0.4"; - version = a.lib.attrByPath ["version"] "0.4" a; - buildInputs = with a; [ - xmpppy pythonIRClib python makeWrapper - ]; -in -rec { src = fetchurl { url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ pythonPackages.wrapPython ]; + + pythonPath = [ + xmpppy pythonIRClib + ]; /* doConfigure should be removed if not needed */ - phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - deploy = a.fullDepEntry ('' + # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; + + installPhase = '' mkdir -p $out/bin $out/share/${name} - sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py + sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/$name - echo "#! /bin/sh" > $out/bin/pyIRCt - echo "cd $out/share/${name}" >> $out/bin/pyIRCt - echo "./irc.py \"$@\"" >> $out/bin/pyIRCt + cp * $out/share/${name} + cat > $out/bin/pyIRCt <<EOF + #! /bin/sh + cd $out/share/${name} + ./irc.py \"$@\" + EOF chmod a+rx $out/bin/pyIRCt $out/share/${name}/irc.py - '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; + wrapPythonPrograms + ''; - name = "pyIRCt-" + version; meta = { description = "IRC transport module for XMPP"; }; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index eb4f55f7aebd..f5a91b28633f 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,39 +1,37 @@ -a @ { xmpppy, python, makeWrapper, fetchcvs, ... } : -let - fetchurl = a.fetchurl; +{ stdenv, python, xmpppy, pythonPackages, fetchcvs } : - buildInputs = with a; [ - xmpppy python makeWrapper - ]; -in -rec { - src = a.fetchcvs { +stdenv.mkDerivation rec { + name = "pyMAILt-${version}"; + version = "20090101"; + + src = fetchcvs { cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy"; module = "xmpppy/mail-transport"; date = "2009-01-01"; sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; }; - inherit buildInputs; - configureFlags = []; + pythonPath = [ xmpppy ]; + buildInputs = [ pythonPackages.wrapPython ]; /* doConfigure should be removed if not needed */ - phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)]; - deploy = a.fullDepEntry ('' + installPhase = '' cd mail-transport mkdir -p $out/bin $out/share/${name} - sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py + sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name - echo "#! /bin/sh" > $out/bin/pyMAILt - echo "cd $out/share/${name}" >> $out/bin/pyMAILt - echo "./mail.py \"$@\"" >> $out/bin/pyMAILt + cat > $out/bin/pyMAILt <<EOF + #! /bin/sh + cd $out/share/${name} + ./mail.py \"$@\" + EOF chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py - '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; + wrapPythonPrograms + ''; - name = "pyMAILt-20090101"; meta = { description = "Email transport module for XMPP"; }; |