Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-03-17 08:03:43 +00:00
committed by GitHub
4 changed files with 40 additions and 13 deletions
+32 -5
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
fetchYarnDeps,
nodejs,
electron_38,
electron_41,
yarnConfigHook,
copyDesktopItems,
vips,
@@ -13,14 +13,20 @@
autoPatchelfHook,
makeDesktopItem,
imagemagick,
wasm-pack,
rustPlatform,
cargo,
rustc,
wasm-bindgen-cli_0_2_108,
binaryen,
}:
let
electron = electron_38;
electron = electron_41;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ente-desktop";
version = "1.7.15";
version = "1.7.21";
src = fetchFromGitHub {
owner = "ente-io";
@@ -29,13 +35,25 @@ stdenv.mkDerivation (finalAttrs: {
sparseCheckout = [
"desktop"
"web"
"rust"
];
tag = "photosd-v${finalAttrs.version}";
hash = "sha256-QnJp+oHkRsb/uMobA33Hgo2VOzfDFDtJ6vchCAzyb+c=";
hash = "sha256-nkI2wfjpQPWPmu+IKbNMQuqby2odRG3Dbyzd7cSxmYY=";
};
sourceRoot = "${finalAttrs.src.name}/desktop";
cargoRoot = "../web/packages/wasm";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
sourceRoot
cargoRoot
;
hash = "sha256-ftb0h5MOHyQ2iec6iE7/WdHXgrviLCy8oIqFXv5OTq8=";
};
offlineCache = fetchYarnDeps {
name = "ente-desktop-${finalAttrs.version}-offline-cache";
inherit (finalAttrs) src sourceRoot;
@@ -45,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/web";
hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
hash = "sha256-NhpSwesQ9B5gEeBQVjEEAKO4A68wfmBoQ3ga/baieNE=";
};
nativeBuildInputs = [
@@ -55,6 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
autoPatchelfHook # for onnxruntime
copyDesktopItems
imagemagick
wasm-pack
rustPlatform.cargoSetupHook
cargo
rustc
rustc.llvmPackages.lld
wasm-bindgen-cli_0_2_108
binaryen
];
buildInputs = [
@@ -72,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
pushd ../web
offlineCache=$webOfflineCache yarnConfigHook
rm -rf node_modules/wasm-pack node_modules/.bin/wasm-pack
popd
cp -r ${electron.dist} ./electron_dist
+4 -4
View File
@@ -50,7 +50,7 @@
}:
let
nix = nixVersions.nix_2_33;
nix = nixVersions.nix_2_34;
perlDeps = buildEnv {
name = "hydra-perl-deps";
@@ -132,14 +132,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2026-01-23";
version = "0-unstable-2026-03-13";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "8bc95a96f787eb36f29ceec773f5bf48bd121097";
hash = "sha256-Ro+qOHWmWuKJiUwX8bmNuGpb0cLUaPr0vsuZGAi2QCI=";
rev = "5decc46ce66335b225c1504a509fefa0f804436f";
hash = "sha256-wBVp3TDCBKyqyWbMlya+egjhSN7R067v20pUZINSF0g=";
};
outputs = [
+2 -2
View File
@@ -86,13 +86,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.2-16";
version = "7.1.2-17";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
tag = finalAttrs.version;
hash = "sha256-tuCJgns/ecbRbN0OwAZt3E65usA0ZyNLkIey4eQfzOg=";
hash = "sha256-niqHdNrFMwIr+9560vceRn0LyJPi6DIp6qCn5GlcVjY=";
};
outputs = [
+2 -2
View File
@@ -46,12 +46,12 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "rabbitmq-server";
version = "4.2.4";
version = "4.2.5";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
hash = "sha256-XIBsD1xmRF4me4byAtiDqInmQ4y5dxKSezc2tZuapLU=";
hash = "sha256-cI/imLX4pdZTl1HDKaE2WwOOaWpwC78KyqWHmxsFQj0=";
};
nativeBuildInputs = [