diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-30 18:15:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-30 18:16:58 +0200 |
commit | ddf864f8aa8b1c41e658a115823d7eaf744f4190 (patch) | |
tree | 1c21b84a3724120de509f794af47d043a733eb52 /pkgs/servers | |
parent | c53449ce57f26de17532f0dea727b58db68b337e (diff) | |
parent | f0c3e5f519f82ee379182e94dc886b627930015d (diff) | |
download | nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.gz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.bz2 nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.lz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.xz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.zst nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.zip |
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/emby/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/freeradius/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/thttpd/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/minio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/nas/default.nix | 38 | ||||
-rw-r--r-- | pkgs/servers/radarr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/5.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/piwik/bootstrap.php | 6 | ||||
-rw-r--r-- | pkgs/servers/web-apps/piwik/default.nix | 60 | ||||
-rw-r--r-- | pkgs/servers/web-apps/shaarli/default.nix | 4 |
11 files changed, 119 insertions, 14 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index c18b7c463769..61f9604b9252 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.10.5-P1"; in +let version = "9.10.5-P2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1kg59a9118460k5wznqayxzqb6l3vbpybd8b1bdv9z97x5fqiyw2"; + sha256 = "0cwrwlkfd6wnkw2ylkz2iyqlz73s3kf6q0fxsfwnh3fhxps2i90r"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 1bf92b2247cf..24e6def856db 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.19.0"; + version = "3.2.20.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "14gwkglngaf29zzjqyph8pqz8i8i9j2vha9g2m17slgdxif4ijzc"; + sha256 = "0n5b40vl0dg2pd0j7rzbck62cji6ws91jgsh8r1maig9p00xmwv7"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 117fa8782c9b..ec6610b8245f 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.12"; + version = "3.0.14"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja"; + sha256 = "02ar0xn4dfrs95cmd4c798k95rmnzzvcryyyl2vjv53ak16igmpw"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 692bba846eaf..96652515f7ab 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i -e 's/getline/getlineX/' extras/htpasswd.c + sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in ''; preInstall = '' diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 28b6136d90ea..48b5279772a9 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20170316"; - longVersion = "2017-03-16T21-50-32Z"; + shortVersion = "20170613"; + longVersion = "2017-06-13T19-01-01Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c"; + sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix new file mode 100644 index 000000000000..1dba428e0ae9 --- /dev/null +++ b/pkgs/servers/nas/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, imake, bison, flex_2_6_1, gccmakedep +, xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: + +let + pname = "nas"; + version = "1.9.4"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; + sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; + }; + + nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ]; + + buildInputs = [ xproto libXau libXt libXext libXaw libXpm ]; + + buildPhase = '' + xmkmf + make WORLDOPTS="" World + ''; + + installFlags = "LDLIBS=-lfl DESTDIR=\${out}"; + + postInstall = '' + mv $out/${xorgcffiles}/* $out + rm -r $out/nix + ''; + + meta = with stdenv.lib; { + description = "A network transparent, client/server audio transport system"; + homepage = http://radscan.com/nas.html; + license = licenses.mit; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 861aaa71cde3..23969dc2a23d 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.696"; + version = "0.2.0.778"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0rqxhzn8hmg6a8di1gaxlrfp5f7mykf2lxrzhri10zqs975i3a29"; + sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 512337cf3826..6f9895509ee0 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 = "1ml2dvwxxhj3azj13wa8xd08kpapal2477lpcaxzw5gnzizgyx5z"; + sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/piwik/bootstrap.php new file mode 100644 index 000000000000..a8163f33e5c0 --- /dev/null +++ b/pkgs/servers/web-apps/piwik/bootstrap.php @@ -0,0 +1,6 @@ +<?php +// get PIWIK_USER_PATH from environment variable, +// so this bootstrap.php can be read-only but still configure PIWIK_USER_PATH at runtime +if ($path = getenv('PIWIK_USER_PATH')) { + define('PIWIK_USER_PATH', $path); +} diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix new file mode 100644 index 000000000000..22d87d670645 --- /dev/null +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, makeWrapper, php }: + +stdenv.mkDerivation rec { + name = "piwik-${version}"; + version = "3.0.4"; + + src = fetchurl { + url = "https://builds.piwik.org/${name}.tar.gz"; + sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9"; + }; + + 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 + ''; + + # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. + # See https://forum.piwik.org/t/bootstrap-php/5926/10 and + # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 + installPhase = '' + runHook preInstall + + # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + mkdir -p $out/share + cp -ra * $out/share/ + # tmp/ is created by piwik in PIWIK_USER_PATH + rmdir $out/share/tmp + # config/ needs to be copied to PIWIK_USER_PATH anyway + mv $out/share/config $out/ + + makeWrapper ${php}/bin/php $out/bin/piwik-console \ + --add-flags "$out/share/console" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A real-time web analytics application"; + license = licenses.gpl3Plus; + homepage = https://piwik.org/; + platforms = platforms.all; + maintainers = [ maintainers.florianjacob ]; + }; +} diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 26e3f92931b9..1c58194027ad 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.8.4"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "1p6yljl8v8p74n71az1h68nnsvffw2hkcfk9p2dldspi4k51vnb7"; + sha256 = "1l8waa26cq9rjh8hvhnlrsvj4606pz81msdmhljgqx7fdn5wzs5c"; }; outputs = [ "out" "doc" ]; |