diff options
9 files changed, 60 insertions, 42 deletions
diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix index 657e5b0e3ffa..c57ab07e4045 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -6,20 +6,20 @@ let pname = "torq"; - version = "0.18.17"; + version = "0.18.19"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM="; + hash = "sha256-qJIAH8SrB5a7j6ptorEm6fryZj63vDQIUQIgRsVn1us="; }; web = buildNpmPackage { pname = "${pname}-frontend"; inherit version; src = "${src}/web"; - npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM="; + npmDepsHash = "sha256-WulYJE2pdVa5hquV/7UjR1z9PkglJXOq5fv8nLa4wos="; # copied from upstream Dockerfile npmInstallFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8f58a0473ef7..a9963b0f2eb3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-U9mzz/r3xb6bl9n1Go6JiM6CemB2Nwsu6LEhc5ypV3c=", + "hash": "sha256-ouS+0fLs4Zo17ZIqsd7CiYUKQMSNtuwVs3qdZ52qbns=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.57.0", + "rev": "v4.57.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dK1NGOpX8h4XvcDtp4DEaVrxHaGmzTXldKbsfFoVWu4=" + "vendorHash": "sha256-X4fgw0AJMDDsRuS9MlMu+pnnjxJ33P9QXnpqDXfvfuA=" }, "azuread": { "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", @@ -192,11 +192,11 @@ "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" }, "checkly": { - "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", + "hash": "sha256-LhqdFNTc0RdKmivHI6CnBPmtMW8Sml+5MT8ZjNA4rLY=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.3", + "rev": "v1.6.4", "spdx": null, "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, @@ -328,11 +328,11 @@ "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-du0i4z7Eg/TjA/keIOXq9w+z8Oh6tNOZigV8hpbaGn4=", + "hash": "sha256-8xESl8n/AMURVtnJ9Gd0eZ+flbdLya8RotRBgMF7mBk=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.16.1", + "rev": "v0.16.2", "spdx": "MPL-2.0", "vendorHash": "sha256-Id1rL/Mu/aES7OFQ/rQRMmm3D/GSbGofZludqbWffKo=" }, @@ -373,13 +373,13 @@ "vendorHash": null }, "external": { - "hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=", + "hash": "sha256-+0AqlVGKSEeXlcKfNiYDqh0B9rRqyt9FDNWstdOFACI=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.2.3", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" + "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { "hash": "sha256-OODPVNHFW8hnpofWLvzn7qukngB8okZADYI5t9muHpQ=", @@ -438,24 +438,24 @@ "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { - "hash": "sha256-my7vlk1EBQizQy2i+77Sf4OyOh+64GSDruzCfOc1QTc=", + "hash": "sha256-FdchvDE8aTGKZADeN1peeWMz2jVN4VL1pUf1Tf3e/3E=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.55.0", + "rev": "v4.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" + "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" }, "google-beta": { - "hash": "sha256-uZuoWORRK0Y+r6OM6KhAts7/yPWJDkOtMwELFV/2hYE=", + "hash": "sha256-u7tGES1uiKpn47msir3rn118eWJsD9bnUAM+HHNZUyA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.55.0", + "rev": "v4.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" + "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -612,13 +612,13 @@ "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { - "hash": "sha256-DW80CkmeQKJ4tEBrLsdks+mXweL8K1pVu3yQKGAvZOs=", + "hash": "sha256-pp/l9lVB2+bGrp/cUVt9C3R7PenqKegqm829WhTKsWk=", "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", "repo": "terraform-provider-keycloak", - "rev": "v4.1.0", + "rev": "v4.2.0", "spdx": "MIT", - "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" + "vendorHash": "sha256-UnWHUD9T4nTT6Y2UrvBIdIk9eA8l0vWJ/IpEY3PIzDU=" }, "ksyun": { "hash": "sha256-mq0wE9jkn67HFyg0MgtD9lY7lk0+4/rnPLJ4mXX0xwY=", diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/applications/version-management/conform/default.nix index 5905b6e4d1ba..c60a855ced28 100644 --- a/pkgs/applications/version-management/conform/default.nix +++ b/pkgs/applications/version-management/conform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "conform"; - version = "0.1.0-alpha.26"; + version = "0.1.0-alpha.27"; src = fetchFromGitHub { owner = "siderolabs"; repo = "conform"; rev = "v${version}"; - sha256 = "sha256-+VOwQE2uhoQ4sSXa/SVbyjLn9An08D4GQHxxDRRuXks="; + sha256 = "sha256-lIXkflWQcUcmRDX9iSszFLKpI8nSgkCCB2+GQn07+DM="; }; vendorSha256 = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E="; diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 28f13d50f784..34c20b11fcdb 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.15"; + version = "0.13.18"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UunYt5S8Xz/EZOojl+by3LaHidBE/P4Uwppm4SeHVP0="; + sha256 = "sha256-+12vByeXdQDdc0fn5tY8k4QP4qyqqLRuc8vtuvE/AfU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index e52f1221327c..dd5c93989c8d 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "2.0.2", + "version": "2.1.0", "description": "A Matrix <--> Slack bridge", "engines": { "node": ">=16 <=18" @@ -9,12 +9,14 @@ "scripts": { "prepare": "yarn build", "start": "node ./lib/app.js", - "build": "tsc --build", + "build": "yarn build:app && yarn build:widget", + "build:app": "tsc --build", + "build:widget": "vite build --config widget/vite.config.ts", "test": "yarn test:unit && yarn test:integration", "test:unit": "mocha --require ts-node/register --recursive tests/unit/*.ts", "test:integration": "mocha --exit --reporter list --ui bdd --require ts-node/register --recursive tests/integration/*.ts", "test:postgres": "SLACKBRIDGE_TEST_ENABLEPG=yes mocha --reporter list --ui bdd --require ts-node/register --recursive tests/integration/PgDatastoreTest.ts", - "lint": "eslint -c .eslintrc.js ./src" + "lint": "eslint -c .eslintrc.js ./src && eslint -c ./widget/.eslintrc.js 'widget/src/**/*.{ts,tsx}'" }, "repository": { "type": "git", @@ -36,9 +38,12 @@ "@slack/rtm-api": "^6.0.0", "@slack/web-api": "^6.7.2", "Slackdown": "git+https://Half-Shot@github.com/half-shot/slackdown.git", + "ajv": "^8.12.0", "axios": "^0.27.2", + "classnames": "^2.3.2", "escape-string-regexp": "^4.0.0", - "matrix-appservice-bridge": "^6.0.0", + "matrix-appservice-bridge": "^8.1.0", + "matrix-widget-api": "^1.1.1", "minimist": "^1.2.6", "nedb": "^1.8.0", "node-emoji": "^1.10.0", @@ -46,10 +51,14 @@ "p-queue": "^6.0.0", "pg-promise": "^10.11.1", "randomstring": "^1.2.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "url-join": "^5.0.0", "uuid": "^8.3.2", "yargs": "17.5.1" }, "devDependencies": { + "@tailwindcss/forms": "^0.5.3", "@tsconfig/node16": "^1.0.3", "@types/chai": "^4.2.21", "@types/js-yaml": "^4.0.2", @@ -59,19 +68,28 @@ "@types/node-emoji": "^1.8.1", "@types/nunjucks": "^3.1.5", "@types/randomstring": "^1.1.7", + "@types/react": "^18.0.27", + "@types/react-dom": "^18.0.10", "@types/uuid": "^8.3.1", "@types/yargs": "17.0.10", - "@typescript-eslint/eslint-plugin": "^5.31.0", - "@typescript-eslint/parser": "^5.31.0", + "@typescript-eslint/eslint-plugin": "^5.0.0", + "@typescript-eslint/parser": "^5.50.0", + "@vitejs/plugin-react": "^3.1.0", + "autoprefixer": "^10.4.13", "chai": "^4.3.4", "eslint": "^8.20.0", "eslint-plugin-jsdoc": "^39.3.3", "eslint-plugin-prefer-arrow": "^1.2.3", + "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react-hooks": "^4.6.0", "js-yaml": "^4.1.0", "mocha": "^10.0.0", + "postcss": "^8.4.21", "prom-client": "^14.0.1", "source-map-support": "^0.5.19", + "tailwindcss": "^3.2.4", "ts-node": "^10.1.0", - "typescript": "^4.4.3" + "typescript": "^4.4.3", + "vite": "^4.1.1" } } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json index f842fda7ba5f..06d4e4b14266 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json @@ -1,5 +1,5 @@ { - "version": "2.0.2", - "srcHash": "Z8PQuAOQbQMxmso/KV9n8fu2FqzqLsADqLczmm584QQ=", - "yarnHash": "1ngmgr9li7jagvzfl0jq4bxqw0q1sdqh8k9wlar6q292263g287z" + "version": "2.1.0", + "srcHash": "qAmbW/aDeBWTi1czQtrsb6d5TEYw9gYJ4lpJbaX9nb0=", + "yarnHash": "1r5fqw7y8fzgjnl5xlr8djfmmkm8kqw5p3w12ffll6irwz90wajx" } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh index 647daae22144..92494a3c8beb 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github nix-prefetch-git if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for matrix-appservice-slack." diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 58d795793fb7..8179d5bfca65 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.7.1"; + version = "2.7.4"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-k/HfFeVQBubKMYERhgXKN0Pma1oj9xz1wxlHIjikAzo="; + sha256 = "sha256-afa4uInoNyEgNDJ7nB1yr+YYoOsU+S7XWhKvkeApgRQ="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6d4389683e2d..26ea3732fe52 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -33,7 +33,7 @@ let pname = "vector"; - version = "0.28.0"; + version = "0.28.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -42,10 +42,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1HNOfIB1HmGthNkJca4tfxcq7nDTjN+tsbsP3rLlXi4="; + sha256 = "sha256-hBEw5sAxex4o/b1nr60dEwZs7nosXU7pUChT1VoI25k="; }; - cargoSha256 = "sha256-m4+9vET4VVgeVVN+nuFGi54OvdiubLO5gZE2mj5c+hc="; + cargoSha256 = "sha256-F47ZIxFsp23sPe1nc3UwLZEXJ5lzKiuSIujBxf4fEBo="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; |