diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/documize-community/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/jetty/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/misc/qremotecontrol-server/default.nix | 46 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/versions.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/openafs/1.6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/openafs/1.6/module.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/openafs/1.8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/tmate-ssh-server/default.nix | 29 | ||||
-rw-r--r-- | pkgs/servers/web-apps/shiori/default.nix | 2 |
12 files changed, 94 insertions, 19 deletions
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index dffa596f9e9..e6b7e2be125 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1qbf5c42mf30kc4yrk7mav8hk91v5yjx32h9wirmqkcb9k2lpv7s"; + sha256 = "17dzj24dc3f6bw8v4fsj578gfz0fcvh42a2srci580s41mq2kjy4"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 5ce44322e92..845fd41c12c 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.16.v20190411"; + version = "9.4.22.v20191022"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0vkcm68cp7z45pgfg5maxcxfjwy4xj30f2d0c7cfnw9d38wf5lpq"; + sha256 = "1a5av6ygsmjwbnlax7f7l58d7hlw3xm0cpk5ml7mb54vrlrcb7hv"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix new file mode 100644 index 00000000000..ddf69d10968 --- /dev/null +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, qmake4Hook +, qt4 +, xorg +}: + +stdenv.mkDerivation rec { + pname = "qremotecontrol-server"; + version = "2.4.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/qrc/${version}/qremotecontrol-${version}.tar.bz2"; + sha256 = "07hzc9959a56b49jgmcv8ry8b9sppklvqs9kns3qjj3v9d22nbrp"; + }; + + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 xorg.libXtst ]; + + postPatch = '' + substituteInPlace QRemoteControl-Server.pro \ + --replace /usr $out + ''; + + meta = with stdenv.lib; { + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://qremote.org/"; + downloadPage = "https://qremote.org/download.php#Download"; + description = "Remote control your desktop from your mobile"; + longDescription = '' + With QRemoteControl installed on your desktop you can easily control + your computer via WiFi from your mobile. By using the touch pad of your + Phone you can for example open the internet browser and navigate to + the pages you want to visit, use the music player or your media center + without being next to your PC or laptop. Summarizing QRemoteControl + allows you to do almost everything you would be able to do with a + mouse and a keyboard, but from a greater distance. To make these + replacements possible QRemoteControl offers you a touch pad, a + keyboard, multimedia keys and buttons for starting applications. Even + powering on the computer via Wake On Lan is supported. + ''; + }; +} + diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fa414fec843..b00b9778178 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.4.3"; + version = "6.4.4"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0150s14yjgshncs94xf42yrz7awvw2x91j0j9v23fypqmlch2p3m"; + sha256 = "0v5iwny96kb07qkj2qqqfgvnsw3dfcq3wf66zsllqavnahvrd1s8"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0gr9m05h8qx3g0818b0qf1w26pdir3c5ydgi9zwdhjkppsq14dq2"; + sha256 = "15583cdi4yajg678d3kj8nngs9lwj0qqn2nh5zm8il9p71w57x0k"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 0bfad9030a8..0fc87556542 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "0j6xcdbh6fl8z9zyl3rqnnxjkg30nigs9a6ndlbi2ycgmlnds55m"; + sha256 = "1hyqvk3sxirm91lasf1z1wkzaql1g52my9a9q42z1h0hq66bc6nk"; }; - cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk"; + cargoSha256 = "0wdyvl58h66xjcnl2kf3f7gnn4nc4vzpl870jc5x0qrkz28jppxz"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 03e9464de01..74c927f752e 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v44 = generic { - version = "4.4.0"; - sha256 = "1a4csx1i21lcavfvj5djalcnxnlyh4mhk4dddzm895ipl87afzf4"; + version = "4.4.1"; + sha256 = "0jjn2przn9s25slrcxmq8iqdgqkgxnqs45zy0n1ma6nlgmclxxqb"; }; v42 = generic { @@ -10,8 +10,8 @@ generic: { }; v40 = generic { - version = "4.0.13"; - sha256 = "1hz4sdj4nw8fh124dqd41ag2wv4rcp4snpxgk80nx76rssw6c9ny"; + version = "4.0.14"; + sha256 = "0igdxxfc61rqx6r7r81jsmv2d7nxw4whai211gk3y88dfm7l4xkb"; }; v30 = generic { diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 8155a951061..a1e56ca161e 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation { homepage = https://www.openafs.org; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; }; } diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index d410a4e55e5..0d61b1cd104 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { homepage = https://www.openafs.org; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || builtins.compareVersions kernel.version "5.0" >= 0 || stdenv.targetPlatform.isAarch64; }; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index fca872a4a2b..541962c542c 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { homepage = https://www.openafs.org; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; }; } diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index d58d2bff813..9ae66175acf 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation { homepage = https://www.openafs.org; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18"; }; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix new file mode 100644 index 00000000000..836fa33f3f7 --- /dev/null +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: + +stdenv.mkDerivation rec { + pname = "tmate-ssh-server"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "tmate-io"; + repo = "tmate-ssh-server"; + rev = version; + sha256 = "1y77mv1k4c79glj84lzlp0s1lafr1jzf60mywr5vhy6sq47q8hwd"; + }; + + dontUseCmakeConfigure = true; + + buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://tmate.io/; + description = "tmate SSH Server"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 5cf54ff14ba..dd4cdc08287 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "shiori"; version = "1.5.0"; - modSha256 = "142raxqh6mipw0dyhzgc8ha6vn74wdin25qrl1nkd68mpcvsbblg"; + modSha256 = "1z6q5lv0j433p8lc3nxlw1rds5x1kvs1vzl63jf3disxw7ppyai3"; src = fetchFromGitHub { owner = "go-shiori"; |