diff options
Diffstat (limited to 'pkgs/servers')
44 files changed, 448 insertions, 211 deletions
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 8b4903c86022..ea91993e7231 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0-alpha.4"; name = "etcd-${version}"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + inherit stdenv lib fetchFromGitHub; }; buildInputs = [ go ]; diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix index e9fd4a50d3e0..1cd8309ad5d0 100644 --- a/pkgs/servers/etcd/deps.nix +++ b/pkgs/servers/etcd/deps.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub }: let goDeps = [ @@ -7,35 +8,8 @@ let src = fetchFromGitHub { owner = "coreos"; repo = "etcd"; - rev = "9970141f76241c909977af7bafe7b6f2c4923de8"; - sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy"; - }; - } - { - root = "github.com/stathat/go"; - src = fetchFromGitHub { - owner = "stathat"; - repo = "go"; - rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; - sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; - }; - } - { - root = "github.com/stretchr/objx"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - root = "github.com/stretchr/testify"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "testify"; - rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; - sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + rev = "d01d6119e54f729f54e9776ad5729277fcf38668"; + sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns"; }; } ]; diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index e3a53c85052e..9a122ae90a69 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -1,30 +1,33 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.5.0"; name = "fleet-${version}"; + version = "0.9.0"; - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + src = fetchFromGitHub { + owner = "coreos"; + repo = "fleet"; + rev = "v${version}"; + sha256 = "0gjminfprprs1nmg9y9a0qkyl9spixrk4pc2b7bl0lxdgpq2yiid"; }; buildInputs = [ go ]; buildPhase = '' - export GOPATH=$src - go build -v -o fleet github.com/coreos/fleet + patchShebangs build + ./build ''; installPhase = '' - mkdir -p $out/bin - mv fleet $out/bin + mkdir -p $out + mv bin $out ''; meta = with stdenv.lib; { description = "A distributed init system"; homepage = http://coreos.com/using-coreos/clustering/; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan offline ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/fleet/deps.nix b/pkgs/servers/fleet/deps.nix deleted file mode 100644 index d0529db37a2f..000000000000 --- a/pkgs/servers/fleet/deps.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -let - goDeps = [ - { - root = "code.google.com/p/gogoprotobuf"; - src = fetchgit { - url = "https://code.google.com/p/gogoprotobuf"; - rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946"; - sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9"; - }; - } - { - root = "github.com/coreos/etcd"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "etcd"; - rev = "1359d29fa451b059bb76b51260610d92853e7316"; - sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7"; - }; - } - { - root = "github.com/coreos/fleet"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "fleet"; - rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c"; - sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8"; - }; - } - { - root = "github.com/coreos/raft"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "raft"; - rev = "67dca7288f1665b59860421673d46314f4348e45"; - sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw"; - }; - } - { - root = "github.com/stathat/go"; - src = fetchFromGitHub { - owner = "stathat"; - repo = "go"; - rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; - sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; - }; - } - { - root = "github.com/stretchr/objx"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - root = "github.com/stretchr/testify"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "testify"; - rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; - sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -} - diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix new file mode 100644 index 000000000000..de5be18713ed --- /dev/null +++ b/pkgs/servers/hbase/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, jre, makeWrapper }: +stdenv.mkDerivation { + name = "hbase-0.98.8"; + src = fetchurl { + url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz; + sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6"; + }; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out + cp -R * $out + ''; + meta = with stdenv.lib; { + description = "A distributed, scalable, big data store"; + homepage = https://hbase.apache.org; + license = licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix new file mode 100644 index 000000000000..41afc9b40af8 --- /dev/null +++ b/pkgs/servers/http/jetty/9.2.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jetty-9.2.5"; + + src = fetchurl { + url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1"; + name = "jetty-distribution-9.2.5.v20141112.tar.gz"; + sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out + mv etc lib modules start.jar $out + ''; + + meta = { + description = "A Web server and javax.servlet container"; + + homepage = http://www.eclipse.org/jetty/; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.all; + + license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + }; +} diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 899914b6446d..8803b8134f7a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index a946672f9a7e..009b091d15f1 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.7"; + version = "1.7.8"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1lmzq36ysi0hwvqpiaz0dpmwvdwbrn9aw1rm1xcabkl2g855l0by"; + sha256 = "1rg8c2z6df6flz5vz6k7iixm4f3d27svnncf810vilyk0b1mxxqj"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in index 219ab9763ada..1afe8854fed1 100644 --- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in @@ -51,7 +51,7 @@ case "$QUERY_STRING" in *.narinfo) hash=${QUERY_STRING%.narinfo} hash=${hash#/} - path="$(echo "$STORE_DIR/$hash-"* )" + path="$(echo "$STORE_DIR/$hash-"* | @coreutils@/sort | @coreutils@/head -n 1)" if [ -n "$path" ] && [ -e "$path" ]; then header info="$( diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 8b940fdb0cfc..4a89c5ad83b1 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -1,28 +1,28 @@ {stdenv, fetchurl , libxml2, libxslt, curl -, libvorbis, libtheora, speex, libkate }: +, libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.3.3"; + name = "icecast-2.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"; }; - buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; meta = { description = "Server software for streaming multimedia"; longDescription = '' - Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 - audio streams. It can be used to create an Internet radio station or a - privately running jukebox and many things in between. It is very versatile in - that new formats can be added relatively easily and supports open standards for - commuincation and interaction. + Icecast is a streaming media server which currently supports + Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. + It can be used to create an Internet radio station or a privately + running jukebox and many things in between. It is very versatile + in that new formats can be added relatively easily and supports + open standards for commuincation and interaction. ''; - homepage = http://www.icecast.org; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7c442bf8c7ec..8cabb8cac942 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.postfix.org/; + homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix new file mode 100644 index 000000000000..5c3938c1b6e8 --- /dev/null +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, go }: +stdenv.mkDerivation rec { + name = "bosun-${version}"; + version = "20141204222654"; + src = fetchurl { + url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; + sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src + mv bosun-${version} src/bosun.org + + export GOPATH=$PWD + go build -v -o bosun src/bosun.org/cmd/bosun/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bosun $out/bin + ''; + + meta = with stdenv.lib; { + description = "Time series alerting framework"; + longDescription = '' + An advanced, open-source monitoring and alerting system by Stack Exchange. + ''; + homepage = http://bosun.org; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix new file mode 100644 index 000000000000..176d42d382a2 --- /dev/null +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, go }: +stdenv.mkDerivation rec { + name = "scollector-${version}"; + version = "20141204222654"; + src = fetchurl { + url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; + sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src + mv bosun-${version} src/bosun.org + + export GOPATH=$PWD + go build -v -o scollector src/bosun.org/cmd/scollector/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp scollector $out/bin + ''; + + meta = with stdenv.lib; { + description = "Collect system information and store it in OpenTSDB or Bosun"; + homepage = http://bosun.org/scollector; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index eaaaa6c32bf9..b671fbf877ac 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.21"; + version = "2.0.25"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8"; + sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix new file mode 100644 index 000000000000..7551bdf96692 --- /dev/null +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "newrelic-sysmond-1.5.1.93"; + + src = fetchurl { + url = "http://download.newrelic.com/server_monitor/release/newrelic-sysmond-1.5.1.93-linux.tar.gz"; + + sha256 = "1bfwyczcf7pvji8lx566jxgy8dhyf1gmqmi64lj10673a86axnwz"; + }; + + installPhase = '' + mkdir -p $out/bin + install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/nrsysmond + ''; + + meta = { + homepage = http://newrelic.com/; + + description = "System-wide monitoring for newrelic"; + + license = stdenv.lib.licenses.unfree; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index e428067ab62b..ab8365c23f81 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre src ]; + buildInputs = [ makeWrapper jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index ca4df9ce340a..47f1b7a867b0 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; + sha256 = "0cjj3c4j4b9sl3hgh1fck330z9q0gz2k68g227y0paal6k6f54g7"; }; preConfigure = diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 12bbd8c68112..4b1e8569cd91 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "3"; + minor = "6"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; - sha256 = "0m1xh4diip912zwqj54p75a4iy71a9wpx5ilvf7qa17b9sm0czr4"; + sha256 = "023h2d9x4yg1z2glnwf8h2j0p1xhn1hb0wf02mg70j3p0bz63imj"; }; buildInputs = [ pkgconfig glib boost ] diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix new file mode 100644 index 000000000000..19482db6f5a6 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/busybee.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + libpo6, libe, pkgconfig }: + +stdenv.mkDerivation rec { + name = "busybee-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip"; + sha256 = "0gr5h2j9rzwarblgcgddnxj39i282rvgn9vqlrcd60dx8c4dkm29"; + }; + buildInputs = [ + autoconf + automake + libe + libpo6 + libtool + pkgconfig + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "BusyBee is a high-performance messaging layer."; + homepage = https://github.com/rescrv/busybee; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix new file mode 100644 index 000000000000..036a3412b864 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, + python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + flex, haskellPackages, help2man, autoconf-archive, callPackage }: + +assert stdenv.isLinux; + +let +hyperleveldb = callPackage ./hyperleveldb.nix {}; +libpo6 = callPackage ./libpo6.nix {}; +libe = callPackage ./libe.nix { inherit libpo6; }; +busybee = callPackage ./busybee.nix { inherit libpo6 libe; }; +replicant = callPackage ./replicant.nix { + inherit libpo6 libe busybee hyperleveldb; +}; +libmacaroons = callPackage ./libmacaroons.nix { }; + +in +stdenv.mkDerivation rec { + name = "hyperdex-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip"; + sha256 = "0s1capy2hj45f5rmdb4fk0wxy7vz69krplhba57f6wrkpcz1zb57"; + }; + + buildInputs = [ + autoconf + autoconf-archive + automake + busybee + glog + hyperleveldb + json_c + libe + libmacaroons + libpo6 + libtool + pkgconfig + popt + python + replicant + unzip + gperf + yacc + flex + help2man + haskellPackages.pandoc + ]; + preConfigure = "autoreconf -fi"; + + meta = with stdenv.lib; { + description = "HyperDex is a scalable, searchable key-value store"; + homepage = http://hyperdex.org; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix new file mode 100644 index 000000000000..c39f618f6cb1 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "hyperleveldb-${version}"; + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip"; + sha256 = "0xrzhwkrm7f2wz3jn4iqn1dim2pmgjhmpb1fy23fwa06v0q18hw8"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''A fork of LevelDB intended to meet the needs of + HyperDex while remaining compatible with LevelDB.''; + homepage = https://github.com/rescrv/HyperLevelDB; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix new file mode 100644 index 000000000000..cc5232e13f22 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libe.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libe-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "https://github.com/rescrv/e/archive/releases/0.8.1.zip"; + sha256 = "1l13axsi52j2qaxbdnszdvfxksi7rwm2j1rrf0nlh990m6a3yg3s"; + }; + buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "Library containing high-performance datastructures and utilities for C++"; + homepage = https://github.com/rescrv/e; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix new file mode 100644 index 000000000000..2d709c5bbd1d --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + pkgconfig, sodium, python }: +stdenv.mkDerivation rec { + name = "libmacaroons-${version}"; + version = "HEAD"; + + src = fetchurl { + url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; + sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; + }; + buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''Macaroons are flexible authorization credentials that + support decentralized delegation, attenuation, and verification.''; + homepage = https://github.com/rescrv/libmacaroons; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix new file mode 100644 index 000000000000..166a5e21c6b9 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libpo6.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libpo6-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/po6/archive/releases/${version}.zip"; + sha256 = "14g3ichshnc4wd0iq3q3ymgaq84gjsbqcyn6lri7c7djgkhqijjx"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "POSIX wrappers for C++"; + homepage = https://github.com/rescrv/po6; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix new file mode 100644 index 000000000000..c064aa419cde --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/replicant.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog, + hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }: + +stdenv.mkDerivation rec { + name = "replicant-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/Replicant/archive/releases/0.6.3.zip"; + sha256 = "1fbagz0nbvinkqr5iw5y187dm4klkswrxnl5ysq8waglg2nj8zzi"; + }; + buildInputs = [ + autoconf + automake + busybee + glog + hyperleveldb + libe + libpo6 + libtool + pkgconfig + popt + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "A system for maintaining replicated state machines."; + homepage = https://github.com/rescrv/Replicant; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 02cdc02cd4d8..62ea55d00c12 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let version = "2.6.5"; +let version = "2.6.6"; system-libraries = [ "pcre" "boost" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "0v58kyp4cj4yag0djnswfiifrcll5y7x772y99b3afg89xicpmjm"; + sha256 = "0shb069xsqyslazdq66smr7ifppvdclbzpdjhrj2y3qb78y70pbm"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e733ef3d009e..b9c2e83d5828 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://redis.io; description = "An open source, advanced key-value store"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 727fb810e6e8..1c8eac99737c 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }: stdenv.mkDerivation rec { - name = "rethinkdb-1.14.1"; + name = "rethinkdb-1.15.2"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "0brsbb289hcsmipma4rsgrkqpqagwff2y6w46dvb25n95id65hx8"; + sha256 = "1fpx9apqm62i332q2isanpdql8gwwab4qxwzrspqwgcka9zd6gy3"; }; preConfigure = '' diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 4f4ec5cbc069..5c1b2c16c6d6 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -2,6 +2,7 @@ kernel, glibc, ncurses, perl, krb5 }: assert stdenv.isLinux; +assert builtins.substring 0 4 kernel.version != "3.18"; stdenv.mkDerivation { name = "openafs-1.6.9-${kernel.version}"; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 781fca1c33d2..1e476cb2301a 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}: +{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let ssl = stdenv.lib.optionals uwimap.withSSL @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - buildInputs = [ openssl db zlib uwimap htmlTidy pam ]; + buildInputs = [ openssl db zlib uwimap html-tidy pam ]; nativeBuildInputs = [ perl ]; NIX_LDFLAGS = "-lpam"; diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index d6952e9700ee..cf07d0e6e3e1 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/restund-.*[.]tar[.]"; + broken = true; # probably due to glibc-2.20 }; } diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 8d8a677647c2..31be5eef7c8c 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "ONC RPC portmapper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Universal addresses to RPC program number mapper. ''; diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 039128e9df4c..491dc625cf21 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,4 +1,9 @@ -{stdenv, fetchurl, skalibs, execline}: +{ stdenv +, execline +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,38 +18,13 @@ in stdenv.mkDerivation rec { sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; }; - buildInputs = [ skalibs execline ]; + buildInputs = [ skalibs execline skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include - printf "%s\n%s" "${skalibs}/lib" "${execline}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ --replace '"execlineb"' '"${execline}/bin/execlineb"' - - patchShebangs src/sys ''; meta = { diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 443e7af71ad7..a5dbaa1731de 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "solr-${version}"; - version = "4.7.0"; + version = "4.10.2"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "0qm3pnhpfqjxdl0xiwffrcchp79q3ja5w5d278bkkxglc2y1y4xc"; + sha256 = "07wwfgwcca3ndjrkfk7qyc4q8bdhwr0s6h4ijl4sqdy65aqcc6qh"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index c4a5fcc4284e..5b6ff15cb10a 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg libzrtpcpp ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = http://freeswitch.org/; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 04f820223731..3c36b1aad6ba 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.14"; + version = "10.0.15"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "07g3w841q8qw0mwi6grk65a2iky9x3axpxkb4c2a72i7pd7cl3mc"; + sha256 = "1n09553brmprs9m6siwjc1ca4b9b1giqasv3mhdrnijda1lcnm4i"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + enableParallelBuilding = true; prePatch = '' diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index b422b9938320..3389f8114896 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mysql-5.1.73"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.1/${name}.tar.gz"; sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5c57ae87d202..64fbabb08001 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "5.5.40"; src = fetchurl { - url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8aa15ee9f82f..27958494d174 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "3.2.1"; + version = "3.2.7"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0x7s5k9wxkw0rcs4c2mdrmmjpcfmbh5pvvpj8brrwnkgx072n53c"; + sha256 = "12g9x1k0l89rdlaw260561m17yc0bkp62prg3y05z6gbs7khh2xh"; }; buildInputs = [ unzip ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index efe35b42b40d..4fe6354fd33d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1375,11 +1375,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.8.4"; + name = "xf86-input-evdev-2.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2; - sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2; + sha256 = "1y82hpx86rngb0yrvcl4ni88wkc3zf9dj25myjk91b7ymll07qqc"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2; sha256 = "00gd3v3xgrmj8aliwjxkml13gfqvcbjazb6l5m1wkry39agq36j0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1645,11 +1645,11 @@ let }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videoqxl = (mkDerivation "xf86videoqxl" { - name = "xf86-video-qxl-0.1.2"; + name = "xf86-video-qxl-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2; - sha256 = "09sjpkg7klzzg9sagmqpsw911501vqk9wdd4nr0jkqqanvkx39s3"; + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2; + sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1865,11 +1865,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.2.4"; + name = "xkbcomp-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2; - sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"; + url = mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2; + sha256 = "0aibcbhhjlwcrxh943xg2dswwx5bz1x0pmhs28b55gzsg0vrgb6g"; }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; }) // {inherit libX11 libxkbfile xproto ;}; @@ -1985,14 +1985,14 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.16.1"; + name = "xorg-server-1.16.2.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2; - sha256 = "0q706wdbwipyfcvywl7apih3p5mrms3p0wr1hdj5jyzvr5p7qrzl"; + url = mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2; + sha256 = "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"; }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; - }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c6618d3b105..7b2c20e05eb6 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,6 +36,8 @@ $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; +$pcMap{"\$DRI3PROTO"} = "dri3proto"; +$pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; @@ -207,6 +209,7 @@ while (<>) { process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; + process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; push @requires, "libxslt" if $pkg =~ /libxcb/; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a29d184e48c6..45122780cddf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -173,6 +173,7 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; + buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ]; }; xf86inputmouse = attrs: attrs // { @@ -194,6 +195,11 @@ in "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/patch/" + + "?id=1cbbc03c4b37d57760c57bd2e0b0f89d744a5795"; + sha256 = "1qkhwj2yal0cz15lv9557d10ylvxlq05ibq43pm2rrvqdg3mb6h4"; + })]; }; xf86videoati = attrs: attrs // { @@ -209,6 +215,11 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" + + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; + sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; + })]; }; xf86videoqxl = attrs: attrs // { @@ -255,7 +266,7 @@ in recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto libpciaccess inputproto xextproto randrproto renderproto presentproto - dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d3a2f1b45f96..0630488dcfac 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.3.tar.bz2 +mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 @@ -115,7 +115,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.8.4.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 @@ -138,7 +138,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ae625240798d..f43a9c671604 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,5 +1,5 @@ -{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper } : +{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: with stdenv.lib; @@ -34,7 +34,7 @@ overrideDerivation xorgserver (oldAttrs: { homepage = http://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; -}; + }; } |