diff --git a/flake.lock b/flake.lock index 6f10f908..d3d046f2 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -554,11 +554,11 @@ }, "nur": { "locked": { - "lastModified": 1705783528, - "narHash": "sha256-ST+dH1Sy/grJT1lnTKl9gZ7y3AWS1yIlfxvpM/+CGaY=", + "lastModified": 1705787139, + "narHash": "sha256-QoOovgqrTq8GdMfvp5AbhHhunhXbgsxmWwlpVGL2tgM=", "owner": "nix-community", "repo": "NUR", - "rev": "65380eec6e39c81a064b44d43d706599c9d8320d", + "rev": "26884905e6e16577275d60f3985861eec185afa4", "type": "github" }, "original": { diff --git a/patches/277312.patch b/patches/277312.patch deleted file mode 100644 index 46e29209..00000000 --- a/patches/277312.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index 0ff87211985ff3..8d3204fa2b4f8c 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -@@ -1,6 +1,6 @@ - { - "name": "matrix-hookshot", -- "version": "4.7.0", -+ "version": "5.1.2", - "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", - "main": "lib/app.js", - "repository": "https://github.com/matrix-org/matrix-hookshot", -@@ -10,7 +10,7 @@ - "name": "matrix-hookshot-rs" - }, - "engines": { -- "node": ">=18" -+ "node": ">=20" - }, - "scripts": { - "build:web": "vite build", -@@ -32,6 +32,7 @@ - "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", - "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", - "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", -+ "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest)", - "test:cover": "nyc --reporter=lcov --reporter=text yarn test", - "lint": "yarn run lint:js && yarn run lint:rs", - "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", -@@ -42,71 +43,77 @@ - }, - "dependencies": { - "@alloc/quick-lru": "^5.2.0", -- "@octokit/auth-app": "^3.3.0", -- "@octokit/auth-token": "^2.4.5", -- "@octokit/rest": "^18.10.0", -- "@octokit/webhooks": "^9.1.2", -+ "@octokit/auth-app": "^6.0.2", -+ "@octokit/auth-token": "^4.0.0", -+ "@octokit/rest": "^20.0.2", -+ "@octokit/webhooks": "^12.0.10", - "@sentry/node": "^7.52.1", -+ "@vector-im/compound-design-tokens": "^0.1.0", -+ "@vector-im/compound-web": "^0.9.4", - "ajv": "^8.11.0", -- "axios": "^1.6.2", -+ "axios": "^1.6.3", - "cors": "^2.8.5", -- "express": "^4.17.3", -+ "express": "^4.18.2", - "figma-js": "^1.14.0", - "http-status-codes": "^2.2.0", - "ioredis": "^5.2.3", -- "jira-client": "^8.0.0", -- "markdown-it": "^12.3.2", -+ "jira-client": "^8.2.2", -+ "markdown-it": "^14.0.0", - "matrix-appservice-bridge": "^9.0.1", -- "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.7-element.1", -- "matrix-widget-api": "^1.0.0", -- "micromatch": "^4.0.4", -- "mime": "^3.0.0", -- "node-emoji": "^1.11.0", -- "nyc": "^15.1.0", -+ "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.0-specific-device-2", -+ "matrix-widget-api": "^1.6.0", -+ "micromatch": "^4.0.5", -+ "mime": "^4.0.1", -+ "node-emoji": "^2.1.3", - "p-queue": "^6.6.2", -- "prom-client": "^14.2.0", -- "quickjs-emscripten": "^0.23.0", -- "reflect-metadata": "^0.1.13", -+ "preact-render-to-string": "^6.3.1", -+ "prom-client": "^15.1.0", -+ "quickjs-emscripten": "^0.26.0", -+ "reflect-metadata": "^0.2.1", - "source-map-support": "^0.5.21", - "string-argv": "^0.3.1", - "tiny-typed-emitter": "^2.1.0", -- "winston": "^3.3.3", -- "xml2js": "^0.5.0", -- "yaml": "^2.2.2" -+ "vite-plugin-magical-svg": "^1.1.1", -+ "winston": "^3.11.0", -+ "xml2js": "^0.6.2", -+ "yaml": "^2.3.4" - }, - "devDependencies": { - "@codemirror/lang-javascript": "^6.0.2", - "@napi-rs/cli": "^2.13.2", - "@preact/preset-vite": "^2.2.0", -- "@tsconfig/node18": "^2.0.0", -+ "@rollup/plugin-alias": "^5.1.0", -+ "@tsconfig/node18": "^18.2.2", - "@types/ajv": "^1.0.0", - "@types/chai": "^4.2.22", - "@types/cors": "^2.8.12", - "@types/express": "^4.17.14", -+ "@types/jest": "^29.5.11", - "@types/jira-client": "^7.1.0", -- "@types/markdown-it": "^12.2.3", -+ "@types/markdown-it": "^13.0.7", - "@types/micromatch": "^4.0.1", -- "@types/mime": "^2.0.3", -- "@types/mocha": "^9.0.0", -- "@types/node": "18", -- "@types/node-emoji": "^1.8.1", -- "@types/uuid": "^8.3.3", -+ "@types/mime": "^3.0.4", -+ "@types/mocha": "^10.0.6", -+ "@types/node": "20.10.6", - "@types/xml2js": "^0.4.11", -- "@typescript-eslint/eslint-plugin": "^6.6.0", -- "@typescript-eslint/parser": "^6.6.0", -+ "@typescript-eslint/eslint-plugin": "^6.17.0", -+ "@typescript-eslint/parser": "^6.17.0", - "@uiw/react-codemirror": "^4.12.3", - "chai": "^4.3.4", - "eslint": "^8.49.0", - "eslint-config-preact": "^1.3.0", - "eslint-plugin-mocha": "^10.1.0", -+ "homerunner-client": "^1.0.0", -+ "jest": "^29.7.0", - "mini.css": "^3.0.1", -- "mocha": "^8.2.1", -+ "mocha": "^10.2.0", -+ "nyc": "^15.1.0", - "preact": "^10.5.15", -- "rimraf": "^3.0.2", -- "sass": "^1.51.0", -+ "rimraf": "^5.0.5", -+ "sass": "^1.69.6", -+ "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", -- "typescript": "^5.1.3", -- "vite": "^4.1.5", -- "vite-svg-loader": "^4.0.0" -+ "typescript": "^5.3.3", -+ "vite": "^5.0.10" - } - } -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index 64b40c341cc9d2..51dab75959ade7 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -@@ -1,6 +1,6 @@ - { -- "version": "4.7.0", -- "srcHash": "sha256-27PBuLyk/1ER26pus5tbe9CxeYEZgZrYBYy5l3B/19c=", -- "yarnHash": "05mh3q5zw1aiznvbkhp7spb1bgcv32ncdb4zpyvhhv74pyhjnsn2", -- "cargoHash": "sha256-cAjsNVQfXfZbM1/MoiEh/Qp0uW/iXsxBVx7cRZY3tN0=" -+ "version": "5.1.2", -+ "srcHash": "sha256-dBuk/kpU5/GnwoTDh8FdnetK2hEBBTwrUA3fP/L9mWU=", -+ "yarnHash": "100lfm0pr0l33j1bl9zmw1s7fm4ihrwppyvq6x8ahx1sjrr1m0lp", -+ "cargoHash": "sha256-4cFhV5y7tqUZ4pQWQKIbOZ0qXo0ya5gnMizCNcxYZS0=" - } diff --git a/patches/277757.patch b/patches/277757.patch deleted file mode 100644 index 9d36af29..00000000 --- a/patches/277757.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix -index bf3b8b64f1e7a2..d3ede5ee5b8b39 100644 ---- a/pkgs/applications/networking/remote/xrdp/default.nix -+++ b/pkgs/applications/networking/remote/xrdp/default.nix -@@ -1,7 +1,7 @@ - { lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: - - let -- version = "0.9.23.1"; -+ version = "0.9.24"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; -@@ -10,7 +10,7 @@ let - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; -- hash = "sha256-fJKSEHB5X5QydKgRPjIMJzNaAy1EVJifHETSGmlJttQ="; -+ hash = "sha256-Kvj72l+jmoad6VgmCYW2KtQAbJMJ8AZjNIYJ5lUNzRM="; - }; - }; - diff --git a/patches/281294.patch b/patches/281294.patch deleted file mode 100644 index 9270f306..00000000 --- a/patches/281294.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -index 6aa4ea71b6a134..407b595a5426bf 100644 ---- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -@@ -19,18 +19,18 @@ - - stdenv.mkDerivation (finalAttrs: { - pname = "teams-for-linux"; -- version = "1.4.2"; -+ version = "1.4.4"; - - src = fetchFromGitHub { - owner = "IsmaelMartinez"; - repo = "teams-for-linux"; - rev = "v${finalAttrs.version}"; -- hash = "sha256-Y1SVUcBRDM+nyWuT0r0WS/PfKNkQd9x9DYlmJUFoeoo="; -+ hash = "sha256-GNfFzJsWyu46mP0k1wT8SG22F9oKpLwoLQ0TnNFqvv8="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; -- hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA="; -+ hash = "sha256-AmCr3IH7A260HTT0VGWQ7DdB8yp0mKnh2pq7ZgFaA7k="; - }; - - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];