diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a384ecafdb3c..63ef1e025c0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11976,6 +11976,12 @@ githubId = 16307070; name = "iosmanthus"; }; + ipetkov = { + name = "Ivan Petkov"; + github = "ipetkov"; + githubId = 1638690; + email = "nixpkgs@ipetkov.dev"; + }; ipsavitsky = { email = "ipsavitsky234@gmail.com"; github = "ipsavitsky"; diff --git a/nixos/modules/services/web-apps/immichframe.nix b/nixos/modules/services/web-apps/immichframe.nix index cbe7d57bab7b..fb3257f80594 100644 --- a/nixos/modules/services/web-apps/immichframe.nix +++ b/nixos/modules/services/web-apps/immichframe.nix @@ -134,6 +134,40 @@ in Type = "simple"; Restart = "on-failure"; RestartSec = 3; + + # systemd hardening, based on jellyfin (also .NET) but stricter + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = !config.boot.isContainer; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = !config.boot.isContainer; + ProtectKernelTunables = !config.boot.isContainer; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + # no AF_NETLINK here since there's no network connection monitoring + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = !config.boot.isContainer; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; }; }; }; diff --git a/nixos/tests/web-apps/immichframe.nix b/nixos/tests/web-apps/immichframe.nix index f2f590470163..dff57b5c27c2 100644 --- a/nixos/tests/web-apps/immichframe.nix +++ b/nixos/tests/web-apps/immichframe.nix @@ -1,10 +1,21 @@ +{ + lib, + ... +}: + let apiKeyFile = "/tmp/immich-api.key"; customInterval = 5; + user = "alice"; in { name = "immichframe"; + meta.maintainers = with lib.maintainers; [ + numinit + jfly + ]; + enableOCR = true; nodes.machine = @@ -15,11 +26,17 @@ in ... }: { - imports = [ ../common/x11.nix ]; + imports = [ + ../common/user-account.nix + ../common/x11.nix + ]; # When setting this to 2500 I got "Kernel panic - not syncing: Out of # memory: compulsory panic_on_oom is enabled". virtualisation.memorySize = 3000; + hardware.graphics.enable = true; + environment.variables.XAUTHORITY = "/home/${user}/.Xauthority"; + test-support.displayManager.auto.user = user; environment.systemPackages = with pkgs; [ imagemagick @@ -69,6 +86,7 @@ in custom_interval = ${toString customInterval} + machine.wait_for_x() machine.wait_for_unit("immich-server.service") machine.wait_for_open_port(2283) @@ -133,11 +151,7 @@ in assert len(assets) == 2, assets # Wait for a photo to be displayed. - machine.wait_for_x() - machine.execute("xterm -e 'firefox --kiosk http://localhost:8002' >&2 &") - machine.wait_for_window("immichFrame") - _, active_window = machine.execute("xdotool getactivewindow") - machine.succeed(f"xdotool windowsize {quote(active_window.strip())} 100% 100%") + machine.execute("su - ${user} -c 'firefox --kiosk http://localhost:8002' >&2 & disown") machine.wait_for_text('reproduce this moment') machine.wait_for_text('with NixOS tests') machine.screenshot("screen") diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index bcff103c86ed..7a7b0dbbbf61 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -19,12 +19,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2025-11-20"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "8ae221fcb07db667b3d04114c2b977175966611d"; - hash = "sha256-IseAfEz+nSzY2XD15HbJWeLmYFMvAYO33bPItXJCy58="; + rev = "5409e320cecef96a917cca1dfb68f1f183e499ca"; + hash = "sha256-kWKa2SUXVLxeSFerApyXhZBeRtHmJnHxklFSz6g4Ok8="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index e02365cf7ef9..2b71eee9f958 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "9.10.0"; + version = "9.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-U7iid8dm5sP7Xfsm+ikRn0oSm/j5qVS0I1qWPIowwwE="; + hash = "sha256-UNQuOzLsURb2sd8JlTf0vsrza/7ez59YG3Q/Edi2yzY="; }; patches = @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code-${debian-tag}.patch"; url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U="; + hash = "sha256-/xXkxFJNRnjH8RmXcotrPI6rZ+I1ENjikl1eLU0NEjQ="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/by-name/li/librime-octagram/package.nix b/pkgs/by-name/li/librime-octagram/package.nix index fe6d0f30da8e..4df378a3f315 100644 --- a/pkgs/by-name/li/librime-octagram/package.nix +++ b/pkgs/by-name/li/librime-octagram/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "librime-octagram"; - version = "0-unstable-2024-11-18"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "lotem"; repo = "librime-octagram"; - rev = "dfcc15115788c828d9dd7b4bff68067d3ce2ffb8"; - hash = "sha256-dgUsH10V87mEcX/k3N118qbKo3fKDFcS8inhS6p5bJc="; + rev = "c030e30e4df01a806841b64a438b55ec7b617b1f"; + hash = "sha256-kjUsG9Qm29nBYl/G/7FvHKirOq298scKFmaXtZfrcss="; }; installPhase = '' diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index dddc41cefcb5..cadca019cb4e 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -5,12 +5,12 @@ }: buildDartApplication (finalAttrs: { pname = "melos"; - version = "8.2.0"; + version = "8.2.2"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; tag = "melos-v${finalAttrs.version}"; - hash = "sha256-phbEUBRkAcATyNvWtqoqLoQyq7TmOvi4K821eHzicEY="; + hash = "sha256-BIRk1VX8e3CEbnv5S55DsNIFWsGvSVvq53k0cKtqGKE="; }; patches = [ diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 7d0c51611a3b..17bd9a6517cf 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -64,11 +64,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae", + "sha256": "59f99162d27dff3620f1d21165ce802237eb4556fed563c0902403f8207a7c00", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.7" + "version": "4.0.8" }, "built_collection": { "dependency": "transitive", @@ -124,11 +124,11 @@ "dependency": "transitive", "description": { "name": "cli_launcher", - "sha256": "35cf15a3ffaeb9c11849eaa0afba761bb76dceb42d050532bfd3e1299c9748cd", + "sha256": "96883f87648524292e24e2cc6a369fbdf64883473fe3e3ddadd3d857bf16a484", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+1" + "version": "0.3.3+2" }, "cli_util": { "dependency": "transitive", @@ -194,11 +194,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60", + "sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.9" + "version": "3.1.12" }, "ffi": { "dependency": "transitive", @@ -334,11 +334,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d", + "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.3" + "version": "1.19.0" }, "mime": { "dependency": "transitive", diff --git a/pkgs/by-name/nu/nushell/package.nix b/pkgs/by-name/nu/nushell/package.nix index f72ba1e5e601..380417bc1f7d 100644 --- a/pkgs/by-name/nu/nushell/package.nix +++ b/pkgs/by-name/nu/nushell/package.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: { # NOTE: when updating this to a new non-patch version, please also try to # update the plugins. Plugins only work if they are compiled for the same # major/minor version. - version = "0.114.0"; + version = "0.114.1"; src = fetchFromGitHub { owner = "nushell"; repo = "nushell"; tag = finalAttrs.version; - hash = "sha256-vLWfaci1lAPUXZJU2bfUvVNnMqFr6cMyX+R0aDWvRss="; + hash = "sha256-EpcbOnEcu8llVNC9zGEo62dHIHUJnyRRxP4sV8kSUwY="; }; - cargoHash = "sha256-3+H1VuqdLxjcPTzkrpNiBmHbWG8g4rr3WuFFQhyyMtI="; + cargoHash = "sha256-KZSWYJpyeN1fTeBSpuJ5r4HKZZ8a9k5KVft9uKqOJIE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix index b9ffec5fc182..0cb0150c7e86 100644 --- a/pkgs/by-name/ox/oxigraph/package.nix +++ b/pkgs/by-name/ox/oxigraph/package.nix @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ astro tnias + videl ]; license = with lib.licenses; [ asl20 diff --git a/pkgs/by-name/pa/pass-secret-service/package.nix b/pkgs/by-name/pa/pass-secret-service/package.nix index 4f9dd3538b6e..3926daa2efa1 100644 --- a/pkgs/by-name/pa/pass-secret-service/package.nix +++ b/pkgs/by-name/pa/pass-secret-service/package.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication { # PyPI has old alpha version. Since then the project has switched from using a # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. - version = "0-unstable-2023-12-16"; + version = "0-unstable-2026-07-15"; pyproject = true; src = fetchFromGitHub { owner = "mdellweg"; repo = "pass_secret_service"; - rev = "6335c85d9a790a6472e3de6eff87a15208caa5dc"; - hash = "sha256-SSmI3HJCUWuwFXCu3Zg66X18POlzp3ADRj7HeE8GRio="; + rev = "4ba0f4b6c0667192263c385c13b5ec42a87af9ff"; + hash = "sha256-BaAULmeTxsj6uk3Aqe7ft/uN14M/b1U3ga7S71+lE68="; }; # Need to specify session.conf file for tests because it won't be found under diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix index 41e70e73a102..199b59c61614 100644 --- a/pkgs/by-name/ph/photoprism/backend.nix +++ b/pkgs/by-name/ph/photoprism/backend.nix @@ -61,6 +61,9 @@ buildGoModule { homepage = "https://photoprism.app"; description = "Photoprism's backend"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ benesim ]; + maintainers = with lib.maintainers; [ + benesim + ipetkov + ]; }; } diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix index 16e91d0830b9..f62a6cf3c792 100644 --- a/pkgs/by-name/ph/photoprism/frontend.nix +++ b/pkgs/by-name/ph/photoprism/frontend.nix @@ -32,6 +32,9 @@ buildNpmPackage { homepage = "https://photoprism.app"; description = "Photoprism's frontend"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ benesim ]; + maintainers = with lib.maintainers; [ + benesim + ipetkov + ]; }; } diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix index d2f553938735..646062501c4e 100644 --- a/pkgs/by-name/ph/photoprism/package.nix +++ b/pkgs/by-name/ph/photoprism/package.nix @@ -103,7 +103,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://photoprism.app"; description = "Personal Photo Management powered by Go and Google TensorFlow"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ benesim ]; + maintainers = with lib.maintainers; [ + benesim + ipetkov + ]; mainProgram = "photoprism"; }; }) diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json index e21144d289c8..0af9e642b81f 100644 --- a/pkgs/by-name/pi/piliplus/git-hashes.json +++ b/pkgs/by-name/pi/piliplus/git-hashes.json @@ -1,20 +1,20 @@ { - "audio_service": "sha256-ZoblGqxzeu1oCCCfv8RDfvV3UR9SK0oLw/iIKMIqIa0=", - "cached_network_image_ce": "sha256-fFW5JdskLpDVQDMzwlR6/AgfgPaz91Kl9ZhuFJFSjwM=", - "cached_network_image_platform_interface_ce": "sha256-fFW5JdskLpDVQDMzwlR6/AgfgPaz91Kl9ZhuFJFSjwM=", + "audio_service": "sha256-2b/FROzfYQhZpsyps54llX+X4jM9En0E+pTx/3r71fw=", + "cached_network_image_ce": "sha256-GvPukCxtFXnBt+jYVa15phJN/eNPT/xxV/SqmZ/0i28=", + "cached_network_image_platform_interface_ce": "sha256-GvPukCxtFXnBt+jYVa15phJN/eNPT/xxV/SqmZ/0i28=", "canvas_danmaku": "sha256-JGbWwe/uR+QMvSVlEZ3k1W7FFkiFJK3sV3+1Lyubmcw=", "catcher_2": "sha256-feYZPwU9T8aWrFi+s4/JX8Ng3xsuAXdyX3YaSw02zcw=", - "chat_bottom_container": "sha256-ZF8sk0zavedI7RF+blff1S+0vmBBQJVY0ws7y3k1Fqs=", + "chat_bottom_container": "sha256-lasMrrYCBt/PJ+RluihKD5AKkpL3/2njoIetggpx3+w=", "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=", - "extended_nested_scroll_view": "sha256-ocjIy7gpCikoqRMqY4oGw/p9YaQ2v2clhon2pIzTXk4=", - "file_picker": "sha256-IVxQnT7e+ovk7meKnMv2wFWHJQlFbC9+DK2IYF4UWVc=", + "extended_nested_scroll_view": "sha256-D/yU7a0UWEzyXxmnoxGRAeKF6qR6qMcgKSdlD6PM2CY=", + "file_picker": "sha256-Ooqg0oUefgbfZ3W8Fqdr5dFa30/gXo8BfczZCof14vA=", "flutter_inappwebview_android": "sha256-9BD8Lv89jK5JgFuqGo6NmQmCYDZPmDJWMN4rLjr2j2w=", "flutter_inappwebview_windows": "sha256-9BD8Lv89jK5JgFuqGo6NmQmCYDZPmDJWMN4rLjr2j2w=", "flutter_smart_dialog": "sha256-Vq2SQ7TpM/TWaz5MrNUrc+4ANKQr0coA6hXbATTeKHc=", "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=", "font_awesome_flutter": "sha256-EcrAmglNHxm16gWTi4nYbTfKx0CCprllIyvlvYlz8wY=", "get": "sha256-zQ2m29nKCEjGvresMaDBo1oYfQ6WrFVbMSitcGmxyhU=", - "jnigen": "sha256-HN5DNy0wbe/fJ54BXHrdKdSr1F5qYIAOb99DNnNA898=", + "jnigen": "sha256-MvNNW9q7aNjrhy8vrwhfSGXaiTVwBZ0I3MpsHDUYrQc=", "material_design_icons_flutter": "sha256-t2ENlgb3ZRIc6jvufVwKGcty+3Te6/+XP10YDBrosYM=", "media_kit": "sha256-HxBQJzpyAkaTag4d9ZtnDjgIFrF3bmOvKXTYrXV0Fvo=", "media_kit_libs_android_video": "sha256-HxBQJzpyAkaTag4d9ZtnDjgIFrF3bmOvKXTYrXV0Fvo=", @@ -24,8 +24,7 @@ "media_kit_native_event_loop": "sha256-HxBQJzpyAkaTag4d9ZtnDjgIFrF3bmOvKXTYrXV0Fvo=", "media_kit_video": "sha256-HxBQJzpyAkaTag4d9ZtnDjgIFrF3bmOvKXTYrXV0Fvo=", "native_device_orientation": "sha256-yVO1rf3kPn1WDwRgwGwVqrxJREHN41vN7FC4lJPyaIc=", - "screen_brightness_android": "sha256-vjxbXndi9Mm8ZnEd/w6V4/h8RVvj264Ybm5oW5Mf8ag=", "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=", "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=", - "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo=" + "window_manager": "sha256-goeZVa2GzOaoC2cr5tElrUp/4+oDM/czV8bIKc0o/iY=" } diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix index 8d579ede2b83..a84e41d6bdf8 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -14,7 +14,7 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; - version = "2.0.9.2"; + version = "2.1.0"; in flutter344.buildFlutterApplication { pname = "piliplus"; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index c29ad4846a31..bd7dc5e4afa4 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -34,11 +34,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "4ec328cd9fd51fd0e7eb8870a9612c1fde0f091901932238c4f4e60b5f7f1315", + "sha256": "f8db46d2ea9ff6f3a37191a7fd5b7813da1253ace8c32c1b9eadace41d1188ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.2" + "version": "7.2.1" }, "app_links_linux": { "dependency": "transitive", @@ -54,11 +54,11 @@ "dependency": "transitive", "description": { "name": "app_links_platform_interface", - "sha256": "78a18580eecac98108d1eef52a7db668bc317714f5205e616973363326efe333", + "sha256": "7546f09a6e93f4a2df2fe2bd40a5c6c64310ac461b036d82b43033be7a59f809", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "app_links_web": { "dependency": "transitive", @@ -115,11 +115,11 @@ "description": { "path": "audio_service", "ref": "main", - "resolved-ref": "81cf56d5a8b8e9c8aa5a4c9396aebe094e09622f", + "resolved-ref": "e0860cf42618880b7e4fc5843d1e297c93d23922", "url": "https://github.com/bggRGjQaUbCoE/audio_service.git" }, "source": "git", - "version": "0.18.18" + "version": "0.18.19" }, "audio_service_platform_interface": { "dependency": "transitive", @@ -145,21 +145,21 @@ "dependency": "direct main", "description": { "name": "audio_session", - "sha256": "7217b229db57cc4dc577a8abb56b7429a5a212b978517a5be578704bfe5e568b", + "sha256": "f9e7711a0e24ca8b40f5d7ac374c3c6e55016f3157912badd18199cdbbca5c4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.3" + "version": "0.2.4" }, "battery_plus": { "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf", + "sha256": "f14567a9548ac57c010df641acbd35869429b3dc234fec0bb61b01f429285e61", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.1.0" }, "battery_plus_platform_interface": { "dependency": "transitive", @@ -195,41 +195,41 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10", + "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.6" + "version": "4.0.7" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71", + "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.3.1" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6", + "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.0" + "version": "2.15.1" }, "built_collection": { "dependency": "transitive", @@ -256,8 +256,8 @@ "description": { "path": "cached_network_image", "ref": "develop", - "resolved-ref": "5b79ff9f53a9a55b57d4d6fc52eb529fdfdb30d7", - "url": "https://github.com/bggRGjQaUbCoE/flutter_cached_network_image_ce.git" + "resolved-ref": "6ad91e9bf71254803e222b7d254751576f2f6d7b", + "url": "https://github.com/My-Responsitories/flutter_cached_network_image_ce.git" }, "source": "git", "version": "4.6.4" @@ -266,9 +266,9 @@ "dependency": "transitive", "description": { "path": "cached_network_image_platform_interface", - "ref": "5b79ff9f53a9a55b57d4d6fc52eb529fdfdb30d7", - "resolved-ref": "5b79ff9f53a9a55b57d4d6fc52eb529fdfdb30d7", - "url": "https://github.com/bggRGjQaUbCoE/flutter_cached_network_image_ce.git" + "ref": "6ad91e9bf71254803e222b7d254751576f2f6d7b", + "resolved-ref": "6ad91e9bf71254803e222b7d254751576f2f6d7b", + "url": "https://github.com/My-Responsitories/flutter_cached_network_image_ce.git" }, "source": "git", "version": "5.2.0" @@ -310,11 +310,11 @@ "description": { "path": "packages/chat_bottom_container", "ref": "dev", - "resolved-ref": "227fe87aeedcd53573b17d6a6e5c08834fbc4e45", + "resolved-ref": "e5e74d45eef94c416b34a0727268b0de0ffa2ada", "url": "https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git" }, "source": "git", - "version": "0.5.0" + "version": "0.5.1" }, "checked_yaml": { "dependency": "transitive", @@ -380,11 +380,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057", + "sha256": "cad0e811a289ea2a941119dc483c204ec1684cbb9a8fc7351fe4a230b8313160", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.1" + "version": "7.2.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -420,11 +420,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", + "sha256": "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+2" + "version": "0.3.5+4" }, "crypto": { "dependency": "direct main", @@ -481,11 +481,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65", + "sha256": "0891702f96b2e465fe567b7ec448380e6b1c14f60af552a8536d9f583b6b8442", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.1.0" + "version": "13.2.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -501,11 +501,11 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c", + "sha256": "ea2bad3c89a27635ce2d85cce4d6b199da49a5a48ec77b03e45b65a3b90922b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.2" + "version": "5.10.0" }, "dio_http2_adapter": { "dependency": "direct main", @@ -521,21 +521,21 @@ "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340", + "sha256": "dd58dc3861eb36edb13b217efc006a1c21e5bbc341de8c229b85634fa5e362e4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.2.0" }, "dlna_dart": { "dependency": "direct main", "description": { "name": "dlna_dart", - "sha256": "8a4f0e4f378615c99f2af679dc9f0c72fe4a0fb2f3eea96b637fe691dfcf0649", + "sha256": "da607931548720331b7503f72c426fa7fbd19e9144a4778d293c16a5bc186407", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0" + "version": "0.1.1" }, "dynamic_color": { "dependency": "direct main", @@ -571,21 +571,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "sha256": "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" - }, - "expandable": { - "dependency": "direct main", - "description": { - "name": "expandable", - "sha256": "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.1" + "version": "2.1.0" }, "extended_list_library": { "dependency": "transitive", @@ -602,7 +592,7 @@ "description": { "path": ".", "ref": "mod", - "resolved-ref": "e55d90cf2a1666e6ccf63e3f5779c8c4b12c5204", + "resolved-ref": "161cd202c20bf0ba2394e3a86381d58864dc9e4e", "url": "https://github.com/bggRGjQaUbCoE/extended_nested_scroll_view.git" }, "source": "git", @@ -653,11 +643,11 @@ "description": { "path": ".", "ref": "dev", - "resolved-ref": "8a987e491225341839bafb3d3171c4b2d797ef73", + "resolved-ref": "02eb0aede6ca2278bea54eb5cc9ec520bf8165fc", "url": "https://github.com/bggRGjQaUbCoE/flutter_file_picker.git" }, "source": "git", - "version": "12.0.0-beta.6" + "version": "12.0.0-beta.7" }, "file_selector_linux": { "dependency": "transitive", @@ -1103,11 +1093,11 @@ "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "91c025426c2881c551100bce834e201c835a170151545f58d17da5180ca7d9ac", + "sha256": "d8402284df184bc05f4a2210c6c23983b0720f4cd87cbd05c5390a78af602667", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.2.3" }, "image_picker_android": { "dependency": "transitive", @@ -1233,8 +1223,8 @@ "dependency": "direct dev", "description": { "path": "pkgs/jnigen", - "ref": "HEAD", - "resolved-ref": "496f2f0bbe583307a7d5ce4c33e81f0797cb65fe", + "ref": "55520836d363aac7f1ebae47387d03a30302be7b", + "resolved-ref": "55520836d363aac7f1ebae47387d03a30302be7b", "url": "https://github.com/dart-lang/native.git" }, "source": "git", @@ -1563,11 +1553,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852", + "sha256": "f5c435dc0e0d461e5b32471a870f769b6a1cc46930637efe24fbc535314e78ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.0" + "version": "10.2.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1603,11 +1593,11 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "sha256": "a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.6" }, "path_provider_android": { "dependency": "transitive", @@ -1633,21 +1623,21 @@ "dependency": "transitive", "description": { "name": "path_provider_linux", - "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "sha256": "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "path_provider_platform_interface": { "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "sha256": "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "path_provider_windows": { "dependency": "transitive", @@ -1673,11 +1663,11 @@ "dependency": "direct main", "description": { "name": "permission_handler_apple", - "sha256": "e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d", + "sha256": "79dfa1df734798aa3cfdad166d3a3698c206d8813de13516ea1071b5d7e2f420", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.9" + "version": "9.4.10" }, "permission_handler_platform_interface": { "dependency": "direct main", @@ -1840,95 +1830,94 @@ "version": "5.1.0" }, "screen_brightness_android": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { - "path": "screen_brightness_android", - "ref": "main", - "resolved-ref": "239b9e4595f257184c8afcaf21167f8667ba367d", - "url": "https://github.com/bggRGjQaUbCoE/screen_brightness.git" + "name": "screen_brightness_android", + "sha256": "2008ad8e9527cc968f7a4de1ec58b476d495b3c612a149dbd6550c4f046da147", + "url": "https://pub.dev" }, - "source": "git", - "version": "2.1.5" + "source": "hosted", + "version": "2.1.6" }, "screen_brightness_ios": { "dependency": "transitive", "description": { "name": "screen_brightness_ios", - "sha256": "0792d8f98852558f831b4b75241c46047b884598b3f4d982b37dc2dd43e2b2e1", + "sha256": "352d355e8523a186ba1e494b74218e5ca96e51975a0630b8ed89fbb7ff609762", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "screen_brightness_platform_interface": { "dependency": "direct main", "description": { "name": "screen_brightness_platform_interface", - "sha256": "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8", + "sha256": "2de60c0ba569b898950029cc1f7e9dd72bda44a22beb5054aac331cb6fce2ff2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "screen_retriever": { "dependency": "direct main", "description": { "name": "screen_retriever", - "sha256": "42cc3b402a0f67d2455a0d067553d0f13453f6a008d98eababf8b63958d506bd", + "sha256": "ace919117a7520c13a50a6259e60c4a0d4cbe98809468792a91b5c5adada2aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "screen_retriever_linux": { "dependency": "transitive", "description": { "name": "screen_retriever_linux", - "sha256": "2a476f1a5538065bc5badf376cfdc83d6ecf07d77eb2391b9c2bff5a76970048", + "sha256": "7b52006a5ceae1f3d5af7f77188c3290d6e7d8ded16d99809bea84967c65c257", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "screen_retriever_macos": { "dependency": "transitive", "description": { "name": "screen_retriever_macos", - "sha256": "b5abb900fcb86614ff10b738b34e37b9e1d03b0447280668e2bc8a98bdc7bd59", + "sha256": "a1489b99cce597c45a54b9aae1cd94c8d4705353b7e0bb2457a6e4de44e0ad8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "screen_retriever_platform_interface": { "dependency": "transitive", "description": { "name": "screen_retriever_platform_interface", - "sha256": "3af22d926bedf20c2caa308eea376776451a3af125919ce072e56525fded8901", + "sha256": "94a5535277510a63184ca178ce12a1449bc0b38618879aa1c18bf57369c5064a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "screen_retriever_windows": { "dependency": "transitive", "description": { "name": "screen_retriever_windows", - "sha256": "c44b38a4c4bab34af259180a70a4eee1e29384e7b82e627c9faa68afcdab2e73", + "sha256": "dafc6922b0bfbf1d48cf3ccbf519b4fff47bdcb820da1728ea6db675fecc9324", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "share_plus": { "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0", + "sha256": "9eee8283462d91a7a1c8bdb67d08874abd75a2f8fae3bc0ca033035e375fb3d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.1.0" + "version": "13.2.0" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -2291,11 +2280,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "7ee12e6dffe0fc8e755179d6d91b3b34f5924223fc104d85572ef9180d73d172", + "sha256": "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.5" + "version": "1.2.6" }, "vector_math": { "dependency": "direct main", @@ -2433,11 +2422,11 @@ "description": { "path": "packages/window_manager", "ref": "main", - "resolved-ref": "974ab0a71d37cfca9d9bd5b295d7bd1df80b790b", + "resolved-ref": "ac535d09a5850279e6591a9bdd285f9a3edeebf8", "url": "https://github.com/bggRGjQaUbCoE/window_manager.git" }, "source": "git", - "version": "0.5.1" + "version": "0.5.2" }, "xdg_directories": { "dependency": "transitive", @@ -2472,6 +2461,6 @@ }, "sdks": { "dart": ">=3.12.0 <4.0.0", - "flutter": "3.44.2" + "flutter": "3.44.6" } } diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index c5ba8bda0344..9a44f6e54704 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,6 +1,6 @@ { - "rev": "2536350ccfc87b9d5d23c564e3d4c8adbd175820", - "revCount": 5051, - "commitDate": 1781325010, - "hash": "sha256-11Fe6oYdrZYwiXBjtKQephO0W1uQuh5/rDcS0lNHaoM=" + "rev": "c1aeaca09e24f67e75685c7744fd1aa0a94b439a", + "revCount": 5109, + "commitDate": 1783828861, + "hash": "sha256-sAbme6nTaamIanTHuqbKDou2CE/SgYofflrw1F5WlC4=" } diff --git a/pkgs/by-name/si/signal-desktop/dont-assert-unicode-17-emoji.patch b/pkgs/by-name/si/signal-desktop/dont-assert-unicode-17-emoji.patch deleted file mode 100644 index a39494ca8271..000000000000 --- a/pkgs/by-name/si/signal-desktop/dont-assert-unicode-17-emoji.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scripts/generate-emoji-data.mjs b/scripts/generate-emoji-data.mjs -index 85fd8d484..23ca0bb72 100644 ---- a/scripts/generate-emoji-data.mjs -+++ b/scripts/generate-emoji-data.mjs -@@ -207,7 +207,6 @@ for (const emojiSrc of SRC_EMOJIS_SORTED) { - } - - const emoji = encodeUnified(emojiSrc.unified); -- assert(isEmoji(emoji), 'Unexpected invalid emoji'); - - if (isDeprecated(emoji)) { - continue; // drop deprecated emoji diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index c540ad1bfb83..b37ef4709c4a 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -15,23 +15,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.95.0"; + version = "0.96.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-stxakRw9CJQetkBcF2BfQh1EvEGurccP5/QLNLyEJz0="; + hash = "sha256-FOppsfocUvUfWa6AfBPOxAnntGJkzTbnPwqMzzbHnWQ="; }; - cargoHash = "sha256-bbOsE6vcFQpplzXAupcvp2oEoIFT3nk8Ug9QWbCe2yc="; + cargoHash = "sha256-wsXlCpNwO+E6rVNaD2R51Mi0sZUv2lhllGxDxzyptYA="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-lCLM0qI11Ce9w2NNgXHalxa8Ks628nvTjZhy26PvNbM="; + hash = "sha256-p8udihRlXMTnG4BT60D2VlI7D/O3eHV/zCS7ucpeuO4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 7fa96cde9803..be16d0a387f6 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -4,6 +4,7 @@ lib, nodejs_24, pnpm_10, + pnpm_11, node-gyp, fetchPnpmDeps, pnpmConfigHook, @@ -32,22 +33,25 @@ assert lib.warnIf (commandLineArgs != "") true; let nodejs = nodejs_24; - pnpm = pnpm_10; + pnpm = pnpm_11; electron = electron_42; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; - signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; + signal-sqlcipher = callPackage ./signal-sqlcipher.nix { + pnpm = pnpm_10; + inherit nodejs; + }; webrtc = callPackage ./webrtc.nix { }; ringrtc = callPackage ./ringrtc.nix { inherit webrtc; }; - version = "8.15.0"; + version = "8.18.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-SiOgNUll6J+EZNlmM6yhXakOc5qFCFRE/GczhaH57Vo="; + hash = "sha256-fynCFGmch3UecT5esNfVVlf0+xDrCdCBGw2HMMqBzWw="; # Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They # are fetched separately below. postFetch = '' @@ -63,16 +67,28 @@ let sticker-creator = stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop-sticker-creator"; - inherit version; - src = src + "/sticker-creator"; + inherit src version; + + pnpmRoot = "sticker-creator"; + pnpmWorkspaces = [ "signal-art-creator" ]; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname src version; + inherit (finalAttrs) + pname + src + version + postPatch + pnpmWorkspaces + ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y="; + hash = "sha256-bWNs5W2NPk55Sm7UqwWvXU7bY+AXzevU3o2ji23HxtU="; }; + postPatch = '' + rm sticker-creator/pnpm-lock.yaml + ''; + strictDeps = true; nativeBuildInputs = [ nodejs @@ -83,7 +99,7 @@ let installPhase = '' runHook preInstall - cp -r dist $out + cp -r sticker-creator/dist $out runHook postInstall ''; }); @@ -113,9 +129,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./force-90-days-expiration.patch - - # Drop once https://github.com/NixOS/nixpkgs/pull/520553 and https://github.com/NixOS/nixpkgs/pull/525241 land. - ./dont-assert-unicode-17-emoji.patch ] ++ lib.optional (!withAppleEmojis) ( # Signal ships the Apple emoji set without a licence and upstream @@ -149,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace config/production.json \ --replace-fail '"updatesEnabled": true' '"updatesEnabled": false' + # pnpm 11 verifies node_modules before every `pnpm run`, which fails + # after nixpkgs swaps in the prebuilt native modules below. + substituteInPlace pnpm-workspace.yaml \ + --replace-fail "verifyDepsBeforeRun: prompt" "verifyDepsBeforeRun: false" + # Nix builds do not need upstream release hooks (notarization and # language-pack postprocessing), and they expect a different macOS # app layout than nixpkgs' Electron provides. @@ -172,13 +190,13 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-/z+P9mb7Cm3FzzMpV6Da6THcHd73JgPuuB0Gx8KwKcc="; + hash = "sha256-bWNs5W2NPk55Sm7UqwWvXU7bY+AXzevU3o2ji23HxtU="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1781737260; + SOURCE_DATE_EPOCH = 1783606680; }; preBuild = '' @@ -233,6 +251,14 @@ stdenv.mkDerivation (finalAttrs: { popd test -f node_modules/fs-xattr/build/Release/xattr.node + # @signalapp/windows-ucv is imported on all platforms, but its TypeScript + # output is normally produced by its preinstall script. pnpmConfigHook runs + # `pnpm install --ignore-scripts`, so build it explicitly. + pushd packages/windows-ucv + pnpm run build + popd + test -f node_modules/@signalapp/windows-ucv/dist/index.js + cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist cp -r ${sticker-creator} sticker-creator/dist diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch index 6cc74744b76c..2b3e50b13af0 100644 --- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch +++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch @@ -1,13 +1,13 @@ diff --git a/app/AssetService.main.ts b/app/AssetService.main.ts -index 33b20b8d5..c122f8c67 100644 +index a4a21b5bb..3d5ab1eb0 100644 --- a/app/AssetService.main.ts +++ b/app/AssetService.main.ts -@@ -32,7 +32,6 @@ const LOCAL_ASSETS = new Set([ +@@ -34,7 +34,6 @@ const OPTIONAL_ASSETS = new Map([]); - // pathname to optional resource name - const OPTIONAL_ASSETS = new Map([ -- ['optional-fonts/emoji-large.woff2', 'emoji-font.woff2'], - ]); + if (!process.mas) { + LOCAL_ASSETS.add('fonts/emoji.woff2'); +- OPTIONAL_ASSETS.set('optional-fonts/emoji-large.woff2', 'emoji-font.woff2'); + } export class AssetService { diff --git a/app/protocol_filter.node.ts b/app/protocol_filter.node.ts diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 04b0d64cd4a9..c981eb2b9a2d 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.69.3"; + version = "2.69.4"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-ekSXEaAyVzd5957qoFakD33UYrUmvxZL19M6uflPR5U="; + hash = "sha256-z/9Y9rrlH4yziEVAXrCmkmP42hdDm3frGJnL1O/qOqg="; }; - cargoHash = "sha256-oNHT2owg3Ob2z8JxdYnICRdogK+XaasVgbF5RYYBJas="; + cargoHash = "sha256-a6CEUVW1HXqgIp/S+4Ype83N3QtNCBrutiEepHNW5pY="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index bdbf1db57ebd..d1b8824f2f2d 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -16,20 +16,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "node-sqlcipher"; - version = "3.3.5"; + version = "3.3.9"; src = fetchFromGitHub { owner = "signalapp"; repo = "node-sqlcipher"; tag = "v${finalAttrs.version}"; - hash = "sha256-RzuyUx0WEG8j8HwV5cepVJIeqYzJpNemFNtB+9NETto="; + hash = "sha256-eddDeNK8UA6CW1qXZtgS8QpuXVjFO6tVwpFDyYDnX+U="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; # may be different than top-level pnpm fetcherVersion = 4; - hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM="; + hash = "sha256-avvXNPfN5YVqwCOU2RX8dos3LTlre1t/4COKb4zHkh4="; }; cargoRoot = "deps/extension"; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index acc1c6f4e304..7de305ce605b 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -20,7 +20,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "18.13.1"; + version = "18.15.1"; inherit nodejs; @@ -28,7 +28,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-gfoGGLJ2Pyl2BPcCAukk2eNPTsGYofT2G6a9FmlDwTE="; + hash = "sha256-vBv6+mc6XB89gR4j6GaBj15Z3NBBCwqfGc4HQQcpL7w="; }; # Use custom fetcher for deps because super-productivity uses multiple @@ -74,7 +74,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-staJsDxwcF2TC+Y8wr9iaq7TmfQVG3ZIQh17UTCP/9I="; + hash = "sha256-stY7Kc1GDm7z3uQN+5iXFDMy9qQs4CvmCYMHCCOJUcc="; } ); diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index f59a771f63cc..2b64959ec30e 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.19.1"; + version = "3.19.5"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb"; - hash = "sha256-PoWjyHBDsJPrGUBuTB2yXdLPu2gxrGn68flpy7fxC7Q="; + hash = "sha256-WltXrcnOIJMcQVTFf/3tCPP/onQyhv3xTJ563WshJUA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index 0bf91b22f52a..784dfe8f14a5 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + llvmPackages, nix-update-script, }: @@ -20,13 +21,21 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-ZwF5nNI2ESwgaH129MhcJPlhtmxqwhhQ9W49u9bilRk="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld + ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ "-framework" "AppKit" ]; + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; checkFlags = [ diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix index ab7ae228ad7e..da78344f118d 100644 --- a/pkgs/by-name/xj/xjadeo/package.nix +++ b/pkgs/by-name/xj/xjadeo/package.nix @@ -10,6 +10,7 @@ liblo, libx11, libxv, + llvmPackages, pkg-config, portmidi, libxpm, @@ -30,7 +31,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - ]; + ] + # TODO: Remove once #536365 reaches this branch + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; buildInputs = [ ffmpeg @@ -52,6 +55,11 @@ stdenv.mkDerivation (finalAttrs: { libxv ]; + # TODO: Remove once #536365 reaches this branch + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + meta = { description = "X Jack Video Monitor"; longDescription = '' diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index daa66cec2cd4..d386f2f22dad 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.29.1"; + version = "3.30.0"; pyproject = true; src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-Wn36YvuQ9geCAD0froVq2KulyeRWnc2AKX4FPCCKG8I="; + hash = "sha256-Htj38Qw2G0GR2+pPCrlUgbywRJvYg1wQyNFdxY9SJQI="; }; build-system = [ hatchling ];