diff options
Diffstat (limited to 'pkgs/servers')
48 files changed, 361 insertions, 208 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f96f3cc2d14f..889ec4d3745f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.6.6"; + version = "3.6.10"; src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_6_6/rabbitmq-server-3.6.6.tar.xz"; - sha256 = "13mpnyfxd026w525rsnkcw0f8bcrkbzl7k9g8pnqmm3zyny8jmir"; + url = "https://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.xz"; + sha256 = "0k1rhg1a51201b1hp6vaf4fk48hqz7m9hw55b8xnnyz2ld88jiqg"; }; buildInputs = @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env - ''; # */ + ''; meta = { homepage = http://www.rabbitmq.com/; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 8a25188d595f..1bea8006e9f3 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -88,8 +88,8 @@ in { asterisk-lts = common { - version = "13.15.0"; - sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb"; + version = "13.17.1"; + sha256 = "0d7vqpkz0wv8d17vi7qxs9j7dbqwf4n80s411qva030hljcmdqdf"; externals = { "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; @@ -97,8 +97,8 @@ in }; asterisk-stable = common { - version = "14.6.0"; - sha256 = "1d3jjdapfv169d8yhfi92j75iwk9726brv1rjjy288d47jn3sm26"; + version = "14.6.1"; + sha256 = "0xg26p8rx9gw1ym9xdnpxr7bqp0kp76afy7f4ywmh25ki41inz08"; externals = { "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index ea8d2651836a..a4cc5c8780da 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0f7hc8q4sigvr9bdxx8phnp6bkfkz9bccwkrx0xqyrvvdc5x5690"; + sha256 = "1ba8zpcywnnanzqxjaqiyfc6j5qr6jk6laryz8npiqz4grv3qk61"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 0d78f361525b..6d7b332da135 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "2.12.0"; + version = "3.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1kfnsa25axlyhnapfza381p94pyfixh7j999qhpg3ii821n9sggm"; + sha256 = "17pz0rgzdv40sbvzb9w6xmdg598m6gs7gsznfnxcy1j011cgg1wr"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 0013286c03c1..f2ccb523e2ff 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1ixkhc206z3zpiaj46v8z2gxmix24sxqs2d17fb64gkyml9s5gqb"; + sha256 = "12pf0q1ixsf9ld0569mbwvjz5v9bhh7ad3bd8x9qx188vq5cz381"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d4036b52d963..24f5cec8179b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.7"; + version = "0.10.9"; goPackagePath = "github.com/mholt/caddy"; @@ -12,9 +12,19 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1sn959l2cq6pallmngwf1hrjk7qrsfb5wsqbv15xnczl22lvwf13"; + sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55"; }; + patches = [ + # This header was added in 0.10.9 and was since reverted but no new release made + # remove this patch when updating to next release + (fetchpatch { + url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch"; + name = "revert-sponsors-header.patch"; + sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j"; + }) + ]; + buildFlagsArray = '' -ldflags= -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 86995f440040..ebc2685c122f 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -21,6 +21,10 @@ buildGoPackage rec { buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/consul + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = https://www.consul.io/; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index ee0477734c2f..0e6c39ec9245 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -1,22 +1,31 @@ { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }: stdenv.mkDerivation rec { - version = "1.12.1"; name = "dictd-${version}"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2"; }; - buildInputs = [ flex bison which libmaa zlib libtool ]; + buildInputs = [ libmaa zlib ]; + + nativeBuildInputs = [ bison flex libtool which ]; + + enableParallelBuilding = true; patchPhase = "patch -p0 < ${./buildfix.diff}"; - configureFlags = "--datadir=/var/run/current-system/share/dictd"; + configureFlags = [ + "--enable-dictorg" + "--datadir=/run/current-system/share/dictd" + ]; meta = with stdenv.lib; { description = "Dict protocol server and client"; - maintainers = [ maintainers.mornfall ]; - platforms = platforms.linux; + homepage = http://www.dict.org; + license = licenses.gpl2; + maintainers = with maintainers; [ mornfall ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 2ba0146520a4..5b749b92c037 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.28.0"; + version = "3.2.30.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0bv0wj7rny3gh4d6qdyd8widd549ap3fl35sz3q6w9x8sqhw5nfi"; + sha256 = "1aqal7n4a9dvy97zw4aah9a8jm4l2v1qgjgs5kvskrvir2dbid27"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index ec6610b8245f..db9d11219923 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,11 +40,11 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.14"; + version = "3.0.15"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "02ar0xn4dfrs95cmd4c798k95rmnzzvcryyyl2vjv53ak16igmpw"; + sha256 = "1qygf5if2xjzl7kfzwl428ydz5q1m0j5sx077n12v7znlgnwaagx"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -76,10 +76,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://freeradius.org/; + homepage = https://freeradius.org/; description = "A modular, high performance free RADIUS suite"; - license = stdenv.lib.licenses.gpl2; - maintainers = with maintainers; [ sheenobu ]; + license = licenses.gpl2; + maintainers = with maintainers; [ sheenobu willibutz ]; platforms = with platforms; linux; }; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 3393d0cf58b6..ecf9ee9d84a4 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,6 +5,7 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 +, fetchpatch }: let optional = stdenv.lib.optional; @@ -35,10 +36,19 @@ stdenv.mkDerivation rec { optional http2Support nghttp2 ++ optional stdenv.isDarwin libiconv; - patchPhase = '' + prePatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; + patches = [ + (fetchpatch { + name = "CVE-2017-9798.patch"; + url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; + sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; + stripLen = 3; + }) + ]; + # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index c79bbc989bc8..de30870bee83 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); - hardeningEnable = [ "pie" ]; + hardeningEnable = optional (!stdenv.isDarwin) "pie"; postInstall = '' mv $out/sbin $out/bin diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 98141c13c01a..f3222f2982b4 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -51,8 +51,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "echo-nginx-module"; - rev = "v0.57"; - sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000"; + rev = "v0.61"; + sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; }; }; @@ -69,8 +69,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.10.5"; - sha256 = "0wz5j4kqa6hk7ar42bkxp0hd74psjy6sfsldh1a6p93z349iz4v5"; + rev = "v0.10.10"; + sha256 = "1dlqnlkpn3pnhk2m09jdx3iw3m6xk31pw2m5xrpcmqk3bll68mw6"; }; inputs = [ pkgs.luajit ]; preConfigure = '' diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 06594885dbc2..6a29ecaad569 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,20 +32,20 @@ let in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.75"; - sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni"; + versionMinor = "0.81"; + sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq"; }; tomcat8 = common { versionMajor = "8"; - versionMinor = "0.41"; - sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5"; + versionMinor = "0.46"; + sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk"; }; tomcat85 = common { versionMajor = "8"; - versionMinor = "5.14"; - sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w"; + versionMinor = "5.20"; + sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a"; }; tomcatUnstable = common { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index db4ae8045338..594bc8caf5bc 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.7.1308"; + version = "0.8.151"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "07yadywizhq7j986ax5d9dbjn1s5bqw6zrlqp6l32ppc119qhjwf"; + sha256 = "2df2b296b5b314ed035e8d370bf5708a8b5a23957353e2e1e0007ec08a2138a0"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 6a0d7fb588fd..a4186559e89f 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { --replace /bin/bash ${bash}/bin/bash; ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare"; makeFlags = "DESTDIR=$(out) prefix="; @@ -49,5 +49,6 @@ stdenv.mkDerivation { license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/Fruneau/pfixtools; platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ jerith666 ]; }; } diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix new file mode 100644 index 000000000000..1fe07a74f839 --- /dev/null +++ b/pkgs/servers/matterbridge/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchurl }: + +buildGoPackage rec { + name = "matterbridge-${version}"; + version = "1.1.0"; + + goPackagePath = "github.com/42wim/matterbridge"; + + src = fetchurl { + url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; + sha256 = "1br3rf500jdklzpxg1lkagglvmqshhligfkhndi8plg9hmzpd8qp"; + }; + + meta = with stdenv.lib; { + description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; + homepage = https://github.com/42wim/matterbridge; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ryantm ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4668ac240961..c99f939437b0 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mattermost-${version}"; - version = "3.8.2"; + version = "4.1.0"; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42"; + sha256 = "0bp56i108pxsqcswxy1hdz3d8wq83lc29wcq6npimwx566rx4xhf"; }; installPhase = '' diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 549ec289d6bd..02a4e3bd66f7 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0mnfay6bh9ls2fi3k96hmw4gr7q11lw4rd466lidi4jyjpc7q42x"; + sha256 = "1fgpfyb78l1kl0kja2fjqc4ik1q869cmhx6xdmp9ff2qcqk22cj0"; }; goPackagePath = "github.com/42vim/matterircd"; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0b82f1deef62..132f812bf464 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -2,14 +2,14 @@ let bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz"; + url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; }; in stdenv.mkDerivation rec { name = "meteor-${version}"; - version = "1.4.2.3"; + version = "1.5"; dontStrip = true; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index 4c21a29a05c4..3282c91abac8 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,9 +2,9 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,45 @@ var springboard = function (rel, options) { - process.exit(ret.wait()); - } +@@ -554,6 +554,44 @@ + }).await()); + } // Now exec; we're not coming back. + // BEGIN HACK + // patch shebang: @@ -44,7 +44,13 @@ index 84f94bc..4fbda17 100644 + patchelf("mongodb", "bin", "mongo"); + patchelf("mongodb", "bin", "mongod"); + // END HACK -+ - // Now exec; we're not coming back. + require('kexec')(executable, newArgv); - throw Error('exec failed?'); + +@@ -1485,4 +1523,4 @@ + + process.exit(ret); + }).run(); +-//# sourceMappingURL=main.js.map +\ No newline at end of file ++//# sourceMappingURL=main.js.map diff --git a/pkgs/servers/mfi/default.nix b/pkgs/servers/mfi/default.nix deleted file mode 100644 index e431ca993a90..000000000000 --- a/pkgs/servers/mfi/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "mfi-controller-${version}"; - version = "2.1.11"; - - src = fetchurl { - url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip"; - sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out - cp -ar conf data dl lib webapps $out - ''; - - meta = with stdenv.lib; { - homepage = http://www.ubnt.com/; - description = "Controller for Ubiquiti mFi devices"; - license = licenses.unfree; - platforms = platforms.unix; - maintainers = with maintainers; [ elitak ]; - }; -} diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix new file mode 100644 index 000000000000..98ac1534cf8a --- /dev/null +++ b/pkgs/servers/mirrorbits/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch +, pkgconfig, zlib, geoip }: + +buildGoPackage rec { + name = "mirrorbits-${version}"; + version = "0.4"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "etix"; + repo = "mirrorbits"; + sha256 = "11f9wczajba147qk5j73pxjrvlxkgr598sjvgjn2b8nxm49g2pan"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/etix/mirrorbits/commit/03a4e02214bdb7bb60240ddf25b887ccac5fb118.patch"; + sha256 = "08332cfxmp2nsfdj2ymg3lxkav8h44f6cf2h6g9jkn03mkliblm5"; + }) + ]; + + postPatch = '' + rm -rf testing + ''; + + goPackagePath = "github.com/etix/mirrorbits"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib geoip ]; + + meta = { + description = "geographical download redirector for distributing files efficiently across a set of mirrors"; + homepage = "https://github.com/etix/mirrorbits"; + longDescription = '' + Mirrorbits is a geographical download redirector written in Go for + distributing files efficiently across a set of mirrors. It offers + a simple and economic way to create a Content Delivery Network + layer using a pure software stack. It is primarily designed for + the distribution of large-scale Open-Source projects with a lot + of traffic. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/servers/mirrorbits/deps.nix b/pkgs/servers/mirrorbits/deps.nix new file mode 100644 index 000000000000..373654126614 --- /dev/null +++ b/pkgs/servers/mirrorbits/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/etix/geoip"; + fetch = { + type = "git"; + url = "https://github.com/etix/geoip"; + rev = "db8457352061099b2a1840c712b3223900216588"; + sha256 = "1768237bngcjgw0s8wba0f4nw1xahg28cq2nd6vrbmhavd1ppim9"; + }; + } + { + goPackagePath = "github.com/etix/goftp"; + fetch = { + type = "git"; + url = "https://github.com/etix/goftp"; + rev = "0c13163a1028e83f0f1cce113dddd3900e935bc7"; + sha256 = "15kwk57yk63j28d1lwrykc9nr7ickqgk2fpw4g0b0404b95l101k"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "70e1b1943d4fc9c56791abaa6f4d1e727b9ab925"; + sha256 = "1nw22r0vagmayjg51rz55yi9ppkd60ya0nzmp113mcz25vhxa0d0"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/youtube/vitess"; + fetch = { + type = "git"; + url = "https://github.com/youtube/vitess"; + rev = "6cf14dbf97f28eebd37dc2bc36374852946336a8"; + sha256 = "1g76q84wipyprn05brpjxf8xri87293r7nyf647crjy5d9k950lz"; + }; + } + { + goPackagePath = "gopkg.in/tylerb/graceful.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tylerb/graceful.v1"; + rev = "4654dfbb6ad53cb5e27f37d99b02e16c1872fbbb"; + sha256 = "1qspbrzr3h6c89v75c99avn7iizkfnjh901wp650vyy0j3p6ydnd"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; + sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + }; + } +] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 6b8bdd4b4d56..cb9e43a5c880 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.23.8"; + version = "0.26.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "0wan6a4rpyh5fflq88saznyf2kiic9nmj8sil1s49nh3c3y4yxcj"; + sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56d2f854654c..f2df0e4f9c3d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.3.2"; + version = "4.5.1"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11"; + sha256 = "0w4ldihs6j508ql7c0v2wsysrlf3n93iikvjwsszj6g5a4bz2f93"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc"; + sha256 = "0l96f03ghvadcba7yi22wsx16chff4ffjgnm2g3mcyigbhp57zk2"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; @@ -28,8 +28,8 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = http://grafana.org/; - maintainers = with maintainers; [ offline fpletz ]; + homepage = https://grafana.org/; + maintainers = with maintainers; [ offline fpletz willibutz ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 2d2fb26324c4..611543ee87e2 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -14,6 +14,10 @@ buildGoPackage rec { sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/node_exporter + ''; + # FIXME: megacli test fails doCheck = false; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index a136c94aa575..b0e05aa8bc0a 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }: +{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.4"; + version = "1.4.14"; name = "${pname}-${version}"; src = fetchurl { - url = http://mosquitto.org/files/source/mosquitto-1.4.tar.gz; - sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; + url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"; + sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm"; }; - buildInputs = [ openssl libuuid libwebsockets ] + buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] ++ stdenv.lib.optional stdenv.isDarwin cmake; makeFlags = [ @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { --replace "/usr/local" "" substituteInPlace config.mk \ --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" - ''; meta = { diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index c4a616856ad2..786b142c7329 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0f87r0fr3i09fnmwjqz6q1lwd5k32a2knrls0nv0zhqrma7sdy01"; + sha256 = "1ndd7wxw2lz1ywnz3kp0pz1jmby2jakhl00kn8jwghcbipvnx9b5"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix deleted file mode 100644 index ccd64da3c6a8..000000000000 --- a/pkgs/servers/nosql/mongodb/2.4.8.nix +++ /dev/null @@ -1,45 +0,0 @@ -# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0 -# by elitak for use with the Ubiquiti mFi Controller package, which breaks at -# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old -# versions of boost and v8 to build this, as well. -{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre-cpp, snappy }: -with stdenv.lib; -let - version = "2.4.8"; -in -stdenv.mkDerivation rec { - name = "mongodb-${version}"; - - src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; - }; - - nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre-cpp snappy ]; - - postPatch = '' - substituteInPlace SConstruct \ - --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ - --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]' - ''; - - NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs"; - - buildPhase = '' - export SCONSFLAGS="-j$NIX_BUILD_CORES" - scons all --use-system-all - ''; - - installPhase = '' - mkdir -p $out/lib - scons install --use-system-all --full --prefix=$out - ''; - - meta = { - description = "A scalable, high-performance, open source NoSQL database"; - homepage = http://www.mongodb.org; - license = licenses.agpl3; - maintainers = with maintainers; [ bluescreen303 elitak ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 2666ddc5a43e..436023428ff5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.9"; + version = "4.0.1"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "09pzb468jfps1w7bx2xpsvalj5r3q8hav7l3s10f91xjhflwzakf"; + sha256 = "14bm8lkhylc93r4dgl7kkzzpw2xq7gr6w6h80n3jazqnx5mcsj90"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index cc82e75a6154..e935b5d09879 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; }; + patches = [ + (fetchurl { + url = "https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c.patch"; + sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1"; + }) + ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index ebbd10e8fa2c..93c854d8e08b 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.20.2"; + version = "1.6.21"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614"; + sha256 = "ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f"; }; nativeBuildInputs = [ autoconf automake flex yacc perl which ]; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.z77z ]; broken = - (builtins.compareVersions kernel.version "3.18" == -1); + (builtins.compareVersions kernel.version "3.18" == -1) || + (builtins.compareVersions kernel.version "4.13" == 0); }; } diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 0e5cb3e697f5..9b2278fe3667 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.7.5.4035"; - vsnHash = "313f93718"; - sha256 = "89b8585e561046a8422d520ebcdae784f5dc3c895aac8d313c435cc6b58795b8"; + version = "1.8.4.4249"; + vsnHash = "3497d6779"; + sha256 = "ca3db297f4dbc73a5a405ac032ff250e5df97b84da6dcac55165b13e6445ca80"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ba514ccdbcbc..bd80560a0cb4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,18 +36,14 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "10.0"; + version = "11.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653"; + sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; }; - patches = [ ./caps-fix.patch ] - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { - url = "https://bugs.freedesktop.org/attachment.cgi?id=127889"; - sha256 = "063h5vmh4ykgxjbxyxjlj6qhyyxhazbh3p18p1ik69kq24nkny9m"; - }); + patches = [ ./caps-fix.patch ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 088eef0830b9..3b86cf1758c0 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.778"; + version = "0.2.0.846"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015"; + sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index ee38783a899e..9c8ad94f61cb 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3Packages }: let - version = "2.1.2"; - sha256 = "0gmbnvm17j0ilcnci1k2jh0vkbz5g8xlk9lgia5mlx790048hlm8"; + version = "2.1.6"; + sha256 = "1x76nvxjhjpagniyh075hqia4sl06972alnhi7628cjrq3pr4v9i"; in python3Packages.buildPythonApplication { diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index d7b1c8173dde..1e1cc369136c 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,11 +19,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.6.4"; + version = "4.6.7"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija"; + sha256 = "1ynxndfk45zkkylz3jsrx42a7kmm42jddk5bdhihyf88vs9l7wly"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 781f505f4690..cfa471f217ee 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08"; + sha256 = "0pvi6akicg0i3bz3lbc6k9rznxw7d25flg9wbs2dyxv8i2rrqvq0"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 97e7a9daf658..9f7e2b297ee3 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld"; }; - postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl"; + postPatch = '' + patchShebangs libs/libvpx/build/make/rtcd.pl + substituteInPlace libs/libvpx/build/make/configure.sh \ + --replace AS=\''${AS} AS=yasm + ''; buildInputs = [ openssl ncurses curl pkgconfig gnutls readline perl libjpeg diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 20fb74924d3e..8fe4b8df1ab3 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4928"; + version = "2.0.0.4949"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; + sha256 = "7e4e3a3668ee7485d0ee4009bcd1f2a7c3e8c25da7d9170272ef275a19c76ac4"; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 85edbbf442a4..8a3097ae9dee 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -91,40 +91,28 @@ let in { - postgresql91 = common { - version = "9.1.24"; - psqlSchema = "9.1"; - sha256 = "1lz5ibvgz6cxprxlnd7a8iwv387idr7k53bdsvy4bw9ayglq83fy"; - }; - - postgresql92 = common { - version = "9.2.21"; - psqlSchema = "9.2"; - sha256 = "0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9"; - }; - postgresql93 = common { - version = "9.3.17"; + version = "9.3.19"; psqlSchema = "9.3"; - sha256 = "9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe"; + sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv"; }; postgresql94 = common { - version = "9.4.12"; + version = "9.4.14"; psqlSchema = "9.4"; - sha256 = "fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64"; + sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf"; }; postgresql95 = common { - version = "9.5.7"; + version = "9.5.9"; psqlSchema = "9.5"; - sha256 = "8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad"; + sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379"; }; postgresql96 = common { - version = "9.6.3"; + version = "9.6.5"; psqlSchema = "9.6"; - sha256 = "1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6"; + sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix new file mode 100644 index 000000000000..f1fb1a34fc24 --- /dev/null +++ b/pkgs/servers/traefik/default.nix @@ -0,0 +1,44 @@ +{ stdenv, buildGoPackage, fetchurl, bash, go-bindata}: + +buildGoPackage rec { + name = "traefik-${version}"; + version = "1.3.8"; + + goPackagePath = "github.com/containous/traefik"; + + src = fetchurl { + url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; + sha256 = "6fce36dd30bb5ae5f91e69f2950f22fe7a74b920e80c6b441a0721122f6a6174"; + }; + + buildInputs = [ go-bindata bash ]; + unpackPhase = '' + runHook preUnpack + mkdir traefik + tar -C traefik -xvzf $src + export sourceRoot="traefik" + runHook postUnpack + ''; + + buildPhase = '' + runHook preBuild + ( + cd go/src/github.com/containous/traefik + bash ./script/make.sh generate + + CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) + go build -ldflags "\ + -X github.com/containous/traefik/version.Version=${version} \ + -X github.com/containous/traefik/version.Codename=$CODENAME \ + " -a -o $bin/bin/traefik ./cmd/traefik + ) + runHook postBuild + ''; + + meta = with stdenv.lib; { + homepage = https://traefik.io; + description = "A modern reverse proxy"; + license = licenses.mit; + maintainers = with maintainers; [ hamhut1066 ]; + }; +} diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 71e51d4c765c..bdc37b700e5d 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp +{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp , libusb1, libmicrohttpd }: @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4"; }; + common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e"; + sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg"; + }; + meta = with stdenv.lib; { description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; homepage = https://mytrezor.com; @@ -40,8 +47,15 @@ stdenv.mkDerivation rec { jsoncpp ]; + preConfigure = '' + ( cd src/config + ln -s $common/protob/config.proto + protoc -I . --cpp_out=. config.proto + ) + ''; + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; - cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'"; + cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index ec3b255116b3..08a9637308cb 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.5.20"; + version = "5.6.16"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "14v38x46vgwm3wg28lzv4sz6kjgp6r1xkwxnxn6pzq2r7v6xkaz0"; + url = "https://www.ubnt.com/downloads/unifi/${version}-86cdeea491/unifi_sysvinit_all.deb"; + sha256 = "1kfrawf48q9rx48hcnmiqndbg84v340yfykh23af7xpcxmzl5jy7"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 22d87d670645..3981a5eeb14c 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,29 +2,20 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9"; + sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb"; }; nativeBuildInputs = [ makeWrapper ]; - # regarding the PIWIK_USER_PATH substitutes: - # looks like this is just a bug / confusion of the directories, and nobody has tested this. - # PR at https://github.com/piwik/piwik/pull/11661 # regarding the 127.0.0.1 substitute: # This replaces the default value of the database server field. # unix socket authentication only works with localhost, # but password-based SQL authentication works with both. postPatch = '' - substituteInPlace core/AssetManager/UIAssetFetcher.php \ - --replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;" - substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \ - --replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);" - substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \ - --replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT" substituteInPlace plugins/Installation/FormDatabaseSetup.php \ --replace "=> '127.0.0.1'," "=> 'localhost'," cp ${./bootstrap.php} bootstrap.php diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 0feae7d72411..1c5f52d4938e 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -17,7 +17,10 @@ pythonPackages.buildPythonApplication rec { --replace 'certifi==2017.1.23' 'certifi' \ --replace 'lxml==3.7.3' 'lxml' \ --replace 'pyopenssl==16.2.0' 'pyopenssl' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ + --replace 'flask==0.12' 'flask==0.12.*' \ + --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \ + --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*' ''; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 513e4ceee623..28463dc6163c 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -6,7 +6,7 @@ with stdenv.lib; overrideDerivation xorgserver (oldAttrs: { name = "xwayland-${xorgserver.version}"; - propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" |