Merge release-22.05 into staging-next-22.05

pkgs/applications/networking/instant-messengers/element/element-desktop-package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "lib/electron-main.js",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -37,7 +37,8 @@
     "docker:install": "scripts/in-docker.sh yarn install",
     "debrepo": "scripts/mkrepo.sh",
     "clean": "rimraf webapp.asar dist packages deploys lib",
-    "hak": "ts-node scripts/hak/index.ts"
+    "hak": "ts-node scripts/hak/index.ts",
+    "test": "jest"
   },
   "dependencies": {
     "auto-launch": "^5.0.5",
@@ -49,8 +50,12 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-typescript": "^7.18.6",
     "@types/auto-launch": "^5.0.1",
     "@types/counterpart": "^0.18.1",
+    "@types/jest": "^28",
     "@types/minimist": "^1.2.1",
     "@types/mkdirp": "^1.0.2",
     "@types/pacote": "^11.1.1",
@@ -60,6 +65,7 @@
     "allchange": "^1.0.6",
     "app-builder-lib": "^22.14.10",
     "asar": "^2.0.1",
+    "babel-jest": "^28.1.3",
     "chokidar": "^3.5.2",
     "detect-libc": "^1.0.3",
     "electron": "^20",
@@ -71,16 +77,20 @@
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-matrix-org": "^0.4.0",
+    "expect-playwright": "^0.8.0",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
+    "jest": "^28",
     "matrix-web-i18n": "^1.3.0",
     "mkdirp": "^1.0.3",
     "needle": "^2.5.0",
     "node-pre-gyp": "^0.15.0",
     "pacote": "^11.3.5",
+    "playwright": "^1.25.0",
     "rimraf": "^3.0.2",
     "tar": "^6.1.2",
+    "ts-jest": "^28.0.8",
     "ts-node": "^10.4.0",
     "typescript": "4.5.5"
   },
@@ -144,5 +154,14 @@
         ]
       }
     ]
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "testMatch": [
+      "<rootDir>/test/**/*-test.[jt]s?(x)"
+    ],
+    "setupFilesAfterEnv": [
+      "expect-playwright"
+    ]
   }
 }

pkgs/applications/networking/instant-messengers/element/pin.json

@@ -1,6 +1,6 @@
 {
-  "version": "1.11.4",
-  "desktopSrcHash": "lIyx1gpPkuOGzHTbkHKNiGsVKEkKUIz/8sj/KZ9XK9o=",
-  "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk",
-  "webHash": "0ilvnlnh300l9f3y89k3dxipa7gqsh3aq6h76v843nq2y292w43a"
+  "version": "1.11.5",
+  "desktopSrcHash": "JbkB+J2KgHcT8rYv8ovC1r325U5NIHo8Wkh0BogLB+w=",
+  "desktopYarnHash": "1bfpd4a0xrlhm7zq2xz5f184mfp6w4glgyfm4r0y3bi06i4my8vc",
+  "webHash": "144sj9z5yvl27mz69czadai1nxa4gqla2039y7qaha3vmznpaibx"
 }

pkgs/applications/networking/p2p/qbittorrent/default.nix

@@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
 with lib;
 mkDerivation rec {
   pname = "qbittorrent";
-  version = "4.4.3";
+  version = "4.4.3.1";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qBittorrent";
     rev = "release-${version}";
-    sha256 = "sha256-Gcjs7Yueuw76/4is4ZyvlVr6xZ8D+So1+PjZGg6Curk=";
+    sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s=";
   };
 
   enableParallelBuilding = true;

pkgs/servers/routinator/default.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "routinator";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-C6BY+Ba5KQgi+jMUKRi7osZNEDMLMDOhA4TQlbqb9jY=";
+    sha256 = "sha256-zQ68PN3CbLx6Z84jFeuAck6mzp9f3sbALgVqssecsUU=";
   };
 
-  cargoSha256 = "sha256-5ZBE7jbhO4j4FwGSXLIbYjmtmNxFpiME9JqXBqwHSUA=";
+  cargoSha256 = "sha256-M8JO4E8TwLbPGdwslO2Uw+ooAJkIoyc1t1wgxw8CFF0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];