Merge master into staging-next

pkgs/servers/keycloak/default.nix

@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "11.0.2";
+  version = "11.0.3";
 
   src = fetchzip {
     url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
-    sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0";
+    sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/servers/monitoring/prometheus/default.nix

@@ -1,13 +1,13 @@
 { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
 
 let
-  version = "2.20.1";
+  version = "2.22.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j";
+    sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0";
   };
 
   webui = mkYarnPackage {

pkgs/servers/monitoring/prometheus/webui-package.json

@@ -8,33 +8,33 @@
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@reach/router": "^1.2.1",
     "@testing-library/react-hooks": "^3.1.1",
-    "@types/jest": "^24.0.20",
-    "@types/jquery": "^3.3.29",
+    "@types/jest": "^26.0.10",
+    "@types/jquery": "^3.5.1",
     "@types/node": "^12.11.1",
     "@types/reach__router": "^1.2.6",
     "@types/react": "^16.8.2",
     "@types/react-copy-to-clipboard": "^4.3.0",
     "@types/react-dom": "^16.8.0",
-    "@types/react-resize-detector": "^4.0.2",
+    "@types/react-resize-detector": "^4.2.0",
     "@types/sanitize-html": "^1.20.2",
     "bootstrap": "^4.2.1",
     "css.escape": "^1.5.1",
-    "downshift": "^3.2.2",
+    "downshift": "^3.4.8",
     "enzyme-to-json": "^3.4.3",
     "fuzzy": "^0.1.3",
     "i": "^0.3.6",
-    "jest-fetch-mock": "^2.1.2",
-    "jquery": "^3.5",
+    "jest-fetch-mock": "^3.0.3",
+    "jquery": "^3.5.1",
     "jquery.flot.tooltip": "^0.9.0",
-    "jsdom": "^15.2.0",
+    "jsdom": "^16.4.0",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.23",
     "popper.js": "^1.14.3",
     "react": "^16.7.0",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.7.0",
-    "react-resize-detector": "^4.2.1",
-    "react-scripts": "3.4.0",
+    "react-resize-detector": "^5.0.7",
+    "react-scripts": "3.4.3",
     "react-test-renderer": "^16.9.0",
     "reactstrap": "^8.0.1",
     "sanitize-html": "^1.20.1",
@@ -68,7 +68,7 @@
     "@types/flot": "0.0.31",
     "@types/moment-timezone": "^0.5.10",
     "@types/reactstrap": "^8.0.5",
-    "@types/sinon": "^7.5.0",
+    "@types/sinon": "^9.0.4",
     "@typescript-eslint/eslint-plugin": "2.x",
     "@typescript-eslint/parser": "2.x",
     "enzyme": "^3.10.0",
@@ -76,15 +76,15 @@
     "eslint": "6.x",
     "eslint-config-prettier": "^6.4.0",
     "eslint-config-react-app": "^5.0.2",
-    "eslint-plugin-flowtype": "3.x",
+    "eslint-plugin-flowtype": "4.x",
     "eslint-plugin-import": "2.x",
     "eslint-plugin-jsx-a11y": "6.x",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-react": "7.x",
-    "eslint-plugin-react-hooks": "1.x",
-    "jest-fetch-mock": "^2.1.2",
+    "eslint-plugin-react-hooks": "2.x",
+    "jest-fetch-mock": "^3.0.3",
     "prettier": "^1.18.2",
-    "sinon": "^7.5.0"
+    "sinon": "^9.0.3"
   },
   "proxy": "http://localhost:9090",
   "jest": {

pkgs/servers/tailscale/default.nix

@@ -33,6 +33,8 @@ buildGoModule rec {
     wrapProgram $out/bin/tailscaled --prefix PATH : ${
       lib.makeBinPath [ iproute iptables ]
     }
+    sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
+    install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service
   '';
 
   meta = with lib; {

pkgs/servers/unifi/default.nix

@@ -54,7 +54,7 @@ in {
   };
 
   unifiBeta = generic {
-    version = "6.0.23";
-    sha256 = "sha256-t/s0UEk0CgnAeydtLWTgpZjnAJqnyfyESNNVe1d5PHo=";
+    version = "6.0.28";
+    sha256 = "14q8r4mcqx0v3sh8zwqg4cc3iszqn5201q5r4c20cwqdd4ivf97q";
   };
 }