diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/diod/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/ftp/vsftpd/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/jetbrains/youtrack.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/node-exporter.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/uchiwa/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/nosql/riak/2.2.0.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/skydns/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/morty/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
10 files changed, 29 insertions, 13 deletions
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index a233b6ba4cf..eba73b2692a 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = [ stdenv.lib.maintainers.rickynils]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 2386acf1b79..cc7493f9533 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 7e368bf295b..0518a78f9d6 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { name = "youtrack-${version}"; - version = "2018.1.41051"; + version = "2018.2.44329"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${name}.jar"; - sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + unpackPhase = ":"; installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + makeWrapper ${jre}/bin/java $out/bin/youtrack \ + --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --set JRE_HOME ${jre} runHook postInstall ''; meta = with stdenv.lib; { - description = '' - Issue Tracking and Project Management Tool for Developers - ''; + description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 02a6197d384..bb86e59e4c3 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,6 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGo19Package, fetchFromGitHub }: -buildGoPackage rec { +# Go 1.10 causes segfaults: +# https://github.com/prometheus/node_exporter/issues/870 +buildGo19Package rec { name = "node_exporter-${version}"; version = "0.16.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index e7cf3e8f70e..1de1edfa8e1 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -15,6 +15,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' + mkdir $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b041aa9f35f..a09b4543cbb 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + license = licenses.asl20; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 7bfea23c78b..82d79785b11 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -15,4 +15,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 146d9d23198..723b4e4d8d3 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.22"; + version = "5.7.23"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; + sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index eeb19f81c54..e4dd9b0f2dc 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars ]; + license = licenses.agpl3; description = "Privacy aware web content sanitizer proxy as a service"; longDescription = '' Morty is a web content sanitizer proxy as a service. It rewrites web diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0023c2c070a..b1a749c7ec4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let |