Skip to content

Commit 82311da

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge release-25.11 into staging-next-25.11
2 parents 5d57d37 + ade745d commit 82311da

29 files changed

Lines changed: 827 additions & 525 deletions

File tree

‎pkgs/applications/audio/reaper/default.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ let
3838
in
3939
stdenv.mkDerivation rec {
4040
pname = "reaper";
41-
version = "7.54";
41+
version = "7.55";
4242

4343
src = fetchurl {
4444
url = url_for_platform version stdenv.hostPlatform.qemuArch;
4545
hash =
4646
if stdenv.hostPlatform.isDarwin then
47-
"sha256-1C7FfFULm7ZYdKHU/x5BcoiISRoySvFDqRjJZ+OiqLc="
47+
"sha256-meTuaGH9zwx/sT+h0I7JRSCRPD8AryGPvoHUKbyzpHA="
4848
else
4949
{
50-
x86_64-linux = "sha256-DOhWauKjIv5cah+6yO/ZkHQ6X0qcyxxWD6B2xH/zm4c=";
51-
aarch64-linux = "sha256-TD6kHAzNBSDQxmT23VJwCUcfblp4DffOaKhKVPSAg6w=";
50+
x86_64-linux = "sha256-BOjS39GySB6ptiEJvwlShL4ZcDot2nsKXCAU/CeMEIc=";
51+
aarch64-linux = "sha256-oqEwEQKFhpaFMqzcSc28v0njuiMi5CAGjP3fLDECUXU=";
5252
}
5353
.${stdenv.hostPlatform.system};
5454
};

‎pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix‎

Lines changed: 397 additions & 397 deletions
Large diffs are not rendered by default.

‎pkgs/by-name/ba/bambu-studio/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ let
5656
in
5757
stdenv.mkDerivation (finalAttrs: {
5858
pname = "bambu-studio";
59-
version = "02.04.00.70";
59+
version = "02.05.00.67";
6060

6161
src = fetchFromGitHub {
6262
owner = "bambulab";
6363
repo = "BambuStudio";
6464
tag = "v${finalAttrs.version}";
65-
hash = "sha256-BrH8gKbc0y76wbWrQxU+0xMJcYAm4Gi/xmECVf6pGkI=";
65+
hash = "sha256-jLaSUs6OmoD0yw1hOcJarYKfr1rbhB2TwRiBBU0utEI=";
6666
};
6767

6868
nativeBuildInputs = [

‎pkgs/by-name/co/cosign/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
buildGoModule (finalAttrs: {
1515
pname = "cosign";
16-
version = "3.0.4";
16+
version = "3.0.5";
1717

1818
src = fetchFromGitHub {
1919
owner = "sigstore";
2020
repo = "cosign";
2121
rev = "v${finalAttrs.version}";
22-
hash = "sha256-Ddq9MJNRZ+ywJwxIUP4nhag8UZIH/hOYnF71P3+gI/0=";
22+
hash = "sha256-YYssI+fPw6drMZqAwRk3ubh0l/RgEN8b0eoEunihjlw=";
2323
};
2424

2525
buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
2929
installShellFiles
3030
];
3131

32-
vendorHash = "sha256-TuA3LwZFAKjZ4aoX92tYd7eziG5N1vDOTsEgwhg5n6w=";
32+
vendorHash = "sha256-xC+Wfj1OTLhQAuJlyOB6KPaUXuzOxC2oLCqI5O/6znI=";
3333

3434
subPackages = [
3535
"cmd/cosign"

‎pkgs/by-name/do/documenso/package.nix‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
pixman,
77
fetchFromGitHub,
88
buildNpmPackage,
9-
prisma,
10-
prisma-engines,
9+
prisma_6,
10+
prisma-engines_6,
1111
vips,
1212
pkg-config,
1313
cairo,
@@ -34,9 +34,9 @@ buildNpmPackage {
3434

3535
env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
3636

37-
env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
38-
env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines}/bin/query-engine";
39-
env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines}/bin/schema-engine";
37+
env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
38+
env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines_6}/bin/query-engine";
39+
env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines_6}/bin/schema-engine";
4040
env.TURBO_NO_UPDATE_NOTIFIER = "true";
4141
env.TURBO_FORCE = "true";
4242
env.TURBO_REMOTE_CACHE_ENABLED = "false";
@@ -81,11 +81,11 @@ buildNpmPackage {
8181
cat > $out/bin/${pname} <<EOF
8282
#!${bash}/bin/bash
8383
export PKG_CONFIG_PATH=${openssl.dev}/lib/pkgconfig;
84-
export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines}/lib/libquery_engine.node
85-
export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines}/bin/query-engine
86-
export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines}
84+
export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines_6}/lib/libquery_engine.node
85+
export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines_6}/bin/query-engine
86+
export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines_6}
8787
cd $out/apps/remix
88-
${prisma}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
88+
${prisma_6}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
8989
${nodejs}/bin/node build/server/main.js
9090
EOF
9191
chmod +x $out/bin/${pname}

‎pkgs/by-name/fl/floorp-bin-unwrapped/sources.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"version": "12.10.3",
2+
"version": "12.10.4",
33
"sources": {
44
"aarch64-linux": {
5-
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-aarch64.tar.xz",
6-
"sha256": "b2f62db7941f819375a9f8627bd55442c30310e93cb270621fdf9e5c707801e3"
5+
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-aarch64.tar.xz",
6+
"sha256": "6fb5030be0209744dd9aac0fa5645c45a21d135d4e487836a300359a695327e5"
77
},
88
"x86_64-linux": {
9-
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-x86_64.tar.xz",
10-
"sha256": "fb866cd00da594c5c6435238e32ac2c13eaca40ead4936656aee88ea3446983f"
9+
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-x86_64.tar.xz",
10+
"sha256": "1cc457b0b23d29d863749a9a4f000b47fa480aa0579774bb39eff5978160df21"
1111
},
1212
"aarch64-darwin": {
13-
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg",
14-
"sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae"
13+
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg",
14+
"sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398"
1515
},
1616
"x86_64-darwin": {
17-
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg",
18-
"sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae"
17+
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg",
18+
"sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398"
1919
}
2020
}
2121
}

‎pkgs/by-name/fo/forgejo-runner/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ let
4949
in
5050
buildGoModule rec {
5151
pname = "forgejo-runner";
52-
version = "12.6.4";
52+
version = "12.7.0";
5353

5454
src = fetchFromGitea {
5555
domain = "code.forgejo.org";
5656
owner = "forgejo";
5757
repo = "runner";
5858
rev = "v${version}";
59-
hash = "sha256-v+b1YGUoIwzSGYUq/aUc5DceKUqWm0LA1Fd1/X/rf5w=";
59+
hash = "sha256-pQYlacbctW+Cbm3abDps2ZpqX/iPhgAgJnBsaXcny6w=";
6060
};
6161

62-
vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU=";
62+
vendorHash = "sha256-nceLZzbSk56l3NLgusw6JKi1owniQVudNDgC7fsHxYQ=";
6363

6464
nativeBuildInputs = [ makeWrapper ];
6565

‎pkgs/by-name/g3/g3proxy/package.nix‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
2828
cargoBuildFlags = [
2929
"-p"
3030
"g3proxy"
31+
"-p"
32+
"g3proxy-ctl"
33+
"-p"
34+
"g3proxy-lua"
35+
"-p"
36+
"g3proxy-ftp"
37+
"-p"
38+
"g3mkcert"
39+
"-p"
40+
"g3fcgen"
41+
"-p"
42+
"g3iploc"
43+
"-p"
44+
"g3statsd"
3145
];
3246
cargoTestFlags = finalAttrs.cargoBuildFlags;
3347

‎pkgs/by-name/gh/ghostfolio/package.nix‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
nodejs,
66
faketty,
77
openssl,
8-
prisma,
9-
prisma-engines,
8+
prisma_6,
9+
prisma-engines_6,
1010
}:
1111

1212
buildNpmPackage rec {
@@ -30,7 +30,7 @@ buildNpmPackage rec {
3030
npmDepsHash = "sha256-EMLQUZaL6u5jsOgBa67bivUHItJo8JeGZLbIq6tJdgE=";
3131

3232
nativeBuildInputs = [
33-
prisma
33+
prisma_6
3434
faketty
3535
];
3636

@@ -67,11 +67,11 @@ buildNpmPackage rec {
6767
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} \
6868
${lib.concatStringsSep " " (
6969
lib.mapAttrsToList (name: value: "--set ${name} ${lib.escapeShellArg value}") {
70-
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines "schema-engine";
71-
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines "query-engine";
72-
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
73-
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines "introspection-engine";
74-
PRISMA_FMT_BINARY = lib.getExe' prisma-engines "prisma-fmt";
70+
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
71+
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
72+
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
73+
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_6 "introspection-engine";
74+
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
7575
}
7676
)}
7777

‎pkgs/by-name/li/linkwarden/package.nix‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
openssl,
1414
google-fonts,
1515
playwright-driver,
16-
prisma,
17-
prisma-engines,
16+
prisma_6,
17+
prisma-engines_6,
1818
}:
1919

2020
let
@@ -80,7 +80,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
8080
nativeBuildInputs = [
8181
makeBinaryWrapper
8282
nodejs
83-
prisma
83+
prisma_6
8484
yarn-berry
8585
yarn-berry.yarnBerryConfigHook
8686
];
@@ -104,9 +104,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
104104

105105
preBuild = ''
106106
export PRISMA_CLIENT_ENGINE_TYPE='binary'
107-
export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines}/lib/libquery_engine.node"
108-
export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines}/bin/query-engine"
109-
export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines}/bin/schema-engine"
107+
export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines_6}/lib/libquery_engine.node"
108+
export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines_6}/bin/query-engine"
109+
export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines_6}/bin/schema-engine"
110110
'';
111111

112112
buildPhase = ''
@@ -155,7 +155,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
155155
${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/worker
156156
else
157157
echo "Starting server"
158-
${lib.getExe prisma} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \
158+
${lib.getExe prisma_6} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \
159159
&& ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/web -- -H \$LINKWARDEN_HOST -p \$LINKWARDEN_PORT
160160
fi
161161
" > $out/bin/start.sh
@@ -170,9 +170,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
170170
]
171171
}" \
172172
--set-default PRISMA_CLIENT_ENGINE_TYPE 'binary' \
173-
--set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node" \
174-
--set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine" \
175-
--set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine" \
173+
--set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines_6}/lib/libquery_engine.node" \
174+
--set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines_6}/bin/query-engine" \
175+
--set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines_6}/bin/schema-engine" \
176176
--set-default PLAYWRIGHT_LAUNCH_OPTIONS_EXECUTABLE_PATH ${playwright-driver.browsers-chromium}/chromium-*/chrome-linux/chrome \
177177
--set-default LINKWARDEN_CACHE_DIR /var/cache/linkwarden \
178178
--set-default LINKWARDEN_HOST localhost \

0 commit comments

Comments
 (0)