From ead51d1d57462612b143ea1fbd9f02076b65fe88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 20 Jul 2023 08:39:03 +0100 Subject: [PATCH] update --- ci/woodpecker/source.json | 8 ++++---- ci/woodpecker/yarn.lock | 12 ++++++------ ci/woodpecker/yarn.nix | 16 ++++++++-------- emulator/bsnes-plus/default.nix | 3 +++ flake.lock | 6 +++--- minecraft/papermc/paper.json | 6 +++--- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/ci/woodpecker/source.json b/ci/woodpecker/source.json index fe97e32..753e311 100644 --- a/ci/woodpecker/source.json +++ b/ci/woodpecker/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/woodpecker-ci/woodpecker", - "rev": "2e851ba4a044e8350ac9c3b273187a534c633f88", - "date": "2023-07-18T18:46:27+02:00", - "path": "/nix/store/wrd3dmk7ij68wsylx0ahnnh83mp2g8wc-woodpecker", - "sha256": "1gsh27ksqv0dw0h93wi44wnwxjh78c0ffzxnfsrzplpslfqbjzwq", + "rev": "3a85559763a5a9df197ffc04a4c22294ccf5097b", + "date": "2023-07-19T22:09:06+02:00", + "path": "/nix/store/ldn27waasvds7r08nvyaig9358vi18l1-woodpecker", + "sha256": "04vg59q77a3blch7fm20v9m7lppnvly81sxf3kqbqfjrlddmbh2g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/ci/woodpecker/yarn.lock b/ci/woodpecker/yarn.lock index d1fb478..f8be3e0 100644 --- a/ci/woodpecker/yarn.lock +++ b/ci/woodpecker/yarn.lock @@ -380,9 +380,9 @@ integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@iconify/json@^2.2.85": - version "2.2.92" - resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.92.tgz#d10d767dfe4768d473d9753e278e8bc71cdcbf6b" - integrity sha512-90skjzsGcOObfKIkRc+JWjMdI+BI8jfB5tbXk825+aNscWwDYSCuEaN2EWaDnmHHB+S2bMXQbUDeBoQiUjojcA== + version "2.2.93" + resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.93.tgz#578b4e2b42ff768a39c350b51e9f0ebd2bc42e38" + integrity sha512-gEC9TmJbd96CzJzl0TOYCGWhiHFalHRfhqi+xkVl3uOMWH6l15iVeL7tRiPdY/q5hxYfSva36XbqlDyKFyWCPw== dependencies: "@iconify/types" "*" pathe "^1.1.0" @@ -1326,9 +1326,9 @@ domutils@^3.0.1: domhandler "^5.0.3" electron-to-chromium@^1.4.431: - version "1.4.464" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.464.tgz#2f94bad78dff34e527aacbfc5d0b1a33cf046507" - integrity sha512-guZ84yoou4+ILNdj0XEbmGs6DEWj6zpVOWYpY09GU66yEb0DSYvP/biBPzHn0GuW/3RC/pnaYNUWlQE1fJYtgA== + version "1.4.466" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.466.tgz#17193d70f203da3d52a89c653b8d89f47a51d79d" + integrity sha512-TSkRvbXRXD8BwhcGlZXDsbI2lRoP8dvqR7LQnqQNk9KxXBc4tG8O+rTuXgTyIpEdiqSGKEBSqrxdqEntnjNncA== entities@^4.2.0: version "4.5.0" diff --git a/ci/woodpecker/yarn.nix b/ci/woodpecker/yarn.nix index b72b1bc..a216785 100644 --- a/ci/woodpecker/yarn.nix +++ b/ci/woodpecker/yarn.nix @@ -456,11 +456,11 @@ }; } { - name = "_iconify_json___json_2.2.92.tgz"; + name = "_iconify_json___json_2.2.93.tgz"; path = fetchurl { - name = "_iconify_json___json_2.2.92.tgz"; - url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.92.tgz"; - sha512 = "90skjzsGcOObfKIkRc+JWjMdI+BI8jfB5tbXk825+aNscWwDYSCuEaN2EWaDnmHHB+S2bMXQbUDeBoQiUjojcA=="; + name = "_iconify_json___json_2.2.93.tgz"; + url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.93.tgz"; + sha512 = "gEC9TmJbd96CzJzl0TOYCGWhiHFalHRfhqi+xkVl3uOMWH6l15iVeL7tRiPdY/q5hxYfSva36XbqlDyKFyWCPw=="; }; } { @@ -1480,11 +1480,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.4.464.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.466.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.464.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.464.tgz"; - sha512 = "guZ84yoou4+ILNdj0XEbmGs6DEWj6zpVOWYpY09GU66yEb0DSYvP/biBPzHn0GuW/3RC/pnaYNUWlQE1fJYtgA=="; + name = "electron_to_chromium___electron_to_chromium_1.4.466.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.466.tgz"; + sha512 = "TSkRvbXRXD8BwhcGlZXDsbI2lRoP8dvqR7LQnqQNk9KxXBc4tG8O+rTuXgTyIpEdiqSGKEBSqrxdqEntnjNncA=="; }; } { diff --git a/emulator/bsnes-plus/default.nix b/emulator/bsnes-plus/default.nix index 87f1b2e..d8b6a3f 100644 --- a/emulator/bsnes-plus/default.nix +++ b/emulator/bsnes-plus/default.nix @@ -27,5 +27,8 @@ in export HOME=$(mktemp -d) export prefix=$out ''; + preFixup = '' + qtWrapperArgs+=("--unset" "WAYLAND_DISPLAY") + ''; enableParallelBuilding = true; } diff --git a/flake.lock b/flake.lock index 001bf03..d4595b6 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1689777276, - "narHash": "sha256-hxocvqb88L82uE0AwhG5K7eI3tbwR5gL8tz/+OWWsgQ=", + "lastModified": 1689836677, + "narHash": "sha256-rC1FsnsHYZ7Jlxcdk3lYbkv5FJHRzEnAGDQV/8iNpPg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0665253b864c4b725c19337b2b1971158f55b16f", + "rev": "d0c7a8f1c9a2ebfebd3d99960cdb7c4eec442dc9", "type": "github" }, "original": { diff --git a/minecraft/papermc/paper.json b/minecraft/papermc/paper.json index b2f21d0..8ff18da 100644 --- a/minecraft/papermc/paper.json +++ b/minecraft/papermc/paper.json @@ -1,6 +1,6 @@ { "version": "1.20.1", - "build": 83, - "name": "paper-1.20.1-83.jar", - "sha256": "1d0a5cdcc3976b5c245ea826f5c8908f4e05508caeba99d88aefb6459fec5c4e" + "build": 84, + "name": "paper-1.20.1-84.jar", + "sha256": "138afa7ae82078a0329717648e9788d32410a829444a0bbf890199e1325019f6" }