Merge pull request 'update' (#261) from update-flake into main
Some checks failed
ci/woodpecker/cron/update-lockfile Pipeline failed
Hydra woodpecker-server Hydra build #48506 of nix-packages:aarch64-linux-master:woodpecker-server
Hydra mautrix-telegram Hydra build #48507 of nix-packages:aarch64-linux-master:mautrix-telegram
Hydra woodpecker-frontend Hydra build #48508 of nix-packages:aarch64-linux-master:woodpecker-frontend
Hydra mautrix-discord Hydra build #48509 of nix-packages:aarch64-linux-master:mautrix-discord
Hydra papermc Hydra build #48510 of nix-packages:aarch64-linux-master:papermc
Hydra hydra Hydra build #48511 of nix-packages:aarch64-linux-master:hydra
Hydra woodpecker-agent Hydra build #48512 of nix-packages:aarch64-linux-master:woodpecker-agent
Hydra mautrix-whatsapp Hydra build #48514 of nix-packages:aarch64-linux-master:mautrix-whatsapp
Hydra woodpecker-cli Hydra build #48515 of nix-packages:aarch64-linux-master:woodpecker-cli
Hydra hydra-unstable Hydra build #48516 of nix-packages:aarch64-linux-master:hydra-unstable
Hydra akkoma Hydra build #48513 of nix-packages:aarch64-linux-master:akkoma
ci/woodpecker/cron/update Pipeline failed

Reviewed-on: #261
This commit is contained in:
Charlotte 🦝 Delenk 2023-06-09 19:47:57 +00:00
commit 7d9f5fed9e
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
12 changed files with 56 additions and 54 deletions

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/woodpecker-ci/woodpecker",
"rev": "3158980d3ec665d0c780236d1bb9aebc69273984",
"date": "2023-06-08T03:33:23+02:00",
"path": "/nix/store/w70i64zzmf9xss9d8lzimzwjqahk315g-woodpecker",
"sha256": "0562p0hr8iqykkqdcbsk6sj8njif8z28kq59w47vbj92ibrb0gfb",
"rev": "7bae68758fd00a2de8d3b41271ad9671d3b9def6",
"date": "2023-06-09T12:43:12+02:00",
"path": "/nix/store/hkyr2sz8m7zh95yz91rinl3kpvbrb9x8-woodpecker",
"sha256": "1g75hlim7h7isn17hg560vhany5qr9xk9jadgskzi3v0zp3bh3f7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -378,9 +378,9 @@
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
"@iconify/json@^2.2.43":
version "2.2.75"
resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.75.tgz#1f987966f146bf620651dd3f2de0c7c8d09e9b37"
integrity sha512-uVnt14GehnyRlPZg+GA6t6+hep1rcVksyRREaiYLYiFVw7nC6xXX9uYrQU224sKEQEyu6bwS1VQWHtTbPEgUdg==
version "2.2.76"
resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.76.tgz#90cf3a1361fe4f71928b6aebb13de2b4195f4aa5"
integrity sha512-SXnvEurfutQ0ytXGxzQZ3TU1/vuYl1XoBIvAkvAVIlxu4qXiqSJQbXoZ+bATInKdeai/HuALcL0vAxUR5FLjOg==
dependencies:
"@iconify/types" "*"
pathe "^1.1.0"
@ -1072,9 +1072,9 @@ callsites@^3.0.0:
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
caniuse-lite@^1.0.30001489:
version "1.0.30001495"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz#64a0ccef1911a9dcff647115b4430f8eff1ef2d9"
integrity sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==
version "1.0.30001497"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz#0e5387b98e7dbf9c4f743fb16e92cbf0ca780714"
integrity sha512-I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw==
chalk@^2.0.0:
version "2.4.2"
@ -1313,9 +1313,9 @@ domutils@^3.0.1:
domhandler "^5.0.3"
electron-to-chromium@^1.4.411:
version "1.4.425"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.425.tgz#399df13091b836d28283a545c25c8e4d9da86da8"
integrity sha512-wv1NufHxu11zfDbY4fglYQApMswleE9FL/DSeyOyauVXDZ+Kco96JK/tPfBUaDqfRarYp2WH2hJ/5UnVywp9Jg==
version "1.4.426"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.426.tgz#077107b6565c081ce7d0a988fbce6d4ac2d49557"
integrity sha512-dWuNH+XUT9hdFHASfMpcZGW5kUyJvllumJkXaXiswuCkoaFIFI89aykBPuHEi1YUWQGRCqvIO0BUdmeFJ4W4Ww==
entities@^4.2.0:
version "4.5.0"

View file

@ -448,11 +448,11 @@
};
}
{
name = "_iconify_json___json_2.2.75.tgz";
name = "_iconify_json___json_2.2.76.tgz";
path = fetchurl {
name = "_iconify_json___json_2.2.75.tgz";
url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.75.tgz";
sha512 = "uVnt14GehnyRlPZg+GA6t6+hep1rcVksyRREaiYLYiFVw7nC6xXX9uYrQU224sKEQEyu6bwS1VQWHtTbPEgUdg==";
name = "_iconify_json___json_2.2.76.tgz";
url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.76.tgz";
sha512 = "SXnvEurfutQ0ytXGxzQZ3TU1/vuYl1XoBIvAkvAVIlxu4qXiqSJQbXoZ+bATInKdeai/HuALcL0vAxUR5FLjOg==";
};
}
{
@ -1184,11 +1184,11 @@
};
}
{
name = "caniuse_lite___caniuse_lite_1.0.30001495.tgz";
name = "caniuse_lite___caniuse_lite_1.0.30001497.tgz";
path = fetchurl {
name = "caniuse_lite___caniuse_lite_1.0.30001495.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz";
sha512 = "F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==";
name = "caniuse_lite___caniuse_lite_1.0.30001497.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz";
sha512 = "I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw==";
};
}
{
@ -1464,11 +1464,11 @@
};
}
{
name = "electron_to_chromium___electron_to_chromium_1.4.425.tgz";
name = "electron_to_chromium___electron_to_chromium_1.4.426.tgz";
path = fetchurl {
name = "electron_to_chromium___electron_to_chromium_1.4.425.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.425.tgz";
sha512 = "wv1NufHxu11zfDbY4fglYQApMswleE9FL/DSeyOyauVXDZ+Kco96JK/tPfBUaDqfRarYp2WH2hJ/5UnVywp9Jg==";
name = "electron_to_chromium___electron_to_chromium_1.4.426.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.426.tgz";
sha512 = "dWuNH+XUT9hdFHASfMpcZGW5kUyJvllumJkXaXiswuCkoaFIFI89aykBPuHEi1YUWQGRCqvIO0BUdmeFJ4W4Ww==";
};
}
{

View file

@ -259,11 +259,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686250055,
"narHash": "sha256-F9trSguynNncPHod/7vfYG5R1t1Ytjv+e2KyyV+XZSo=",
"lastModified": 1686331126,
"narHash": "sha256-cRaDzPS+VvxYu+rWsl5TscMZosmTlwX78p1t0QPMeIw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a7e52cc2bad5db8a8cbcad6704dbe07417c45ddb",
"rev": "ba0f52d80375147840b83f1511599fbe333be3ad",
"type": "github"
},
"original": {

View file

@ -113,9 +113,9 @@
wordpress-plugins
wordpress-themes
kubo
hydra
hydra-unstable
;
inherit (hydra.packages.${system}) hydra;
hydra-unstable = hydra.packages.${system}.hydra;
}
// (
if system == "riscv64-linux"

View file

@ -90,5 +90,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.15.3-0.20230605151437-f71a26085e1a"
hash = "sha256-YOqKL0PNSzgbskFMxopi0pTCt3RM2k/4WIkoVtOgQuw="
version = "v0.15.3-0.20230609085119-3b3db3ca863b"
hash = "sha256-SnIsQtjHu8kVIfwMeiWM7N5LohafX1H15REKNXqHvrE="

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/discord",
"rev": "b153e70f2acd533784dfdf99e2876d525abc669e",
"date": "2023-06-06T17:03:33+03:00",
"path": "/nix/store/cip0bhxnpzn5vjsk7hf6pdf68xkvskc3-discord",
"sha256": "0jk3r3hark367z77lm18dzhdlfc44jzx05mffxiwmbysz2vygfgq",
"rev": "d5db336eeed67b07a47d150b4d368290566a26d6",
"date": "2023-06-09T12:41:17+03:00",
"path": "/nix/store/z61p3n2nslqqmjcv4fb4hp0q75pjj8i5-discord",
"sha256": "1f1frbdqwkznf0bs1xg3z9660591lzsng3n5gdszikljb34z7a50",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/telegram",
"rev": "0411affc889ce15dbbefbf27ef36aa3cec17cae5",
"date": "2023-06-06T11:48:13+03:00",
"path": "/nix/store/vhqyhc2gx9kp310c7mx9sa38hxv4j7r0-telegram",
"sha256": "127g16nlkzhsg0z06q3x3map07ik762naanyrjv5rzaswbja6kw0",
"rev": "fb461109c10362364a269cc8d48203cf39351cb5",
"date": "2023-06-09T15:38:32+01:00",
"path": "/nix/store/4ygz4y9yhp1d5zls2mb1y92kkb14p52s-telegram",
"sha256": "17gmi75q53s331k8xj59qj838c50ck2p8fgqra5wavi8yfgm7vsg",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -83,8 +83,8 @@ schema = 3
version = "v0.1.0"
hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0="
[mod."go.mau.fi/whatsmeow"]
version = "v0.0.0-20230603164718-6ce745d7990a"
hash = "sha256-GhmgjB4T0JEvajXnfzAwjcoIR6ErBoUE6kAjMzIYsXI="
version = "v0.0.0-20230608204524-7aedaa1de108"
hash = "sha256-0CviuXvNgxS5PLZl7g6EvilP7TWvGz7OwhO/7nj8BH8="
[mod."go.mau.fi/zeroconfig"]
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
@ -122,5 +122,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.15.3-0.20230605151437-f71a26085e1a"
hash = "sha256-YOqKL0PNSzgbskFMxopi0pTCt3RM2k/4WIkoVtOgQuw="
version = "v0.15.3-0.20230609085119-3b3db3ca863b"
hash = "sha256-SnIsQtjHu8kVIfwMeiWM7N5LohafX1H15REKNXqHvrE="

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/whatsapp",
"rev": "9843ba048fb717243e4d9f1703c0590cdb2dd676",
"date": "2023-06-05T18:18:48+03:00",
"path": "/nix/store/hyaa15fhhycpgi6bz3y81f82sfn7rljq-whatsapp",
"sha256": "0wrr7i09k7fii7xfyzdkbcmplpiayq9gw1zgs2pqpizy4y2nfcqp",
"rev": "de487d89d09ec5e86222aeffc71c83210320c6f8",
"date": "2023-06-09T12:33:02+03:00",
"path": "/nix/store/wgsvvc65rfz0zmqk224jylql8knr6kpv-whatsapp",
"sha256": "0zh4ylvq0vbgq2wm231frbda9b9pxlvwc5i8kf2643fbqmdig1n3",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,6 +1,6 @@
{
"version": "1.19.4",
"build": 549,
"name": "paper-1.19.4-549.jar",
"sha256": "fb37c5e26937856e48846c8b500892a43ac559fdcaf28964a80deada1c32c789"
"build": 550,
"name": "paper-1.19.4-550.jar",
"sha256": "e587d78cba3e99ef8c4bc24cf20cc3bdbbe89e33b0b572070446af4eb6be5ccf"
}

View file

@ -5,11 +5,13 @@ system: self: super: let
lib = import ./lib {pkgs = super;}; # functions
flake = (lib.importFlake {inherit system;}).defaultNix;
getFlakeOverlay = flakeName: overlay: self: super: let
getFlake = flakeName: let
lib = import ./lib {pkgs = super;};
flake = (lib.importFlake {inherit system;}).defaultNix;
in
flake.inputs.${flakeName}.outputs.overlays.${overlay} self super;
flake.inputs.${flakeName};
getFlakeOverlay = flakeName: overlay: self: super: (getFlake flakeName).outputs.overlays.${overlay} self super;
riscv-overlay = self: super: {
vf2Kernel = self.callPackage ./linux/vf2 {kernelPatches = [];};
@ -69,7 +71,7 @@ system: self: super: let
woodpecker-cli = self.callPackage ./ci/woodpecker/cli.nix {};
woodpecker-frontend = self.callPackage ./ci/woodpecker/frontend.nix {};
woodpecker-server = self.callPackage ./ci/woodpecker/server.nix {};
hydra = flake.inputs.hydra.outputs.packages.hydra.overrideAttrs (super: {
hydra = (getFlake "hydra").outputs.packages.${system}.hydra.overrideAttrs (super: {
doCheck = false;
patches =
(super.patches or [])