Merge pull request #97910 from doronbehar/update-gotify

gotify-server: 2.0.17 -> 2.0.18

pkgs/servers/gotify/default.nix

@@ -24,11 +24,6 @@ buildGoModule rec {
 
   doCheck = false;
 
-  postPatch = ''
-    substituteInPlace app.go \
-      --replace 'Version = "unknown"' 'Version = "${version}"'
-  '';
-
   buildInputs = [ sqlite ];
 
   ui = callPackage ./ui.nix { };
@@ -46,7 +41,7 @@ buildGoModule rec {
   subPackages = [ "." ];
 
   buildFlagsArray = [
-    "-ldflags='-X main.Version=${version} -X main.Mode=prod'"
+    "-ldflags=-X main.Version=${version} -X main.Mode=prod"
   ];
 
   meta = with stdenv.lib; {

pkgs/servers/gotify/package.json

@@ -5,24 +5,24 @@
   "homepage": ".",
   "proxy": "http://localhost:80",
   "dependencies": {
-    "@material-ui/core": "^4.9.5",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "axios": "^0.19.0",
-    "codemirror": "^5.43.0",
-    "detect-browser": "^5.1.0",
-    "js-base64": "^2.5.1",
-    "mobx": "^5.1.1",
-    "mobx-react": "^6.2.2",
-    "mobx-utils": "^5.0.2",
+    "axios": "^0.20.0",
+    "codemirror": "^5.57.0",
+    "detect-browser": "^5.1.1",
+    "js-base64": "^3.4.5",
+    "mobx": "^5.15.6",
+    "mobx-react": "^6.3.0",
+    "mobx-utils": "^5.6.1",
     "notifyjs": "^3.0.0",
     "prop-types": "^15.6.2",
     "react": "^16.4.2",
-    "react-codemirror2": "^7.1.0",
+    "react-codemirror2": "^7.2.1",
     "react-dom": "^16.4.2",
     "react-infinite": "^0.13.0",
     "react-markdown": "^4.0.6",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-timeago": "^4.1.9",
     "remove-markdown": "^0.3.0",
     "typeface-roboto": "0.0.75"
@@ -32,36 +32,41 @@
     "build": "react-scripts build",
     "test": "react-scripts test --env=node",
     "eject": "react-scripts eject",
-    "lint": "tslint --project .",
-    "lintfix": "tslint --fix --project .",
+    "lint": "eslint \"src/*.{ts,tsx}\"",
     "format": "prettier \"src/**/*.{ts,tsx}\" --write",
     "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different"
   },
   "devDependencies": {
-    "@types/codemirror": "0.0.91",
+    "@types/codemirror": "0.0.98",
     "@types/detect-browser": "^4.0.0",
     "@types/get-port": "^4.0.0",
-    "@types/jest": "^25.2.1",
-    "@types/js-base64": "^2.3.1",
-    "@types/node": "^13.13.5",
-    "@types/notifyjs": "^3.0.0",
-    "@types/puppeteer": "^2.0.1",
-    "@types/react": "^16.4.11",
-    "@types/react-dom": "^16.0.7",
-    "@types/react-infinite": "0.0.34",
+    "@types/jest": "^26.0.13",
+    "@types/js-base64": "^3.0.0",
+    "@types/node": "^14.10.1",
+    "@types/notifyjs": "^3.0.2",
+    "@types/puppeteer": "^3.0.2",
+    "@types/react": "^16.9.49",
+    "@types/react-dom": "^16.9.8",
+    "@types/react-infinite": "0.0.35",
     "@types/react-router-dom": "^5.1.5",
     "@types/remove-markdown": "^0.1.1",
     "@types/rimraf": "^3.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.1.0",
+    "@typescript-eslint/parser": "^4.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jest": "^24.0.0",
+    "eslint-plugin-prefer-arrow": "^1.2.2",
+    "eslint-plugin-react": "^7.20.6",
+    "eslint-plugin-unicorn": "^21.0.0",
     "get-port": "^5.1.1",
-    "prettier": "^2.0.5",
-    "puppeteer": "^3.0.4",
-    "react-scripts": "^3.4.1",
+    "prettier": "^2.1.1",
+    "puppeteer": "^5.3.0",
+    "react-scripts": "^3.4.3",
     "rimraf": "^3.0.2",
     "tree-kill": "^1.2.0",
-    "tslint": "^6.1.2",
-    "tslint-sonarts": "^1.7.0",
-    "typescript": "3.8.3",
-    "wait-on": "^5.0.0"
+    "typescript": "4.0.2",
+    "wait-on": "^5.2.0"
   },
   "eslintConfig": {
     "extends": "react-app"

pkgs/servers/gotify/source-sha.nix

@@ -1 +1 @@
-"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb"
+"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9"

pkgs/servers/gotify/update.sh

@@ -9,11 +9,11 @@ latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releas
 version=$(jq -r '.tag_name' <<<"$latest_release")
 echo got version $version
 echo \""${version#v}"\" > "$dirname/version.nix"
-printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix
+printf '%s\n' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix
 tput setaf 1
 echo zeroing vendorSha256 in $dirname/vendor-sha.nix
 tput sgr0
-printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix
+printf '"%s"\n' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix
 
 GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version"
 
@@ -32,7 +32,7 @@ echo running nix-build for gotify itself in order to get vendorSha256
 set +e
 vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)"
 set -e
-printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix
+printf '"%s"\n' "$vendorSha256" > $dirname/vendor-sha.nix
 tput setaf 2
 echo got vendorSha256 of: $vendorSha256
 tput sgr0

pkgs/servers/gotify/vendor-sha.nix

@@ -1 +1 @@
-"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng"
+"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd"

pkgs/servers/gotify/version.nix

@@ -1 +1 @@
-"2.0.17"
+"2.0.18"