Merge master into staging-next

6 files changed, 119 insertions, 103 deletions

diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 7af675de41fed..d44145dfecc34 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -5,21 +5,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "appdaemon";
-  version = "4.0.8";
-  disabled = python3.pythonOlder "3.6";
+  version = "4.2.1";
+  format = "setuptools";
+
+  disabled = python3.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "AppDaemon";
-    repo = pname;
-    rev = version;
-    sha256 = "04a4qx0rbx2vpkzpibmwkpy7fawa6dbgqlrllryrl7dchbrf703q";
+    repo = "appdaemon";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY=";
   };
 
-  # relax dependencies
   postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "deepdiff==5.2.3" "deepdiff" \
-      --replace "pygments==2.8.1" "pygments"
+    # relax dependencies
     sed -i 's/==/>=/' requirements.txt
   '';
 
@@ -63,6 +62,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
     homepage = "https://github.com/AppDaemon/appdaemon";
+    changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst";
     license = licenses.mit;
     maintainers = teams.home-assistant.members;
   };
diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index 12df9c02d071c..0e3626228a49c 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -1,33 +1,39 @@
 { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
 
 let
+  pname = "prowlarr";
+
+  unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}";
+
   os =
     if stdenv.isDarwin then
       "osx"
     else if stdenv.isLinux then
       "linux"
     else
-      throw "Not supported on ${stdenv.hostPlatform.system}.";
+      unsupported;
 
   arch = {
-    x86_64-linux = "x64";
+    aarch64-darwin = "arm64";
     aarch64-linux = "arm64";
     x86_64-darwin = "x64";
-  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+    x86_64-linux = "x64";
+  }.${stdenv.hostPlatform.system} or unsupported;
 
   hash = {
-    x64-linux_hash = "sha256-Xx2z5aiIKRNbBxBMXCTfm1VacQOLyruC6sXB/+C7knk=";
-    arm64-linux_hash = "sha256-r6WuQhydSRZmsH1hp51gGcQ/7ZruxbEMrbrFps2nmcw=";
-    x64-osx_hash = "sha256-F8bE4lXcqyBVZhgYcQKPrza9cphCuC5j7968jL6qgxM=";
-  }."${arch}-${os}_hash";
+    aarch64-darwin = "sha256-S9CrYDCwIssAtcP4pI1csbOOFKaZgM6UKEDNBp2VwVo=";
+    aarch64-linux = "sha256-UkoTWD4ljSfx/FzH5kQBpp/Bg+xwvc7n9KLBrqNNSR0=";
+    x86_64-darwin = "sha256-Wru+pwISVgjnSVe8HbiwU4M1aIIK5AGzml/2yqMGIlo=";
+    x86_64-linux = "sha256-eJRJ1LvQsmlMeWoUmGrAyLfoebG8g/Kl2lBQxMjIyTY=";
+  }.${stdenv.hostPlatform.system} or unsupported;
 
 in stdenv.mkDerivation rec {
-  pname = "prowlarr";
-  version = "1.2.0.2583";
+  inherit pname;
+  version = "1.2.2.2699";
 
   src = fetchurl {
-    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
-    sha256 = hash;
+    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
+    inherit hash;
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +60,14 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack";
     homepage = "https://wiki.servarr.com/prowlarr";
+    changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ jdreaver ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    platforms = [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
   };
 }
diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh
index d61edda5a0a31..883f299d9aa00 100755
--- a/pkgs/servers/prowlarr/update.sh
+++ b/pkgs/servers/prowlarr/update.sh
@@ -7,17 +7,19 @@ dirname="$(dirname "$0")"
 
 updateHash()
 {
+    # nixos
     version=$1
-    arch=$2
-    os=$3
+    system=$2
 
-    hashKey="${arch}-${os}_hash"
+    # prowlarr
+    arch=$3
+    os=$4
 
-    url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz"
+    url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz"
     hash=$(nix-prefetch-url --type sha256 $url)
     sriHash="$(nix hash to-sri --type sha256 $hash)"
 
-    sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
+    sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix"
 }
 
 updateVersion()
@@ -27,16 +29,8 @@ updateVersion()
 
 currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version)
 
-# N.B. Prowlarr is still in development, so
-# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest
-# returns nothing. Once this endpoint returns something, we should use
-# it. Until then, we use jq to sort releases (N.B. the "sort_by(. |
-# split(".") | map(tonumber))" incantation is to sort the version
-# number properly and not as a string).
-
-# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
-# latestVersion="$(expr $latestTag : 'v\(.*\)')"
-latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r)
+latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr $latestTag : 'v\(.*\)')"
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "Prowlarr is up-to-date: ${currentVersion}"
@@ -45,6 +39,7 @@ fi
 
 updateVersion $latestVersion
 
-updateHash $latestVersion x64 linux
-updateHash $latestVersion arm64 linux
-updateHash $latestVersion x64 osx
+updateHash $latestVersion aarch64-darwin arm64 osx
+updateHash $latestVersion aarch64-linux arm64 linux
+updateHash $latestVersion x86_64-darwin x64 osx
+updateHash $latestVersion x86_64-linux x64 linux
diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix
index 359dbfb5979dd..65189094d0c76 100644
--- a/pkgs/servers/syncstorage-rs/default.nix
+++ b/pkgs/servers/syncstorage-rs/default.nix
@@ -21,13 +21,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = pname;
     rev = version;
-    hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU=";
+    hash = "sha256-zxpqQpzmPPU6V5QITK9SgAAI7l3/7+h0u3/bZgiU7y4=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE=";
+  cargoHash = "sha256-U0xHqOh0ii4PE9UYKo+diqSoZ1ZjzBmHILvAhHSZD0A=";
 
   buildFeatures = [ "grpcio/openssl" ];
 
diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json
index 36121c10595ab..7f7abbdb4afc5 100644
--- a/pkgs/servers/web-apps/lemmy/package.json
+++ b/pkgs/servers/web-apps/lemmy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lemmy-ui",
   "description": "An isomorphic UI for lemmy",
-  "version": "0.16.7",
+  "version": "0.17.1",
   "author": "Dessalines <tyhou13@gmx.com>",
   "license": "AGPL-3.0",
   "scripts": {
@@ -9,7 +9,7 @@
     "build:prod": "webpack --mode=production",
     "clean": "yarn run rimraf dist",
     "dev": "yarn start",
-    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
+    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'",
     "prebuild:dev": "yarn clean && node generate_translations.js",
     "prebuild:prod": "yarn clean && node generate_translations.js",
     "prepare": "husky install",
@@ -17,82 +17,91 @@
   },
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "dependencies": {
-    "@typescript-eslint/parser": "^5.21.0",
-    "autosize": "^5.0.1",
-    "check-password-strength": "^2.0.5",
-    "choices.js": "^10.1.0",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-typescript": "^7.20.13",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/runtime": "^7.20.13",
+    "autosize": "^5.0.2",
+    "babel-loader": "^9.1.2",
+    "babel-plugin-inferno": "^6.6.0",
+    "check-password-strength": "^2.0.7",
+    "choices.js": "^10.2.0",
     "classnames": "^2.3.1",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
     "emoji-short-name": "^2.0.0",
-    "express": "~4.18.0",
-    "i18next": "^21.6.16",
-    "inferno": "^7.4.11",
-    "inferno-create-element": "^7.4.11",
+    "express": "~4.18.2",
+    "html-to-text": "^9.0.3",
+    "i18next": "^22.4.9",
+    "inferno": "^8.0.5",
+    "inferno-create-element": "^8.0.5",
     "inferno-helmet": "^5.2.1",
-    "inferno-hydrate": "^7.4.11",
-    "inferno-i18next-dess": "^0.0.1",
-    "inferno-router": "^7.4.11",
-    "inferno-server": "^7.4.11",
+    "inferno-hydrate": "^8.0.5",
+    "inferno-i18next-dess": "0.0.2",
+    "inferno-router": "^8.0.5",
+    "inferno-server": "^8.0.5",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
+    "lemmy-js-client": "0.17.0-rc.62",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
     "markdown-it-footnote": "^3.0.3",
     "markdown-it-html5-embed": "^1.0.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "moment": "^2.29.3",
+    "mini-css-extract-plugin": "^2.7.2",
+    "moment": "^2.29.4",
+    "node-fetch": "^2.6.1",
     "register-service-worker": "^1.7.2",
-    "rxjs": "^7.5.5",
-    "sass": "^1.51.0",
-    "serialize-javascript": "^6.0.0",
+    "run-node-webpack-plugin": "^1.3.0",
+    "rxjs": "^7.8.0",
+    "sanitize-html": "^2.8.1",
+    "sass": "^1.57.1",
+    "sass-loader": "^13.2.0",
+    "serialize-javascript": "^6.0.1",
     "tippy.js": "^6.3.7",
-    "toastify-js": "^1.11.2",
+    "toastify-js": "^1.12.0",
     "tributejs": "^5.1.3",
+    "webpack": "5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-node-externals": "^3.0.0",
     "websocket-ts": "^1.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/plugin-transform-typescript": "^7.16.1",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-typescript": "^7.16.0",
-    "@babel/runtime": "^7.17.9",
+    "@babel/core": "^7.20.12",
     "@types/autosize": "^4.0.0",
-    "@types/express": "^4.17.13",
-    "@types/node": "^17.0.29",
-    "@types/node-fetch": "^2.6.1",
+    "@types/express": "^4.17.16",
+    "@types/html-to-text": "^9.0.0",
+    "@types/markdown-it": "^12.2.3",
+    "@types/markdown-it-container": "^2.0.5",
+    "@types/node": "^18.11.18",
+    "@types/node-fetch": "^2.6.2",
+    "@types/sanitize-html": "^2.8.0",
     "@types/serialize-javascript": "^5.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-inferno": "^6.4.0",
-    "bootstrap": "^5.1.3",
-    "bootswatch": "^5.1.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "^6.7.1",
-    "eslint": "^8.14.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.4",
+    "@types/toastify-js": "^1.11.1",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "bootstrap": "^5.2.3",
+    "bootswatch": "^5.2.3",
+    "eslint": "^8.33.0",
+    "eslint-plugin-inferno": "^7.32.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.3",
     "import-sort-style-module": "^6.0.0",
-    "lemmy-js-client": "0.16.4",
-    "lint-staged": "^12.4.1",
-    "mini-css-extract-plugin": "^2.6.0",
-    "node-fetch": "^2.6.1",
-    "prettier": "^2.6.2",
+    "lint-staged": "^13.1.0",
+    "prettier": "^2.8.3",
     "prettier-plugin-import-sort": "^0.0.7",
-    "prettier-plugin-organize-imports": "^2.3.4",
-    "prettier-plugin-packagejson": "^2.2.17",
-    "rimraf": "^3.0.2",
-    "run-node-webpack-plugin": "^1.3.0",
-    "sass-loader": "^12.6.0",
-    "sortpack": "^2.2.0",
+    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier-plugin-packagejson": "^2.4.2",
+    "rimraf": "^4.1.2",
+    "sortpack": "^2.3.3",
     "style-loader": "^3.3.1",
-    "terser": "^5.13.0",
-    "typescript": "^4.6.3",
-    "webpack": "5.72.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "4.8.1",
-    "webpack-node-externals": "^3.0.0"
+    "terser": "^5.16.2",
+    "typescript": "^4.9.5",
+    "webpack-dev-server": "4.11.1"
   },
   "engines": {
     "node": ">=8.9.0"
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index d27a5319309b8..05960e62965d7 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,7 +1,7 @@
 {
-  "version": "0.16.7",
-  "serverSha256": "sha256-S0WomoWm3Bf3M6W6Q1+emLuwC4IPxGlM5aqY8yTPG6Q=",
-  "serverCargoSha256": "sha256-PxIFgQ6ngkpZInJX55feFg/R+nVO30z6q+apZKBXlkg=",
-  "uiSha256": "sha256-gM+L/gMNMuQQTnnlrGRqAlXKBrf27bpbZWoqufpb3LE=",
-  "uiYarnDepsSha256": "sha256-2NiDuqAyZeNn3c3XDeP2m5hHej4w4/gcabxfHgC8PV4="
+  "version": "0.17.1",
+  "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=",
+  "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=",
+  "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=",
+  "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ="
 }