Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-08-22 18:05:33 +00:00
committed by GitHub
13 changed files with 164 additions and 182 deletions
+2 -2
View File
@@ -4,9 +4,9 @@ description: 'Checkout into trusted / untrusted / pinned folders consistently.'
inputs:
merged-as-untrusted-at:
description: "Whether and which SHA to checkout for the merge commit in the ./untrusted folder."
description: "Whether and which SHA to checkout for the merge commit in the ./nixpkgs/untrusted folder."
target-as-trusted-at:
description: "Whether and which SHA to checkout for the target commit in the ./trusted folder."
description: "Whether and which SHA to checkout for the target commit in the ./nixpkgs/trusted folder."
runs:
using: composite
+1
View File
@@ -26,6 +26,7 @@
- any:
- changed-files:
- any-glob-to-any-file:
- .github/actions/*
- .github/workflows/*
- ci/**/*.*
+1 -1
View File
@@ -287,7 +287,7 @@ rec {
loc = builtins.unsafeGetAttrPos arg fargs;
in
"Function called without required argument \"${arg}\" at "
+ "${loc.file}:${loc.line}${prettySuggestions (getSuggestions arg)}";
+ "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
# Only show the error for the first missing argument
error = errorForArg (head (attrNames missingArgs));
+4 -4
View File
@@ -37,17 +37,17 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = binName;
version = "0.24.0";
version = "0.24.1";
src = fetchFromGitHub {
owner = "toeverything";
repo = "AFFiNE";
tag = "v${finalAttrs.version}";
hash = "sha256-vI4lCucwNdrbmst78NUkHXtluZvrc7aHymzm1Zbls78=";
hash = "sha256-Yq5TD5yInv+0d1S6M58I8CneCAGUwH0ThGrEJfLIrX0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-OdzjT6ktxvQNIk0Um9iru7Wm5LcBE3f5vrO4rsksf5U=";
hash = "sha256-tRDc7Rky59Rh08QTNiG3yopErHJzARxN8BZGrSUECLE=";
};
yarnOfflineCache = stdenvNoCC.mkDerivation {
name = "yarn-offline-cache";
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
dontInstall = true;
outputHashMode = "recursive";
outputHash = "sha256-wSEAxOSLS0ul5vQDTj/bVXH8ViqDFsq6jHTaXJFAm/U=";
outputHash = "sha256-U2FGvdtGiM97aXmbfNIfi87hvwDkd1dvlAABYiDgAGI=";
};
buildInputs = lib.optionals hostPlatform.isDarwin [
+3 -3
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "chirp";
version = "0.4.0-unstable-2025-08-13";
version = "0.4.0-unstable-2025-08-19";
pyproject = true;
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "acb1a78384a804dab1f2f0cc453b3da972d39072";
hash = "sha256-+1hzT7peZWtiREeOJqpCyrZNUxOVchxysv9RIAVKPds=";
rev = "0705a4c61e11f952ef1bcdb282f22a74dc72782f";
hash = "sha256-gUiSuulthiEC94SuXfGzuDDrf2dYTsJLsAjtjAsTIPY=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -30,7 +30,7 @@ let
__intentionallyOverridingVersion = true;
});
version = "1.8.1";
version = "1.8.2";
in
rustPlatform.buildRustPackage {
pname = "devenv";
@@ -40,10 +40,10 @@ rustPlatform.buildRustPackage {
owner = "cachix";
repo = "devenv";
tag = "v${version}";
hash = "sha256-YsSFlVWUu4RSYnObqcBJ4Mr3bJVVhuFhaQAktHytBAI=";
hash = "sha256-j1IujIUZFdKKv33ldsptrcbe0avAX725SYhGtNrGJcI=";
};
cargoHash = "sha256-zJorGAsp5k5oBuXogYqEPVexcNsYCeiTmrQqySd1AGs=";
cargoHash = "sha256-NNfqmdnDIKmp1upkBwJMp+VirSYsUXJNgGbAzcHs8LY=";
buildAndTestSubdir = "devenv";
+2 -2
View File
@@ -141,7 +141,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ejabberd";
version = "25.07";
version = "25.08";
nativeBuildInputs = [
makeWrapper
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "processone";
repo = "ejabberd";
tag = finalAttrs.version;
hash = "sha256-DDvxmRennd9tAC9LqV8eAAzcF+kZemvgsOviWD9CHlM=";
hash = "sha256-nipFr4ezo2prlpLfAW8iu8HAG8nhkIXXiAbsoM7QKTM=";
};
passthru.tests = {
+21 -21
View File
@@ -44,21 +44,21 @@ let
};
yconf = builder {
name = "yconf";
version = "1.0.20";
version = "1.0.21";
src = fetchHex {
pkg = "yconf";
version = "1.0.20";
sha256 = "sha256-8rPXMHVvwuSv0cCwq277mfDkSJUtJdwV7XWsFjW/iII=";
version = "1.0.21";
sha256 = "sha256-xSSl8f2Gh12FtGnMLjaMIE+XzKHDkYc24h9QAcAdCWw=";
};
beamDeps = [ fast_yaml ];
};
xmpp = builder {
name = "xmpp";
version = "1.11.0";
version = "1.11.1";
src = fetchHex {
pkg = "xmpp";
version = "1.11.0";
sha256 = "sha256-NKGR1qO3To8KQjRvhZ4sq1s6Kuflwo85Lly1ZhLnzoU=";
version = "1.11.1";
sha256 = "sha256-pckz35BKs87BVCXaM05BDOhOw657ge/gaeXbNop7NxY=";
};
beamDeps = [
ezlib
@@ -71,11 +71,11 @@ let
};
stun = builder {
name = "stun";
version = "1.2.20";
version = "1.2.21";
src = fetchHex {
pkg = "stun";
version = "1.2.20";
sha256 = "sha256-eeSfgmpPfVIsk5q2M9k1x519ayKeTLfgX2LzO1AXdBQ=";
version = "1.2.21";
sha256 = "sha256-PX/o77nQWyQKaqmmv4uLe/8tgCiV0XBEPFiJh9weEtk=";
};
beamDeps = [
fast_tls
@@ -124,11 +124,11 @@ let
};
p1_pgsql = builder {
name = "p1_pgsql";
version = "1.1.34";
version = "1.1.35";
src = fetchHex {
pkg = "p1_pgsql";
version = "1.1.34";
sha256 = "sha256-yw4y4IbJw10OPpZuOGPYMnN8e00rXxRzFqRlwLJD6n8=";
version = "1.1.35";
sha256 = "sha256-6ZWURGxBHGYGlnlbBiM29cS9gARR2PYgu01M4wTiVcI=";
};
beamDeps = [ xmpp ];
};
@@ -154,11 +154,11 @@ let
};
p1_acme = builder {
name = "p1_acme";
version = "1.0.27";
version = "1.0.28";
src = fetchHex {
pkg = "p1_acme";
version = "1.0.27";
sha256 = "sha256-qmS2qIVrGiKaEovqJ2Md4uGiIZg146gz+hETcUOo13M=";
version = "1.0.28";
sha256 = "sha256-zmhpht4/nV/Sha/odSPLRTKaNJxsa+eswe2RZyXUZCM=";
};
beamDeps = [
base64url
@@ -230,11 +230,11 @@ let
};
fast_tls = builder {
name = "fast_tls";
version = "1.1.24";
version = "1.1.25";
src = fetchHex {
pkg = "fast_tls";
version = "1.1.24";
sha256 = "sha256-//iK2jn60QRkVnoWBkP0Up70rtSdFWkZ9dH0FbbNu7Y=";
version = "1.1.25";
sha256 = "sha256-WeGDtXQOZw4CuKpr5nO153eeX+W/zGef4tSZPRlJqCE=";
};
beamDeps = [ p1_utils ];
};
@@ -250,11 +250,11 @@ let
};
esip = builder {
name = "esip";
version = "1.0.58";
version = "1.0.59";
src = fetchHex {
pkg = "esip";
version = "1.0.58";
sha256 = "sha256-4PQgSl7eD6fQDaPMQvZECqNiusf69Tb3HqKfo/D6fHU=";
version = "1.0.59";
sha256 = "sha256-C98uPDSdwLFE8XMVAynmdcalGsRz16Cy42IkX6rT++Y=";
};
beamDeps = [
fast_tls
+122 -122
View File
@@ -661,102 +661,102 @@
"jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=",
"pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc="
},
"io/netty#netty-buffer/4.2.3.Final": {
"jar": "sha256-qE+AnL+14CCqdFEXJ/TrOM8TxiN3nTptXhvs3Bc0c70=",
"pom": "sha256-iRZkcKHco4p768EiNBVjqG1ljK+9hZUUgoyi9nWRfnI="
"io/netty#netty-buffer/4.2.4.Final": {
"jar": "sha256-ng3ULx6rxYQzli76MprNNy3zBcMKaljNF/6xzTL54ok=",
"pom": "sha256-YayQwoVv20mqh1+iPbM7XwOc3AfU8pO00Y5Wsts7EAo="
},
"io/netty#netty-codec-base/4.2.3.Final": {
"jar": "sha256-KM75Eub2Km9ZJuOVdb2xiQd5qxkoQXRHh6Ok2Z9L5vQ=",
"pom": "sha256-fFqqtOVkCtacmEBqkLvVgikjOU8Q0u8CcnGzxLtM1PY="
"io/netty#netty-codec-base/4.2.4.Final": {
"jar": "sha256-CvLBN6ijsmS68ViHRw2Faom/cSAloIZSwwOL//v+ZjQ=",
"pom": "sha256-+Rs+uU5/48eizc1rXkVTRUAgvu4hoxc03WZGOXLTXhc="
},
"io/netty#netty-codec-compression/4.2.3.Final": {
"jar": "sha256-anuL5vYq7OEmWDdlgHqZGnYCZtoesrsYl6q24tcm35I=",
"pom": "sha256-30Yl9QQDBiADH3Xt7NMY8QcNicuRGJU/NYUEwYXj638="
"io/netty#netty-codec-compression/4.2.4.Final": {
"jar": "sha256-Y5ccgGYysIOJxtCzydhT3+8EdhjNTPVV8jqZLhVc4Jw=",
"pom": "sha256-RwN70nKjw72l1x7pE/A9C/JVreg2g9V1+2gBRY8KRlw="
},
"io/netty#netty-codec-haproxy/4.2.3.Final": {
"jar": "sha256-p73EbZ4Ku+0OcIuupOsII7Hm8VRIOURcn4DfJGHUgqw=",
"pom": "sha256-MST4IVR0lmfsoNS9ppg8Ic7hOZE6dFDkH/3fwwPEA4k="
"io/netty#netty-codec-haproxy/4.2.4.Final": {
"jar": "sha256-9FJsPWgZqI8NYXSpA4HiZDHjcICnXbeVvAx4RJIuMQ0=",
"pom": "sha256-wQvuTJBVMBBN7utiD8+SOK+Z9rcpWhZzeaqjBHOsnDI="
},
"io/netty#netty-codec-http/4.2.3.Final": {
"jar": "sha256-BeLOUhSA74RtRKvsG7riB/dnRzWb/n/Ka1lxiLd9Smg=",
"pom": "sha256-Zx9BTXgvTfnYoYZah3jFBJx8PodUaNyH11LRb5mqCkQ="
"io/netty#netty-codec-http/4.2.4.Final": {
"jar": "sha256-veaJ3fKU9w8QXQlVz8bXhNHl7k6ncwpzOx/EcoRW2VA=",
"pom": "sha256-xmEFuF/3Bd4cLon3uORV5Ot7CWiSTxWFTe4ZFWL40wA="
},
"io/netty#netty-codec-marshalling/4.2.3.Final": {
"jar": "sha256-vpkn+uQVSP9WEXNCLElK2lXJmDlmrVTyDBgfGqmbRL0=",
"pom": "sha256-H0wOGS22gfyWwIdj+lVuWFT6bjvG20CZCyfANX5T15s="
"io/netty#netty-codec-marshalling/4.2.4.Final": {
"jar": "sha256-KjqLHmMShP0rU4wRyb00bJP/FtwccLurVY3I8k8aQEQ=",
"pom": "sha256-j3MxT6zWuv0NsDaIVshuKPbKb12Q91l0CoAO0ylea2w="
},
"io/netty#netty-codec-protobuf/4.2.3.Final": {
"jar": "sha256-8jMnfOCEcgui7qf2ea02SxwKEPuSB9kztucSQGIQpdI=",
"pom": "sha256-qB7ueV2s3HgW82mR5+HJ+xpW8yMNgVPMuerztjp2Xtc="
"io/netty#netty-codec-protobuf/4.2.4.Final": {
"jar": "sha256-Ixj1IQF97o4OTlD9jV6KGx1HYty2nqmqUqe3n/jHYL8=",
"pom": "sha256-i9PbMlMNXvZ5v/AFthdbO/wLJMmUEQ4s1LVDq9U+m2I="
},
"io/netty#netty-codec/4.2.3.Final": {
"jar": "sha256-e9+J8CDdkQpnOSuXVNcWVrCMXQsxVdDipCJ94CnHLpM=",
"pom": "sha256-4L/Y1glKSVu9VaNOtZXmy7+7Lio0KKTp6x98v1rVShk="
"io/netty#netty-codec/4.2.4.Final": {
"jar": "sha256-htpiccbS7wbPXkKgO7xnpfB0+XeEZPUS8chMM/v8iak=",
"pom": "sha256-BGQ/YG9suwhDDkNAtE0hmEPQxjzcd1bY7kqZIRvIl+8="
},
"io/netty#netty-common/4.2.3.Final": {
"jar": "sha256-2gLPoSX6PdxS4sdw6Lm/6Jhh7N5MTe01AYlWkv9JstQ=",
"pom": "sha256-BqQtEX7CXFeRnmRWcB5kkzvBZNnIOIoQ/2UwoGBSuio="
"io/netty#netty-common/4.2.4.Final": {
"jar": "sha256-3VdEhGNmIVTDLgz6CZlgoW7aXwiWBQ5EGVsPwphjg38=",
"pom": "sha256-RXP+DQg7pRLmGQxP8OFeVp0LUT2E6Xw+1kgP/p2Z/iw="
},
"io/netty#netty-handler/4.2.3.Final": {
"jar": "sha256-6pwQ9MOF8mAlZYD4fG9U8cE9Bb/Teey0DI8KzEw5DLI=",
"pom": "sha256-6bXP9gOCM5xv7NPH0MzdD7F1P2sboWJgmr+i+dTxjRk="
"io/netty#netty-handler/4.2.4.Final": {
"jar": "sha256-UoC37ITUlAUbqZY5yGeTsE2STqfr2trBUo5m9P6Dksg=",
"pom": "sha256-yPVvwMYP9vqmTX29FwnDWm6B8/L24FaZyPMkH20KhVc="
},
"io/netty#netty-parent/4.2.3.Final": {
"pom": "sha256-Hv4svswTjgmw8494nkIptnV/kc4tByzejztmwlqpcB0="
"io/netty#netty-parent/4.2.4.Final": {
"pom": "sha256-Ri3r3EQgCvZiVkSS/wWtRVxe6HEdB1h+IGh+tmd+MG4="
},
"io/netty#netty-resolver/4.2.3.Final": {
"jar": "sha256-GXUh4KkIlx+lfYRA4wGpw5VRjechozsN+uBTybYWxkI=",
"pom": "sha256-BFpHO5FIrc+x2WVX1K4SU0K3X7LKVjKJD6PCOPnYgcc="
"io/netty#netty-resolver/4.2.4.Final": {
"jar": "sha256-FStlMcD5CStqXEDJq3Cc+sJ15DO0wIBQF0B5DTmGOgw=",
"pom": "sha256-1jPP6gJtU2X+yBbtBTbr9CyMcuSNfqPBYs/b/aoZc68="
},
"io/netty#netty-transport-classes-epoll/4.2.3.Final": {
"jar": "sha256-j5oICgTnoaiZO1lC3hxydm8663PgO/Tf8iMDAaZkjWA=",
"pom": "sha256-BIJRpHBiMLlGgvlj0PIqcBfckN3QSABeKQQEQGpK3rU="
"io/netty#netty-transport-classes-epoll/4.2.4.Final": {
"jar": "sha256-wRqsFVM/ls3uQ+WL9eexCdJzMupygRH1/WLwNzYVMSg=",
"pom": "sha256-53E1vT0TCN5/AXaGD5yWu5sCYeUzFN0xqnb+8zs0LFE="
},
"io/netty#netty-transport-classes-io_uring/4.2.3.Final": {
"jar": "sha256-GmDWN2JgVWu7eIo7T0KVvTiG3yZy3ciwRNdCdu2xObo=",
"pom": "sha256-vlpW4b6EXBoz5WckCdHhx+hsxgckvys2Am0/hN2gEFA="
"io/netty#netty-transport-classes-io_uring/4.2.4.Final": {
"jar": "sha256-BheCAqyclFrUBFqDEAsGsMkXfmzIHtNr9UCEMz4L7l0=",
"pom": "sha256-Dh9r8LfmTCgz4gLrcsk4zA+nUpDYdGBqYdxVmyf8G9k="
},
"io/netty#netty-transport-classes-kqueue/4.2.3.Final": {
"jar": "sha256-g6eRvF01c8e/966kF/X2D+hSpJDrnXGv82m+M8RI8bw=",
"pom": "sha256-HoIDHN+VP4HilqVwKyOzwLcnV4rgscml1SpQxt1t1IM="
"io/netty#netty-transport-classes-kqueue/4.2.4.Final": {
"jar": "sha256-+proWJoZUiMF0MBMaolR/IAZ0c/9tE+F4Eu4xkqVVLg=",
"pom": "sha256-tDNOT3hUZ24tR9jFwh08/i9ljFLePpJTy3pbbxG2u4k="
},
"io/netty#netty-transport-native-epoll/4.2.3.Final": {
"jar": "sha256-l3aX9ZNb3xxTXAzUMPiu5Xqvf7PWvO6C9RZuqrMdKy4=",
"pom": "sha256-Kuh5vHL7CtnZZobT/KgQ4MiITHSOTUxyGBcVm8rKrao="
"io/netty#netty-transport-native-epoll/4.2.4.Final": {
"jar": "sha256-FKIGZ7wNJcSvmgb45xLf45Kqs/6gLO3NczPinhrvDqU=",
"pom": "sha256-fX9QgM6meAVW0RnmQVphprCSznIrHiXS37MEB7SdsIM="
},
"io/netty#netty-transport-native-epoll/4.2.3.Final/linux-aarch_64": {
"jar": "sha256-JOdtx0MJWtxpZ/1RqvhxiMQ4rrmlBECRk9bxeaOVD6Q="
"io/netty#netty-transport-native-epoll/4.2.4.Final/linux-aarch_64": {
"jar": "sha256-zn4qRb6UJ19z8r/KOouchPvz3u7bL70XQvB5EvhoVTk="
},
"io/netty#netty-transport-native-epoll/4.2.3.Final/linux-x86_64": {
"jar": "sha256-43lQ7X/WHEcw5IO1cU0xaoC6c2XawEUIsO4UcugRv/Y="
"io/netty#netty-transport-native-epoll/4.2.4.Final/linux-x86_64": {
"jar": "sha256-ZzzEBzWkDbGFsYQ3zoxzSQcMxhq45y7BxPmgD8Y9wzA="
},
"io/netty#netty-transport-native-io_uring/4.2.3.Final": {
"jar": "sha256-Eua64ls90kVTr38BwwtZbpCzrRCDDAv3Xh57FAZkFmE=",
"pom": "sha256-Ll/iBk6SUi+9M8f2a5W0pvYA9a1BZ+EquiC7NoEnQ/Y="
"io/netty#netty-transport-native-io_uring/4.2.4.Final": {
"jar": "sha256-0MAryHaf9Bjxg19rSbTup/14fFsQvYqPB/xjcPFayZY=",
"pom": "sha256-CSpxzbsHg6QCpnn1DuZ+yc0w4UumZCWk8Ly1XiFC5GU="
},
"io/netty#netty-transport-native-io_uring/4.2.3.Final/linux-aarch_64": {
"jar": "sha256-SkYKRO+yPVw8c+ljDIFagr78U8PY2jsyXG4JfguQroo="
"io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-aarch_64": {
"jar": "sha256-eUuBBohdL6LSaZCutzLc4MG0MY88nw1nHa385g47nT4="
},
"io/netty#netty-transport-native-io_uring/4.2.3.Final/linux-x86_64": {
"jar": "sha256-KYHFM7OrlmxODOWuxS3J9cG8PQ491PhWqDPC163RJoM="
"io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-x86_64": {
"jar": "sha256-4fbWenPelBRbWocO+xVweUvBnSmsBI/pcbnLuqdtR0c="
},
"io/netty#netty-transport-native-kqueue/4.2.3.Final": {
"jar": "sha256-UmQvRVD7pR42pQtnL0UC/2esnT70FMd2lwQJ52dPZ4U=",
"pom": "sha256-SZmx6MKCEM2c6XpU33cjkwvoILy/QqwP+OYlcU/Npmg="
"io/netty#netty-transport-native-kqueue/4.2.4.Final": {
"jar": "sha256-RKqm6ZpJLlTNR6RB7QZGhWP46Z6JOGIpEpqJRtlIOJI=",
"pom": "sha256-snXJGraVPRi+ZaOk1a9JyD0wOupJfTxkrygGnd8HsYk="
},
"io/netty#netty-transport-native-kqueue/4.2.3.Final/osx-aarch_64": {
"jar": "sha256-LZAQjwE6R4gvuz8FRIeNMANyvRKWu8cIbK4RlMZTGAg="
"io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-aarch_64": {
"jar": "sha256-dTWoJPWe3dACXmTVLzzwaT5n5Iuep5f0xUI8cEgl1+g="
},
"io/netty#netty-transport-native-kqueue/4.2.3.Final/osx-x86_64": {
"jar": "sha256-BFMxwe9+GXD9JvSyRn7VZOFeE6OgTjTrU+LxZRijT3M="
"io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-x86_64": {
"jar": "sha256-CRp9eTJ8DcuA2iogxG8KS5b4I5tfuqcicDEyda8DUrI="
},
"io/netty#netty-transport-native-unix-common/4.2.3.Final": {
"jar": "sha256-11JDOI6+i6P1YYMnm3JXIaA6xOeTIJ2s5v4VFLhdZ5s=",
"pom": "sha256-u3asm4lXSX4306D+gy7j9A8ffZj7Wkp1bstKAw4jjHs="
"io/netty#netty-transport-native-unix-common/4.2.4.Final": {
"jar": "sha256-0uT1oUevhUb1JQ8fp9G8CLDyjhXw8xlcfyTrsYYqQ8E=",
"pom": "sha256-Oel7uwR+M9yMUXn9M1q4hDKfIeJUAEg3QuYZiBT2sVg="
},
"io/netty#netty-transport/4.2.3.Final": {
"jar": "sha256-0/wgHcn+iHFRkT0wDncNqgkA8TIiIQVleofCyWyG5QU=",
"pom": "sha256-v3iNbongKeLxVIvnlMJSngras0pYbvag/4Ans1JoPrw="
"io/netty#netty-transport/4.2.4.Final": {
"jar": "sha256-x4c4WLzyXVkhH5nT3TWlLWRO/FEWzQoAzUQCs9I8Y3I=",
"pom": "sha256-tq1ktxu0hdLgxgtaS5HQnb/UEymeZ5nn11kpRgmpfpY="
},
"it/unimi/dsi#fastutil/8.5.15": {
"jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
@@ -787,24 +787,24 @@
"jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
"pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
},
"net/kyori#adventure-api/4.23.0": {
"jar": "sha256-Ubn89img4yWTTyoyHpdL1tqCMzMmb/CZtK2GJC7cXvQ=",
"module": "sha256-ssVpI4V4Sh8OZm+ETRp3aMFkoIqFDC+SjNxBW/lSLJ0=",
"pom": "sha256-rXHK/j8ZankUdWLS1zFs2Xy4IEzWT1u7tDbaxsd69sk="
"net/kyori#adventure-api/4.24.0": {
"jar": "sha256-2MHWbbD7rwhOgXmz8lQdn/ZEAqeIEHCnHos8JsJtOE4=",
"module": "sha256-c06XRjLjZiH+7Ze3ThrLSXl+pzw3EUR8p+LGBLmLEFU=",
"pom": "sha256-eG4PXAYZB2RwjAVpqFTsfjHG/gcZO0Rfg4l1Uorbt30="
},
"net/kyori#adventure-bom/4.23.0": {
"module": "sha256-c9ge6qJeY3eAOKKVCMQKFLwJ6bZWEjaIoUJHc5HDOeo=",
"pom": "sha256-FGu/m1sl8kwUwlpmW76XgKXsCUmgPGttk7c/PfaQ9fM="
"net/kyori#adventure-bom/4.24.0": {
"module": "sha256-ElMB4ouFj88PjnGC2uoUXQqOHXy/zPTEOXsjHUpQYkw=",
"pom": "sha256-1+utxlvrCvSg9UpTNWc7z/YwqRH1QKD0TH/38CxPOIU="
},
"net/kyori#adventure-key/4.23.0": {
"jar": "sha256-gDd4WEpb+PpfF7q5s7YkUO4TEP2SjyAPFoOSmkMMJmQ=",
"module": "sha256-o4U17pVdUtrTEco9rneVLJRybh55ytyr98WMYusqn0U=",
"pom": "sha256-iaYmnO5F3YJsKqD5mSQebjvq79mtSfkyxSZNvNcxewk="
"net/kyori#adventure-key/4.24.0": {
"jar": "sha256-1PIfQoHonas0WpAEVnZoeUgZ+cxIPq/4v9ZMV0lKkVA=",
"module": "sha256-0gI7+Of0qK+PCK5DpIPMOk8261sVrG8l0Nh0HZa6EvA=",
"pom": "sha256-SIhAxvEcX0+ObfLgYWcusVi4dJNUGz5hipSKoRXZ0TE="
},
"net/kyori#adventure-nbt/4.23.0": {
"jar": "sha256-2HqbMvVCeqeGOjG7+8q6t36WIExdKKYvf4DWalJtcEY=",
"module": "sha256-cdaqmcJYMWM5RELtBF4FrGyY3KvHEtMi5KBpBbdKOTY=",
"pom": "sha256-lKa0XCvcLlfTGwOL2sLeaV8qRp4TlpDLskiFuG4vOM4="
"net/kyori#adventure-nbt/4.24.0": {
"jar": "sha256-j//4nbx/DB5MzfMzf5ASDpoPz/NsxGl9Hndp/0vVaFM=",
"module": "sha256-MP2lzkSXyclV00dsiIVysTvXKWsz3NDqy1V/mUvutvI=",
"pom": "sha256-nzBN7cX6Asa2avbR+8MpCYop3DlTLMHMQlp8dnezHXA="
},
"net/kyori#adventure-platform-api/4.3.4": {
"jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@@ -816,50 +816,50 @@
"module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
"pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
},
"net/kyori#adventure-text-logger-slf4j/4.23.0": {
"jar": "sha256-e41RpiLFfZgt64llKz4tbukSj2V82lSRKtkmaL2r42Q=",
"module": "sha256-/xZGn2LzFSLEpmN50bXR0/vJfGKBNd1fpVG3Nkck8Eo=",
"pom": "sha256-zSk39q2IjiVO5SB9RWW2jmd2XErDNHAezauWoWQjC2s="
"net/kyori#adventure-text-logger-slf4j/4.24.0": {
"jar": "sha256-IuMKbpKnDgpELrZMkGUkp3bzwwPiheGDzyt8Q1+QqBw=",
"module": "sha256-wqz29Ezc3OpasWJUoi5oR8ctmKUQW1ivXfWDh59oKws=",
"pom": "sha256-d0TIFm0AFD3jVhhoFrSERT0vxrS8uaDZQ0HyqIOknMw="
},
"net/kyori#adventure-text-minimessage/4.23.0": {
"jar": "sha256-Vu0nZroiOLQBuuqWDTquRftY/aFhTalo/iuR/bnDgTw=",
"module": "sha256-H19hklBkEB3mY1LP0Qq43fWu/2RyVZt7KL1wERxaf2c=",
"pom": "sha256-fxTmmBxHbcYjPE5oGCZWIP4vV0uxfdj3UzKd8J8Cd2Q="
"net/kyori#adventure-text-minimessage/4.24.0": {
"jar": "sha256-en9E3Dt4N5uRj5Hc44v/JqCWO/4wOj/hbJHTClxeI+U=",
"module": "sha256-avCNo6rbj+hz4Q+qUVc1ybN6LWWCbLGJhzWm4ZeJPXY=",
"pom": "sha256-4BPr7EgImiEaIx5RluvxFNWw5lOBK94GO2RPX89ETqQ="
},
"net/kyori#adventure-text-serializer-ansi/4.23.0": {
"jar": "sha256-rF6iq0xE0wLnlkag9NRfSsmESi6sBpDoCnPc/SOy5Vw=",
"module": "sha256-/65qUt91zjFf3gi4HVKZ9JfEyfxcbGw3cCcfOMR2NQA=",
"pom": "sha256-9zq7B/otQpS9CaSm9Gpbu/WzbcUNpx/zPOPFuBlesKU="
"net/kyori#adventure-text-serializer-ansi/4.24.0": {
"jar": "sha256-UVBc8RPZd0RNePNKC3FnwcbMl2A1TwbQi0W/evdr7B4=",
"module": "sha256-Qc860iafJsWIDQPY5ifYusvAWo5AW2TOOLgieLrrCEQ=",
"pom": "sha256-wUCpODx3U1wRy1kDQGLNQyW4/BSpIVQNymJnO2BQEB0="
},
"net/kyori#adventure-text-serializer-commons/4.23.0": {
"jar": "sha256-7ol3hRw6RFAN4rCOuqvVOX7Anzs2foblMInROHty+p0=",
"module": "sha256-YjLHYBQobnByp5HHWVWahxFizy18z81tDqGE3juXwgY=",
"pom": "sha256-ZyydJyIj/+Q6qskmSMNidr3yFBPKIG1Z0dOfAAjGEg0="
"net/kyori#adventure-text-serializer-commons/4.24.0": {
"jar": "sha256-EBAgLHMSTT4Hid/auyd4pfuM+thybXCvm+tcV1nUzP0=",
"module": "sha256-ZluaH9IrMPGnKJGFuOk8zs7ZrWjdU1V5ObQHXdMJxx0=",
"pom": "sha256-ktKTr+2UmcMulX470ff9xFHVt59JBDDSJ1dL46VmEVo="
},
"net/kyori#adventure-text-serializer-gson/4.23.0": {
"jar": "sha256-PiaD2i0UAwMjzJZFu6TNhtfLq/zkK9Fi7C2lDF59Yig=",
"module": "sha256-bX0ip7YdYnZqtPATdojSzM3ensdkP6OTzOlswwyX9vw=",
"pom": "sha256-bD3I0ry/SXG30bxzV8i+Xg5w4EqKhEt8RPQdada4XWo="
"net/kyori#adventure-text-serializer-gson/4.24.0": {
"jar": "sha256-JBTDzl/+G34x3oaWjr0+nypQ41STmydliO0s1kxDGCE=",
"module": "sha256-LIxWNeQnjlirNfFCQD61u1+sBXiDYpB8VTpa9p8DNN0=",
"pom": "sha256-TUCD1oj9+/RoW6QHPZouJPlqCdImOd+mMTQ34V2Rejk="
},
"net/kyori#adventure-text-serializer-json-legacy-impl/4.23.0": {
"jar": "sha256-ovBQ7uMdiedww3bnPZoxt/b8QaORU0QTyUvksIF4vuQ=",
"module": "sha256-5Zqpg2TubngVdr3o0r6KLAd9quhvOqXKmUjAbW8s+XM=",
"pom": "sha256-iPCayPZoGa4ib7nDqSt2ZzrG4m9VMH+adhOVhraDO40="
"net/kyori#adventure-text-serializer-json-legacy-impl/4.24.0": {
"jar": "sha256-HeO71Wx6B++HNNXQiYKNZUIDofwZiz78odK7asDDdsQ=",
"module": "sha256-5KAg8wQ2jA3hvhcEZv/DBdSfW0j9OdGbGcMQgiBHQpE=",
"pom": "sha256-TP64sxOpOubU71EEYqI/z+LO4idiPhJ/iDXHHC1wAB4="
},
"net/kyori#adventure-text-serializer-json/4.23.0": {
"jar": "sha256-/CvHvwb8Cv5wbWJ493GDcqRoTSGhblLk1iJldxUomE8=",
"module": "sha256-KNC8Tk4rwY5zi1eBI+hXFug0GOlabO+KMeCPiVvw1MQ=",
"pom": "sha256-9b8uVtQSdYvaYyQEpwh2LILTQDI8zz1AEkHGdz1oeqw="
"net/kyori#adventure-text-serializer-json/4.24.0": {
"jar": "sha256-/2qANEy/FNanUZR8r525Zp3QdArqyMxVXJuGSP9XcbI=",
"module": "sha256-aqvU2ZfRWJl/Uf2Phue7b1+iKNcB+gkRAITn9d9OZ7k=",
"pom": "sha256-SxTq6y0vN6TfeA/1YgxLM2arJeexk7qYvkgLxz1XgxQ="
},
"net/kyori#adventure-text-serializer-legacy/4.23.0": {
"jar": "sha256-1SgOt1vypertB5eXGmzJAtxrjLtv6sJwEcyGJGEIIJ0=",
"module": "sha256-ci7v3AmzXyiOb6kKZ/CviLiS+ySDGUNqbg0QAxo4ADU=",
"pom": "sha256-9jjCmc72C3tNLOpg7vXYMntHW5d2HxxNq5VOHUWXUik="
"net/kyori#adventure-text-serializer-legacy/4.24.0": {
"jar": "sha256-QO1Tr+Kn1mi4FK3WneFaz0vajp+VHE5dTiJNd3BUaF4=",
"module": "sha256-uwBv4g+J/qOEZM/dz/SCvDXAGhI5wt8DEP6NBgHNGU4=",
"pom": "sha256-WLFnVzl0ZXM+9deg6toSxPG1e+28BZqGv9+JgECwxjc="
},
"net/kyori#adventure-text-serializer-plain/4.23.0": {
"jar": "sha256-wuHYBMob54Q09K1r29U8yXoROtkpXLTJNs87nZAsWR4=",
"module": "sha256-OwEWAKJgf8zpq1+u7fWcvNQkgUmlMlXXfHZJJmO+IxM=",
"pom": "sha256-qVKWXEA9cuZKvM5m+BgxxE7dgimWU/sqlhbwzWfgAQI="
"net/kyori#adventure-text-serializer-plain/4.24.0": {
"jar": "sha256-flKpjlkNCI/we+H4sOdZhkcXRm/TXbGGL7tuu0GyRds=",
"module": "sha256-3ir7UDVDHLvHI6WgSBYGB99yHeiHLTgeG7mICCRocfg=",
"pom": "sha256-/pRYAmrIQoPR20OQFZd8wI2yGZ4j/zJqtyBFsgCjcrU="
},
"net/kyori#ansi/1.1.1": {
"jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
+3 -3
View File
@@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "velocity";
version = "3.4.0-unstable-2025-08-13";
version = "3.4.0-unstable-2025-08-14";
src = fetchFromGitHub {
owner = "PaperMC";
repo = "Velocity";
rev = "5d450ab3c74ae7ccca13abe2cde20b8473fe64e4";
hash = "sha256-snRSNXjhm297GcyO1dhd8wDXYB0M+k2BPF8g4w0XC6s=";
rev = "d2d333a958af801a7b09465aa7402b0f7857aeb2";
hash = "sha256-jdYcUZxdn8Q4A884jA5olrodJvzfIUCl8MwDsps4Pg4=";
};
nativeBuildInputs = [
@@ -247,8 +247,7 @@ let
ln -s $bin/bin $out/bin
ln -s $bin/share/bash-completion $out/share/bash-completion
ln -s $bin/share/zsh $out/share/zsh
# fish completion was introduced in 1.6.0
test -f etc/completion.fish && ln -s $bin/share/fish $out/share/fish
ln -s $bin/share/fish $out/share/fish
ln -s $lib $out/lib
runHook postInstall
@@ -31,11 +31,11 @@ lib.makeScope pkgs.newScope (
graalvm-oracle_24 = (self.callPackage ./graalvm-oracle { version = "24"; }).overrideAttrs (prev: {
autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];
});
graalvm-oracle_23 = self.callPackage ./graalvm-oracle { version = "23"; };
graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };
graalvm-oracle = self.graalvm-oracle_24;
}
// lib.optionalAttrs config.allowAliases {
graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";
graalvm-oracle_23 = throw "GraalVM 23 is EOL, use a newer version instead";
}
)
@@ -40,24 +40,6 @@
url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-aarch64_bin.tar.gz";
};
};
"23" = {
"aarch64-linux" = {
hash = "sha256-VlB664/l7NWFQrPE3vEJvCXkEzKEJ0ck/HNU5pGGTwU=";
url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-aarch64_bin.tar.gz";
};
"x86_64-linux" = {
hash = "sha256-2wmx/hi4PzOK+bMpFEN3SzFw2euhdTjOLuOcXm1gHfw=";
url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_linux-x64_bin.tar.gz";
};
"x86_64-darwin" = {
hash = "sha256-tFmfv9OUMEqE6UNb98ZzBp1P4MVl0tRNcPD29YBM6jU=";
url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-x64_bin.tar.gz";
};
"aarch64-darwin" = {
hash = "sha256-DmRLktA9Ob30hC43i4sicT+qpO2ujv/w2pkp0eBN0Ms=";
url = "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_macos-aarch64_bin.tar.gz";
};
};
"17" = {
"aarch64-linux" = {
hash = "sha256-vZkdSGuS3rdDN7iB4PE6dkycHpD8NYgZCA9zIfpRdeg=";