update

2023-06-26 07:00:07 +01:00 · 2023-06-26 07:00:07 +01:00 · f234937771
commit f234937771
parent b15e4ae106
9 changed files with 482 additions and 480 deletions
--- a/ci/woodpecker/source.json
+++ b/ci/woodpecker/source.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/woodpecker-ci/woodpecker",
-  "rev": "a958049485d0284f48ed80e4650330ebe9b0aa65",
-  "date": "2023-06-24T10:08:34+02:00",
-  "path": "/nix/store/srk9myxzgmfss3q740zb9mj4bqj89icm-woodpecker",
-  "sha256": "14smw65d9in6976i8714jg7migs87hyjmi6sdahw6xa6g1v6qhjl",
+  "rev": "1fa021273126ddf2700a8dea0a3e990ede344a90",
+  "date": "2023-06-25T23:38:25+02:00",
+  "path": "/nix/store/51h9kp2sj4w3p3b67cj3c22hkvnvyqd0-woodpecker",
+  "sha256": "1wfd7ll044mjrxzqjxy9179p4baz2c6mi5a2fjrp8sk4wg14gd4z",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/ci/woodpecker/yarn.lock
+++ b/ci/woodpecker/yarn.lock
@ -1071,9 +1071,9 @@ callsites@^3.0.0:
  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==

 caniuse-lite@^1.0.30001503:
-  version "1.0.30001507"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534"
-  integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==
+  version "1.0.30001508"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001508.tgz#4461bbc895c692a96da399639cc1e146e7302a33"
+  integrity sha512-sdQZOJdmt3GJs1UMNpCCCyeuS2IEGLXnHyAo9yIO5JJDjbjoVRij4M1qep6P6gFpptD1PqIYgzM+gwJbOi92mw==

 chalk@^2.0.0:
  version "2.4.2"
--- a/ci/woodpecker/yarn.nix
+++ b/ci/woodpecker/yarn.nix
--- a/flake.lock
+++ b/flake.lock
@ -259,11 +259,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1687669787,
-        "narHash": "sha256-8sAwpYmQ1/bFwTMVyCFzrg7WjlNDdoStLFSY5btNRcQ=",
+        "lastModified": 1687759055,
+        "narHash": "sha256-ax0ixK4CG/CrDRF/oOBhKq2SdDF8yDSj/NjBT23JhCY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dc2afced518559f1c962b5824599b2c99c7684e3",
+        "rev": "5f24eefd4047b0972d5e281649ed49fb9a515fae",
        "type": "github"
      },
      "original": {
--- a/matrix/mautrix-telegram/source.json
+++ b/matrix/mautrix-telegram/source.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/mautrix/telegram",
-  "rev": "b5c294a558b8536e93a9cb89b46f57958d1554e0",
-  "date": "2023-06-14T16:15:56+03:00",
-  "path": "/nix/store/yjk64s0fmqqfpa2qcp6jljxn12ca45vl-telegram",
-  "sha256": "1vd5idjqi8x4cpmibaz142p8akq2ph291hfslsa0pxmrm0pkq5ms",
+  "rev": "f2194c6f339d43f62a216c189841865b38ce8bd9",
+  "date": "2023-06-25T13:47:01+03:00",
+  "path": "/nix/store/7n9ic7wkbyf16d5yc4a8facrw9arracn-telegram",
+  "sha256": "1fyzf9p9nkwlrpianx1i39h2ldj5nghzindjf8h8b1g843aszpim",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/minecraft/papermc/paper.json
+++ b/minecraft/papermc/paper.json
@ -1,6 +1,6 @@
 {
  "version": "1.20.1",
-  "build": 48,
-  "name": "paper-1.20.1-48.jar",
-  "sha256": "5a3e62f0b96c3c3d0db545d7ea085e814eda437dd726f46a0d622f6d825e6b57"
+  "build": 49,
+  "name": "paper-1.20.1-49.jar",
+  "sha256": "c85fab5b6cc6885a127ffc012292df6ca61643576635113b00d3cc154eb81f9e"
 }
--- a/overlay.nix
+++ b/overlay.nix
@ -13,9 +13,17 @@ system: self: super: let

  getFlakeOverlay = flakeName: overlay: self: super: (getFlake flakeName).outputs.overlays.${overlay} self super;

-  riscv-overlay = self: super: {
-    vf2Kernel = self.callPackage ./linux/vf2 {kernelPatches = [];};
-  };
+  riscv-overlay =
+    if system == "riscv64-linux"
+    then
+      (self: super: {
+        vf2Kernel = self.callPackage ./linux/vf2 {kernelPatches = [];};
+        meson = super.meson.overrideAttrs (_: {
+          doCheck = false;
+          doInstallCheck = false;
+        });
+      })
+    else (_: _: {});

  overlays = [
    (getFlakeOverlay "attic" "default")
--- a/python/mautrix.nix
+++ b/python/mautrix.nix
@ -12,11 +12,11 @@
 }:
 buildPythonPackage rec {
  pname = "mautrix";
-  version = "0.20.0rc1";
+  version = "0.20.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-u5fWrPBqHdBnxgplDGSgHNifc2qiWLwJvdKU56LvbmU=";
+    sha256 = "sha256-z+fEu4UJmONsVov1E37b9w0+cYh1FBMZRqooP8mXhvM=";
  };

  propagatedBuildInputs = [
--- a/update.sh
+++ b/update.sh
@ -2,4 +2,4 @@

 ./scripts/update-git.sh https://github.com/starfive-tech/linux linux/vf2/source.json "--rev refs/heads/JH7110_VisionFive2_upstream"
 ./scripts/update-git.sh https://github.com/koverstreet/bcachefs linux/bcachefs/source.json
-nix-shell ./scripts/update.sh
+nix-shell ./scripts/update.nix