From 722137f9eacae1027a62c70c825b2543bdc8261c Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 16 Sep 2024 13:17:47 -0300 Subject: [PATCH 01/96] shadershark: simplify update script Signed-off-by: lucasew --- pkgs/by-name/sh/shadershark/package.nix | 10 +++++++++- pkgs/by-name/sh/shadershark/update.sh | 14 -------------- 2 files changed, 9 insertions(+), 15 deletions(-) delete mode 100755 pkgs/by-name/sh/shadershark/update.sh diff --git a/pkgs/by-name/sh/shadershark/package.nix b/pkgs/by-name/sh/shadershark/package.nix index e27036575be7..8585dd8c015a 100644 --- a/pkgs/by-name/sh/shadershark/package.nix +++ b/pkgs/by-name/sh/shadershark/package.nix @@ -9,6 +9,8 @@ , imagemagick , makeWrapper , installShellFiles +, genericUpdater +, writeShellScript }: stdenv.mkDerivation (finalAttrs: { @@ -50,7 +52,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = [ ./update.sh finalAttrs.src.url ]; + passthru.updateScript = genericUpdater { + inherit (finalAttrs) pname version; + versionLister = writeShellScript "shadershark-tags" '' + repo_url=${finalAttrs.src.url} + curl "$repo_url/tags" | grep '/rev/v' | sed 's;.*/rev/v\([^"]*\)[^$]*;\1; #' + ''; + }; meta = with lib; { mainProgram = "shader-shark"; diff --git a/pkgs/by-name/sh/shadershark/update.sh b/pkgs/by-name/sh/shadershark/update.sh deleted file mode 100755 index 0bd125caac95..000000000000 --- a/pkgs/by-name/sh/shadershark/update.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl common-updater-scripts - -set -e - -repo_url="$1"; shift - -data="$(curl "$repo_url/tags")" - -rev="$(echo "$data" | grep '/rev/v' | sed 's;.*/rev/v\([^"]*\)[^$]*;\1;' | head -n 1)" -echo "new rev: $rev" - -update-source-version shadershark "$rev" \ - --print-changes From 005fca65323f3c7016e7a05c37978c156649731c Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 16 Sep 2024 14:00:20 -0300 Subject: [PATCH 02/96] ciscoPacketTracer7: disown Signed-off-by: lucasew --- pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index a378940e5599..9ffd363405ea 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { homepage = "https://www.netacad.com/courses/packet-tracer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ lucasew ]; + maintainers = []; platforms = [ "x86_64-linux" ]; }; } From e383d67656d91670469df4ba678f83882ae0b10b Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 16 Sep 2024 14:00:39 -0300 Subject: [PATCH 03/96] ciscoPacketTracer8: disown Signed-off-by: lucasew --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index fca1924b087a..f197b5c60c21 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation (args: { homepage = "https://www.netacad.com/courses/packet-tracer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ lucasew ]; + maintainers = []; platforms = [ "x86_64-linux" ]; mainProgram = "packettracer8"; }; From 1c79bffa2911c65014d0fc0470527c46bc4d115e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 18 Sep 2024 16:59:41 +0100 Subject: [PATCH 04/96] ciscoPacketTracer{7,8}: re-add `with maintainers` --- pkgs/by-name/ci/ciscoPacketTracer7/package.nix | 2 +- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 9ffd363405ea..5b29306396c0 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { homepage = "https://www.netacad.com/courses/packet-tracer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = []; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index f197b5c60c21..8c29081bf79e 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation (args: { homepage = "https://www.netacad.com/courses/packet-tracer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = []; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "packettracer8"; }; From cb14281e112718ca7b05060bc540684f2d5f82f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Nov 2024 15:09:52 +0000 Subject: [PATCH 05/96] archi: 5.3.0 -> 5.4.3 --- pkgs/tools/misc/archi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index b5328e7fab28..500edebad94c 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation rec { pname = "Archi"; - version = "5.3.0"; + version = "5.4.3"; src = { "x86_64-linux" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz"; - hash = "sha256-ngO3YFCChsnefxdxtR00Dy736K2GYnTEYI4vKWLnPsw="; + hash = "sha256-95pm7WMzc25Gbtc73k+z8AJywJg6i6+/YTsx1DaA7sc="; }; "x86_64-darwin" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg"; - hash = "sha256-dL1c7IrbDMY/WbijQh1dCmCrRQQhj4fjGN+6m19OjO0="; + hash = "sha256-Y97wMwza0jR6cxWqnUIjQBvstLtz78QhRA84eQKqk4c="; }; "aarch64-darwin" = fetchurl { url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg"; - hash = "sha256-iczIUm1LCAjYKOyHXbFCgb+zoUxxATSOVkB8Ldk7pxQ="; + hash = "sha256-Wd3OXMWufs03RyhUkkvoMKG2wI1q40MWaTTkrzio4Is="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From abc5566af957882d429b89ca50dff961656541b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 13:31:14 +0000 Subject: [PATCH 06/96] amazon-cloudwatch-agent: 1.300049.1 -> 1.300050.0 --- pkgs/by-name/am/amazon-cloudwatch-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix index 38d8136f127a..4ca8d31b1468 100644 --- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix +++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "amazon-cloudwatch-agent"; - version = "1.300049.1"; + version = "1.300050.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-cloudwatch-agent"; rev = "refs/tags/v${version}"; - hash = "sha256-/VzLSHlBT40h7iErBisfSp7cTAm3L4vmZP03UiDmBaE="; + hash = "sha256-546qUeRwaJ4iROf6kw/lnv/c7jSESP9yn3dXc7G/plI="; }; - vendorHash = "sha256-zsASHuTXL3brRlgLPNb4wFPHkYpUWbOdRDCXQUwZjIY="; + vendorHash = "sha256-de7F8tFv5C+lwUGrWHMK22Lynm0/4J0XH6mVryJtDjk="; # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300048.1/Makefile#L68-L77. subPackages = [ From 0b8b1b5273706c6a2fca4c554dfdbd5ed183c6c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 06:54:14 +0000 Subject: [PATCH 07/96] python312Packages.click-odoo-contrib: 1.19 -> 1.20 --- .../development/python-modules/click-odoo-contrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index 03263e7fed21..0e1cc65445bb 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.19"; + version = "1.20"; format = "pyproject"; src = fetchPypi { pname = "click_odoo_contrib"; inherit version; - hash = "sha256-Tg3C/mdgkB1TtQZaUOX4ZjpD3InI8CxoNUSfotRqbg0="; + hash = "sha256-TRh7ffdW7ZBDlj7RPgEbtzEuHkTe99L6GYuOLgeEumg="; }; nativeBuildInputs = [ setuptools-scm ]; From 198e6f212ed49974f8eed1d9e36caf9bcee1f629 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 16:28:05 +0000 Subject: [PATCH 08/96] python312Packages.inform: 1.31 -> 1.32 --- pkgs/development/python-modules/inform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index ab08f740e674..57340099310f 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "inform"; - version = "1.31"; + version = "1.32"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "inform"; rev = "refs/tags/v${version}"; - hash = "sha256-o7yH7jCNn9gbcr7NMJVaYQOJ7hvwaY2ur1FyEP40Cco="; + hash = "sha256-RWcplWgGaIoiOZ28oPU4LtXQhwaTImc4bGHokHM5Kpg="; }; nativeBuildInputs = [ flit-core ]; From 8ae2932d567cbe792ddfebd537be6fd66f594179 Mon Sep 17 00:00:00 2001 From: 34j <34j.github@proton.me> Date: Sun, 24 Nov 2024 13:34:28 +0900 Subject: [PATCH 09/96] add `--enable-wayland-ime` flag to all Electron packages that uses `NIXOS_OZONE_WL` --- pkgs/applications/audio/plexamp/default.nix | 2 +- pkgs/applications/audio/youtube-music/default.nix | 2 +- pkgs/applications/editors/vscode/generic.nix | 2 +- pkgs/applications/graphics/drawio/default.nix | 2 +- pkgs/applications/misc/1password-gui/linux.nix | 2 +- pkgs/applications/misc/whalebird/default.nix | 2 +- pkgs/applications/misc/zettlr/generic.nix | 2 +- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- .../networking/instant-messengers/discord/linux.nix | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 2 +- .../networking/instant-messengers/franz/generic.nix | 2 +- .../networking/instant-messengers/slack/default.nix | 2 +- pkgs/applications/networking/mullvad-vpn/default.nix | 2 +- pkgs/applications/office/micropad/default.nix | 2 +- pkgs/applications/office/morgen/default.nix | 2 +- pkgs/applications/science/math/geogebra/geogebra6.nix | 2 +- pkgs/applications/virtualization/podman-desktop/default.nix | 2 +- pkgs/by-name/af/affine/package.nix | 2 +- pkgs/by-name/al/altair/package.nix | 2 +- pkgs/by-name/an/anytype/package.nix | 2 +- pkgs/by-name/ba/bazecor/package.nix | 2 +- pkgs/by-name/be/beekeeper-studio/package.nix | 2 +- pkgs/by-name/be/beeper/package.nix | 2 +- pkgs/by-name/bi/bitwarden-desktop/package.nix | 2 +- pkgs/by-name/bl/blockbench/package.nix | 2 +- pkgs/by-name/br/brave/make-brave.nix | 2 +- pkgs/by-name/br/bruno/package.nix | 2 +- pkgs/by-name/ca/caprine/package.nix | 2 +- pkgs/by-name/ch/chatzone-desktop/package.nix | 2 +- pkgs/by-name/ci/cider-2/package.nix | 2 +- pkgs/by-name/ci/cider/package.nix | 2 +- pkgs/by-name/co/code-cursor/package.nix | 2 +- pkgs/by-name/de/deltachat-desktop/package.nix | 2 +- pkgs/by-name/fe/feishin/package.nix | 2 +- pkgs/by-name/fi/figma-linux/package.nix | 2 +- pkgs/by-name/fr/framesh/package.nix | 2 +- pkgs/by-name/fr/freetube/package.nix | 2 +- pkgs/by-name/gi/github-desktop/package.nix | 2 +- pkgs/by-name/gi/gitify/package.nix | 2 +- pkgs/by-name/gi/gitkraken/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/go/google-chrome/package.nix | 2 +- pkgs/by-name/ht/httptoolkit/package.nix | 2 +- pkgs/by-name/it/itch/package.nix | 2 +- pkgs/by-name/ji/jitsi-meet-electron/package.nix | 2 +- pkgs/by-name/jo/joplin-desktop/package.nix | 2 +- pkgs/by-name/ka/kando/package.nix | 2 +- pkgs/by-name/ko/koodo-reader/package.nix | 2 +- pkgs/by-name/ku/kuro/package.nix | 2 +- pkgs/by-name/le/legcord/package.nix | 2 +- pkgs/by-name/le/lens/linux.nix | 2 +- pkgs/by-name/lo/logseq/package.nix | 2 +- pkgs/by-name/lu/lunar-client/package.nix | 2 +- pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +- pkgs/by-name/ma/mattermost-desktop/package.nix | 2 +- pkgs/by-name/mi/microsoft-edge/package.nix | 2 +- pkgs/by-name/mq/mqtt-explorer/package.nix | 2 +- pkgs/by-name/mu/muffon/package.nix | 2 +- pkgs/by-name/mu/multiviewer-for-f1/package.nix | 2 +- pkgs/by-name/ob/obsidian/package.nix | 2 +- pkgs/by-name/pa/passky-desktop/package.nix | 2 +- pkgs/by-name/po/postman/linux.nix | 2 +- pkgs/by-name/pr/proton-pass/package.nix | 2 +- pkgs/by-name/pr/protonmail-desktop/package.nix | 2 +- pkgs/by-name/r2/r2modman/package.nix | 2 +- pkgs/by-name/re/redact/package.nix | 2 +- pkgs/by-name/re/redisinsight/package.nix | 2 +- pkgs/by-name/re/revolt-desktop/package.nix | 2 +- pkgs/by-name/ri/ride/package.nix | 2 +- pkgs/by-name/se/session-desktop/package.nix | 2 +- pkgs/by-name/si/signal-desktop/generic.nix | 2 +- pkgs/by-name/sp/spotify/linux.nix | 2 +- pkgs/by-name/te/teams-for-linux/package.nix | 2 +- pkgs/by-name/ti/tidal-hifi/package.nix | 2 +- pkgs/by-name/uh/uhk-agent/package.nix | 2 +- pkgs/by-name/up/upscayl/package.nix | 2 +- pkgs/by-name/wa/wavebox/package.nix | 2 +- pkgs/by-name/wi/wire-desktop/package.nix | 2 +- pkgs/by-name/wo/wootility/package.nix | 2 +- pkgs/by-name/yt/ytmdesktop/package.nix | 2 +- pkgs/by-name/zu/zulip/package.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 2 +- pkgs/tools/security/bitwarden-directory-connector/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 5b83e9968af8..0dbe7c515f7f 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/plexamp" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ''; passthru.updateScript = ./update-plexamp.sh; diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index b46e11a35e8d..faca81bfe9a7 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 352c25fe1720..6a23b4c2aeb5 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -211,7 +211,7 @@ in "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"} # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5b551da388dc..3e094bbf6229 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \ --add-flags "$out/share/lib/drawio/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 5b9af43cc169..2bad0a25656d 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -151,6 +151,6 @@ stdenv.mkDerivation { # See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406 # Remove this comment when upstream fixes: # https://1password.community/discussion/comment/624011/#Comment_624011 - #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ''; } diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index e46a1af85c82..a99d4c047ceb 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \ --add-flags "$out/opt/Whalebird/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 65e9f03de642..ab23bf9e4831 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = '' wrapProgram $out/bin/zettlr \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index ecce9b395a75..cc2e5b0003f8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -124,7 +124,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 81a1da428913..037f488253ce 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \ --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 8d745b0bd81e..30ada15ea09a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index e2c1c8da00ad..ed98829d6486 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 5009ab5af0df..017ce3982da2 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation (rec { wrapProgramShell $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --suffix PATH : ${xdg-utils}/bin \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ "''${gappsWrapperArgs[@]}" ''; } // cleanedArgs) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 7640d72c670d..34b61e994970 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -174,7 +174,7 @@ let makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 098051c72fb1..91902083be6c 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation { --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" wrapProgram $out/bin/mullvad-gui \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index 8fd6b2dd5228..7319d8ee547c 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/micropad" \ --add-flags "$out/share/micropad" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index dae08cd485c6..1b31ba0e78fd 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace '/opt/Morgen' $out/bin makeWrapper ${electron}/bin/electron $out/bin/morgen \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer}} $out/opt/Morgen/resources/app.asar" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}} $out/opt/Morgen/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index d57175daff93..38c549cffb85 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -63,7 +63,7 @@ let cp -r GeoGebra-linux-x64/{resources,locales} "$out/" makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ --add-flags "$out/resources/app" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 947def308f7a..fc313496014d 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \ --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0dec9b5835b2..53b527ff9077 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation ( makeWrapper "${electron}/bin/electron" $out/bin/affine \ --inherit-argv0 \ --add-flags $out/lib/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} ''; desktopItems = [ diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index ae2a7d30b9db..384ffd113a0c 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -18,7 +18,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 38590a9f868e..8d1f59cf747a 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index d71334f03bbc..ecb0ccfe0de7 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -41,7 +41,7 @@ appimageTools.wrapAppImage { extraInstallCommands = '' wrapProgram $out/bin/bazecor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 437d3b7e7e4c..004607f4e94a 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 918d07863734..d7abefeba49f 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation rec { substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} --no-update" runHook postInstall ''; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 8f3947caa5cb..8420d2dca052 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -174,7 +174,7 @@ in buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \ --add-flags $out/opt/Bitwarden/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 12dbf8d6331e..4aa7bc18a831 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -71,7 +71,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/blockbench \ --add-flags $out/share/blockbench/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 48b1ad51bb10..e3f8a0f7c404 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -268,7 +268,7 @@ stdenv.mkDerivation { } ${ optionalString (enableFeatures != [ ]) '' - --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations --enable-wayland-ime}}" '' } ${ diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 07e8516e308d..b4750534d43d 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -153,7 +153,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/bruno \ --add-flags $out/opt/bruno/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index fc75d8588cbf..c9a11ecc919c 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -46,7 +46,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/caprine \ --add-flags $out/share/caprine/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix index 27a0aba212e3..93c412f560bb 100644 --- a/pkgs/by-name/ch/chatzone-desktop/package.nix +++ b/pkgs/by-name/ch/chatzone-desktop/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { cp -r ${appimageContents}/usr/share/icons $out/share wrapProgram $out/bin/chatzone-desktop \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 8cffc3a34ef9..b8140e1a05c8 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -27,7 +27,7 @@ appimageTools.wrapType2 rec { in '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags "--no-sandbox --disable-gpu-sandbox" # Cider 2 does not start up properly without these from my preliminary testing install -m 444 -D ${contents}/cider.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/by-name/ci/cider/package.nix b/pkgs/by-name/ci/cider/package.nix index 48289d6d37d3..94e21715ed9c 100644 --- a/pkgs/by-name/ci/cider/package.nix +++ b/pkgs/by-name/ci/cider/package.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 rec { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 1637066484ff..863888feedbc 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation { substituteInPlace $out/share/applications/cursor.desktop --replace-fail "AppRun" "cursor" wrapProgram $out/bin/cursor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} --no-update" runHook postInstall ''; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 352765077dde..b51cff362f06 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/${finalAttrs.meta.mainProgram} \ --add-flags $out/opt/DeltaChat/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index db26c0d6105a..16c0be5b0956 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -115,7 +115,7 @@ buildNpmPackage { # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 makeWrapper ${lib.getExe electron} $out/bin/feishin \ --add-flags $out/share/feishin/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set ELECTRON_FORCE_IS_PACKAGED=1 \ --inherit-argv0 diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix index 29fd84f2f338..54a1125c29d4 100644 --- a/pkgs/by-name/fi/figma-linux/package.nix +++ b/pkgs/by-name/fi/figma-linux/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgramShell $out/bin/figma-linux \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index b4673ca4cff9..ae29660ff347 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png wrapProgram "$out/bin/${pname}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" substituteInPlace $out/share/applications/frame.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 77959f42af41..cc00bc2077b3 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" ''; meta = { diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index 88f8b5620b45..2d1868e254b8 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime}}" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} ) ''; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index ae2d4cfdb7cc..f9fa4126eb50 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/gitify \ --add-flags $out/share/gitify/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 '' } diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 3347a8cebbbb..6269800fe9ef 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -191,7 +191,7 @@ let ''; preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}") ''; postFixup = '' diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 65160701b52a..44adb2b678fe 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { makeShellWrapper "${lib.getExe electron}" "$out/bin/goofcord" \ --add-flags "$out/share/lib/goofcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 1113a014c9b7..487c6745079b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -248,7 +248,7 @@ let --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index 5b2acf02bb0d..ef050b87b9e5 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -62,7 +62,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/httptoolkit \ --add-flags $out/share/httptoolkit/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index 29558080375f..e6d0d939c269 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -91,7 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \ --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}:${itch-setup} ''; diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 619759df2f00..f3350f1b29d8 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -90,7 +90,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \ --add-flags $out/share/jitsi-meet-electron/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 7f85685679e1..f5d81acc08d5 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -52,7 +52,7 @@ let extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index fa58189efff4..ec1ea628e2d5 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -111,7 +111,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/kando \ --add-flags $out/share/kando/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index 2d5132fb4cbe..b66d8f13e0d7 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \ --add-flags $out/share/lib/koodo-reader/resources/app.asar \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 ''; diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix index 95126d1ba1f1..ca0986e3c7a0 100644 --- a/pkgs/by-name/ku/kuro/package.nix +++ b/pkgs/by-name/ku/kuro/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/kuro" \ --add-flags "$out/share/lib/kuro/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index e83bf3d254e2..d1b4c8e89369 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { makeShellWrapper "${lib.getExe electron_32}" "$out/bin/legcord" \ --add-flags "$out/share/lib/legcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/le/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix index 5b43a6c96210..d1dbf197bd51 100644 --- a/pkgs/by-name/le/lens/linux.nix +++ b/pkgs/by-name/le/lens/linux.nix @@ -14,7 +14,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 0f56d5def56d..048d4119a47d 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -84,7 +84,7 @@ in makeWrapper ${electron_27}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/logseq/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index aef36fb6c8ef..b92d76fbb5e8 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/lunarclient \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/lunarclient.desktop \ diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index e5f9fcafc412..05c56827edce 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { makeWrapper ${electron_30}/bin/electron $out/bin/lx-music-desktop \ --add-flags $out/opt/lx-music-desktop/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ ''; diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 41c27ed7c19c..7a95092811d4 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/${pname}/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index dff0183db0ab..7dff6c0efc93 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation (finalAttrs: { --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "microsoft-edge-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 2aa7a6ba6891..59e8ebe74b38 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { makeWrapper '${electron}/bin/electron' "$out/bin/mqtt-explorer" \ --add-flags "$out/share/mqtt-explorer/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index f7c33bc22b98..7c86a6d6de1a 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/muffon \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications substituteInPlace $out/share/applications/muffon.desktop \ --replace-fail 'Exec=AppRun' 'Exec=muffon' diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 9078a4dc7ef9..704bd214a4bb 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation rec { mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1 makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/Multiviewer for F1\"" runHook postInstall diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 8da1346e426a..fe6a4c4833a6 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -53,7 +53,7 @@ let mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar diff --git a/pkgs/by-name/pa/passky-desktop/package.nix b/pkgs/by-name/pa/passky-desktop/package.nix index b668ba94bfaf..48a51b4ac8da 100644 --- a/pkgs/by-name/pa/passky-desktop/package.nix +++ b/pkgs/by-name/pa/passky-desktop/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir "$out/share/applications" makeWrapper ${electron}/bin/electron "$out/bin/passky" \ --add-flags "$out/share/passky/electron/" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 4ef52b253205..34e631e2241e 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" mkdir -p $out/share/icons/hicolor/128x128/apps ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 8869d038d435..2ef7500aca8d 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' makeWrapper ${lib.getExe electron} $out/bin/proton-pass \ --add-flags $out/share/proton-pass/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 81866b4fd3a1..645b7f7e34c5 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index 4a4a7fc3716e..5304f57790e7 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \ --inherit-argv0 \ --add-flags "$out/share/r2modman" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index d922ce7e26c1..28987aa91d12 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png substituteInPlace $out/share/applications/redact.desktop \ diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 3889022daf97..be2f639e2c80 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \ --add-flags "$out/share/redisinsight/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index f941225770b2..d4cd6c298bd2 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -60,7 +60,7 @@ postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \ --add-flags $out/share/revolt-desktop/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ''; } else diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index f2f8ca1a978a..31691bc7cdb7 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -108,7 +108,7 @@ buildNpmPackage rec { cp -r locales resources{,.pak} $out/share/ride makeShellWrapper ${lib.getExe electron} $out/bin/ride \ --add-flags $out/share/ride/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 7eafae046a5e..49a981d403ca 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { cp -r bin $out/bin wrapProgram $out/bin/session-desktop \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index 27e871aeb548..22794ab1c561 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index b295d6fa5083..5d638876d2da 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation { ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${zenity}/bin" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" runHook postFixup ''; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 77f8cf6e5f8b..17f93c7ca963 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -80,7 +80,7 @@ buildNpmPackage rec { ] } \ --add-flags "$out/share/teams-for-linux/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 1a5b41808a75..c2527809f503 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index 8e32d33660ab..fa86e0e44e36 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation { makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/opt/${pname}/app.asar.unpacked" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix index 414a2eb1456b..eb48ac50a56b 100644 --- a/pkgs/by-name/up/upscayl/package.nix +++ b/pkgs/by-name/up/upscayl/package.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ''; meta = with lib; { diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index 305f78db06ef..01b0f0eb7205 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "wavebox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 1b4ae2a4e74a..8c0c3f8052ab 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -138,7 +138,7 @@ let ]; preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}") ''; postFixup = '' diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 265f7f9c35ce..3c1b3af0743f 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -22,7 +22,7 @@ appimageTools.wrapType2 { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/wootility \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" install -Dm444 ${contents}/wootility-lekker.desktop -t $out/share/applications install -Dm444 ${contents}/wootility-lekker.png -t $out/share/pixmaps diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index f6e04c930b7b..a402502ca1b2 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron_33} $out/bin/ytmdesktop \ --add-flags $out/lib/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook preFixup diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 877eb833de8c..6b6ffb4b0e85 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -20,7 +20,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"; + runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime}}"; extraInstallCommands = '' install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 408584de712e..240b1e067fc2 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" ) ''; diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index b2d9bb4393b7..b7dc6f512597 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -75,7 +75,7 @@ in { makeWrapper ${lib.getExe electron} $out/bin/bitwarden-directory-connector \ --add-flags $out/share/bitwarden-directory-connector/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 3beeaac77b28..6dfc50d2608b 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { checkFailed fi - exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} "\$@" + exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} "\$@" EOF chmod +x $out/bin/keybase-gui From 06a2b04963ed24578af7fb6f2b30214271d48618 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 21:09:50 +0000 Subject: [PATCH 10/96] podman: 5.3.0 -> 5.3.1 --- pkgs/by-name/po/podman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index c9c205b618a3..93ad4f71bb98 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -66,13 +66,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-v7srZ1S4qnEOgXvhj+61tSWqzx9qFv0m3iBEUoMu7+U="; + hash = "sha256-kABP10QX4r11UDUcd6Sukb+9+LRm/ba3iATz6DTOJYw="; }; patches = [ From 0bed3f1cef2a4e3320e7394e61af9b9144a7f99d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 02:50:11 +0000 Subject: [PATCH 11/96] mtr-exporter: 0.3.0 -> 0.4.0 --- pkgs/by-name/mt/mtr-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix index 9c7c9bec41ea..cc807181d12a 100644 --- a/pkgs/by-name/mt/mtr-exporter/package.nix +++ b/pkgs/by-name/mt/mtr-exporter/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mtr-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mgumz"; repo = "mtr-exporter"; rev = version; - hash = "sha256-vVYdIfogXHixf1/7+uGKSxbqVmr9NeCUuNVYE07HoBw="; + hash = "sha256-dMlMUjbUg05Z8FFEPwMOiHzLiHSSjV1CzKqrt/qJ6Js="; }; vendorHash = null; From 67e16b74c7a29eca9a2d0d02f759422ddb5fdb12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 12:37:10 +0000 Subject: [PATCH 12/96] anilibria-winmaclinux: 2.2.20 -> 2.2.22 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index cb65af545d9e..a814406a5c22 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.20"; + version = "2.2.22"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-Tdrs8WFv3ZoDL3U34l+NQp+oVJ6qxlVFg4YfwBSYlVg="; + hash = "sha256-dWjd+wf4yBX63+IsJwY49I/ofL9FSfbWZJ1IhyDc+Z0="; }; sourceRoot = "${src.name}/src"; From 7ac450eaa04763c32ff634973f91d42e0cf4e97d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 16:33:11 +0000 Subject: [PATCH 13/96] mackerel-agent: 0.82.0 -> 0.83.0 --- pkgs/by-name/ma/mackerel-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index 69538107ad4f..4f62239bcbb7 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.82.0"; + version = "0.83.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zkwYYkI7oeOdJH/K9E8/ZkTOexEKyP1I2kOJlt7PcK4="; + sha256 = "sha256-hxABrgUdEQDj8NJxZgChGgB2/3J1/ChTdIYkFQtGsuY="; }; nativeBuildInputs = [ makeWrapper ]; From 8af60309bad9122ef8076a1c723fa131593e8de4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 18:02:37 +0000 Subject: [PATCH 14/96] python312Packages.tskit: 0.5.8 -> 0.6.0 --- pkgs/development/python-modules/tskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index e91fba90dc77..a1b1edcf15af 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.5.8"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wq7ar96w5hdAyKMMvK4zjYln74RmX1l/VhvS++CN+Xk="; + hash = "sha256-ndoqzISujas0hN/ty3IYB6Tv5I4Vn3TySwd4lAS1QQY="; }; postPatch = '' From bc67ed671b18753c45ef25890dbaec3082c3b032 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 19:46:25 +0000 Subject: [PATCH 15/96] tigerbeetle: 0.16.12 -> 0.16.14 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 4199b7c1a967..ff0f9606cea7 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-crTcTPbP4+YqeCnrk4qFGsBiPCgsQc32HK6jyb4+FOU="; - "x86_64-linux" = "sha256-92Qg2kVuT7RRQzcEuduETcFhI7oiIiCXPyAbAj4MhVg="; - "aarch64-linux" = "sha256-jztdl3gLJarUBxIAl1yzLd7cMJQEYrcjERJwRlsmxqs="; + "universal-macos" = "sha256-glxTuuSfRkkBZE3OMflv2FM1yqamJXpRz3DnMt8baRU="; + "x86_64-linux" = "sha256-xirnZUQxhvaJ0OpDF57rZ3Di7q0JfH3TXlAe2Ej9bwU="; + "aarch64-linux" = "sha256-0lOpYlSOaX9CfQO9CdJ7xIanhf8G3KoUuGNbbPXmmow="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.12"; + version = "0.16.14"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 849225f9a1b84aadcd0a378c4d607d8feea9336f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 26 Nov 2024 21:35:04 +0100 Subject: [PATCH 16/96] nixos/renovate: unset service restart Unsetting `Restart=` defaults to `Restart=no`. We don't want Renovate to automatically restart, as it might trigger rate limits. See https://github.com/NixOS/nixpkgs/issues/358028 Signed-off-by: Sefa Eyeoglu --- nixos/modules/services/misc/renovate.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 9fbd8ec9e1ac..18a0e817b9d7 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -104,7 +104,6 @@ in Group = "renovate"; DynamicUser = true; LoadCredential = lib.mapAttrsToList (name: value: "SECRET-${name}:${value}") cfg.credentials; - Restart = "on-failure"; CacheDirectory = "renovate"; StateDirectory = "renovate"; From 12da01a2e255645ec1623d892fa04ed55fab1ecd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 01:25:41 +0000 Subject: [PATCH 17/96] archipelago-minecraft: 0.5.0 -> 0.5.1 --- pkgs/by-name/ar/archipelago/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index 0bd4d1b6f00a..a805c550e4c6 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -7,10 +7,10 @@ }: let pname = "archipelago"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage"; - hash = "sha256-Dw5BBfCthB9xUJXYmnmIwmqlT/L24QZnKyELLjPGNRA="; + hash = "sha256-/TwmTQtV/6bR95ZQNEcOFQ4t/0otNK8xx5N+yoYaiYk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 157c60782584034855a3093234dc86398b4901a7 Mon Sep 17 00:00:00 2001 From: unlsycn Date: Wed, 27 Nov 2024 04:40:56 +0000 Subject: [PATCH 18/96] mill: 0.12.2 -> 0.12.3 Signed-off-by: unlsycn --- pkgs/by-name/mi/mill/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index e5aa59546be2..c54a0fd1f76b 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-F2ZBywZOdrrDPgpBCXkMrelZEzzqceTQuH3ww8IH4Ns="; + hash = "sha256-hqzAuYadCciYPs/b6zloLUfrWF4rRtlBSMxSj7tLg7g="; }; nativeBuildInputs = [ makeWrapper ]; From 27759f6798ae1b033e480647ca1f86d5cac2149f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 05:01:34 +0000 Subject: [PATCH 19/96] pt2-clone: 1.70 -> 1.71 --- pkgs/by-name/pt/pt2-clone/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index 0cbb64e6dcad..c04c51554328 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.70"; + version = "1.71"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-oGdgvyVIqM4YVxyr5DFBJ+YLtH95vqbNv0arD9yskdo="; + sha256 = "sha256-wyiY4qiWnisWKjBmkZSbmndJMMtogAQ+MWu4VLHROY0="; }; nativeBuildInputs = [ cmake ]; From bf239275a27478114c0e75750a34844424a57ab2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 27 Nov 2024 13:41:24 +0100 Subject: [PATCH 20/96] libblake3: 1.5.4 -> 1.5.5 Diff: https://github.com/BLAKE3-team/BLAKE3/compare/refs/tags/1.5.4...1.5.5 --- pkgs/by-name/li/libblake3/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index bd03de8f4956..6fcc0231d706 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -3,31 +3,21 @@ stdenv, cmake, fetchFromGitHub, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-WatbhExS0j2neYsrfbNhYxrckLiXHwQBjctuowtQW+U="; + hash = "sha256-2M8OQNmtWwfDcbZYspaxpGz2clpfILru//4+P6dClNw="; }; sourceRoot = finalAttrs.src.name + "/c"; - patches = [ - # Fix pkg-config for absolute CMAKE_INSTALL_*DIR - (fetchpatch { - url = "https://github.com/BLAKE3-team/BLAKE3/commit/aa3e8ec32a389461babde3789d6ac50ee3c38662.patch"; - hash = "sha256-V8o85EnRoqYvatqYwdr7h2TBwSOSlKrqfJWPPkQhU+c="; - stripLen = 1; - }) - ]; - nativeBuildInputs = [ cmake ]; From df146dcf5ca24ce21379da4af7caefd36982f5d6 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Wed, 27 Nov 2024 15:45:40 +0000 Subject: [PATCH 21/96] bibata-cursors: fix normal variant --- pkgs/by-name/bi/bibata-cursors/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix index dda08f8f8c8b..b6bfe4630fd2 100644 --- a/pkgs/by-name/bi/bibata-cursors/package.nix +++ b/pkgs/by-name/bi/bibata-cursors/package.nix @@ -28,13 +28,13 @@ stdenvNoCC.mkDerivation rec { buildPhase = '' runHook preBuild - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Amber -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.' - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Classic -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata cursors.' - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Ice -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata cursors.' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Amber -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge Bibata XCursors' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Classic -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata XCursors' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Ice -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata XCursors' - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Amber -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata cursors.' - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Classic -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata cursors.' - ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Ice -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata cursors.' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Amber -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata XCursors' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Classic -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata XCursors' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Ice -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata XCursors' runHook postBuild ''; From 49ab9e2f2bf2a905f650764da0e6dc1b5199c644 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Wed, 27 Nov 2024 16:03:37 +0000 Subject: [PATCH 22/96] bibata-cursors: build right-hand variant --- pkgs/by-name/bi/bibata-cursors/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix index b6bfe4630fd2..e450314cef1c 100644 --- a/pkgs/by-name/bi/bibata-cursors/package.nix +++ b/pkgs/by-name/bi/bibata-cursors/package.nix @@ -32,10 +32,18 @@ stdenvNoCC.mkDerivation rec { ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Classic -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata XCursors' ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Ice -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Amber-Right -n 'Bibata-Modern-Amber-Right' -c 'Yellowish and rounded edge right-hand Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Classic-Right -n 'Bibata-Modern-Classic-Right' -c 'Black and rounded edge right-hand Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Modern-Ice-Right -n 'Bibata-Modern-Ice-Right' -c 'White and rounded edge right-hand Bibata XCursors' + ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Amber -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata XCursors' ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Classic -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata XCursors' ctgen configs/normal/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Ice -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Amber-Right -n 'Bibata-Original-Amber-Right' -c 'Yellowish and sharp edge right-hand Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Classic-Right -n 'Bibata-Original-Classic-Right' -c 'Black and sharp edge right-hand Bibata XCursors' + ctgen configs/right/x.build.toml -p x11 -d $bitmaps/Bibata-Original-Ice-Right -n 'Bibata-Original-Ice-Right' -c 'White and sharp edge right-hand Bibata XCursors' + runHook postBuild ''; From e687982294c593d1a756fe2e3ae7c13e3d96b7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 27 Nov 2024 18:29:33 +0100 Subject: [PATCH 23/96] fastly: 10.16.0 -> 10.17.0 --- pkgs/misc/fastly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index ed499cddd0e6..75ad66776bf5 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.16.0"; + version = "10.17.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-CDqv0umkG7VVhP6M3uuxIhifgHA4UDWtCUJZsXCLGfc="; + hash = "sha256-auCKY8dpA9MPzDN3laTLP6rwNxSHuAlTxjEWErLBJMs="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, From c33e7bf9b4e04674622fcbdf3330e02cd5c3af24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 27 Nov 2024 18:36:58 +0100 Subject: [PATCH 24/96] wasm-tools: 1.220.0 -> 1.221.0 --- pkgs/by-name/wa/wasm-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 601b10ea5527..05bd322aa24a 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.220.0"; + version = "1.221.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-gXwdY75tTx57khF52LfNTIbacP53uxr/+YSc2zFiGSk="; + hash = "sha256-tb2WHY0UMGPURQ1l8gPQK52TothUhmM8pSbtGumQz9Q="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-bnFkeIzn8hHU7ABli8CVs+HeECqgc28nCKvdGN0Hr8s="; + cargoHash = "sha256-KvI+KexELxqeT1luyCHjOSVxNRv+p1nDW4/nlVoxsZ4="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ] ++ # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820 From e893090d19ebdef3de30537d0bd2d08d42c39d12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 18:42:14 +0000 Subject: [PATCH 25/96] blackfire: 2.28.13 -> 2.28.20 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index af4f83d54bae..bf8d7c818667 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.13"; + version = "2.28.20"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "cNzmvdsFkDj2W4KG8ZxVY2mfRHTAgq+XOTQtnl3UwvU="; + sha256 = "Xr7LILxFVUMq37rHHbzjqgjlnC/XHVTtnyCIBVwOwW8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "ZJ2fNJ2W66u0E48wgUO/XlsHSfifhcikb0LG2JncWJ0="; + sha256 = "fnyz1+lsLJQb42Oh17/dFfaSp1FFfr1k/EzpOGTZdRs="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "PculxxgMBMpUCsKB2YCQKZ7s8SrT2rIY7La1s8mCQ4g="; + sha256 = "17iHlezCAG1lnN+YYEXIeX9TkJ+7eDPgA0p0byIVlZE="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "FVQrzZr0LBSLmcK8k3QIWQiCk9WMVXOJY2MNW+w/1g8="; + sha256 = "5bMOk02OY60LR9QMMXuiUP5mJvJBkxPHT+n5QUN41dQ="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "/MCihH97/W8iMsW10EMdSaj+ZWBigaWDF3GR2WYnh+A="; + sha256 = "QB+Ie6oArBnNQ3AtQV46/ZXcuH1WLGZQb7U0pv/K+Sw="; }; }; From 656e285fa35c879dc49b97d68046bea26ee395f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 20:14:18 +0000 Subject: [PATCH 26/96] tenv: 3.1.0 -> 3.2.10 --- pkgs/by-name/te/tenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 480f5b46ab97..8e76ac0c2408 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tenv"; - version = "3.1.0"; + version = "3.2.10"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-nZhJgkXP4ZdVp244bdOswwEOTeH/HopFrQN/A0L+W/k="; + hash = "sha256-EiWajXUQTK8xJoehpq+LWdjy84+lB7oilFM1v59F/30="; }; - vendorHash = "sha256-yhGqKuHHiSW6exPuKGFzeDO9GEc/S8XGkGNhPM1gXgQ="; + vendorHash = "sha256-YC6LCrrxw9gZMc/ow628lL9KbePM8RhiAjLZ7HG2FY8="; # Tests disabled for requiring network access to release.hashicorp.com doCheck = false; From 25bc2d8c4503f76ec6be3f3ce860ed4945b9224f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 22:39:37 +0000 Subject: [PATCH 27/96] crossplane-cli: 1.17.1 -> 1.18.0 --- pkgs/by-name/cr/crossplane-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index f9391a02f620..66b0fd3e7592 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "crossplane-cli"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${version}"; - hash = "sha256-zcORVw+6QUucxJkHx/QWOHn50fd4+Jp+ZtiGuwfEQ6I="; + hash = "sha256-4EdYFrYh8bVCOXc7coq7WfZk0Be9rghdvNlOYFn6bm4="; }; - vendorHash = "sha256-de9xt3aFmGDddwMO2GgKKKmSfvsfnpit3wUrBme//fI="; + vendorHash = "sha256-Am41aAV1AlKOIrC11byqshMDGjzzg7mGI4kARwLINl8="; ldflags = [ "-s" From 470dff29fa797cdb019eb387649cd871b6975142 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 01:42:08 +0000 Subject: [PATCH 28/96] factoriolab: 3.8.1 -> 3.8.4 --- pkgs/by-name/fa/factoriolab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 22faaf4f3e63..5cc8c918000a 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.8.1"; + version = "3.8.4"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; rev = "refs/tags/v${version}"; - hash = "sha256-ZI7nit+DBc1ULGDpGlee7v+NrHc5JhS7sgACGG5fB7I="; + hash = "sha256-zgRarlzTQr2HgiQdCvh6N2yM5FS66jFgQcOyaQUbAQY="; }; buildInputs = [ vips ]; nativeBuildInputs = [ From 134d72cd4c4b0101c3e98975358c4752345655ce Mon Sep 17 00:00:00 2001 From: x123 Date: Thu, 28 Nov 2024 07:35:29 +0100 Subject: [PATCH 29/96] phraze: 0.3.15 -> 0.3.17 --- pkgs/by-name/ph/phraze/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index aba0a4013b40..e03be9e7f442 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "phraze"; - version = "0.3.15"; + version = "0.3.17"; src = fetchFromGitHub { owner = "sts10"; repo = "phraze"; rev = "v${version}"; - hash = "sha256-gpdXgR7TK3xJHHXcZdfMZApA3SvtNmCroi/5ChfrQOs="; + hash = "sha256-r+d2npf9qtAiAuqDhw0sZm6aIcGdsppWXLEJctZsyEg="; }; doCheck = true; - cargoHash = "sha256-tYQ/kcwCNAcgEUmwrrdogLd1AugBnVfqaLX9fjjpOUE="; + cargoHash = "sha256-OFD3wSKQ3BCQfTCy5fjVxRJufvTVO97qLhKq6jwatfQ="; nativeBuildInputs = [ installShellFiles ]; From b26135cd5c8b37a33d69d74917837aef17d1d05c Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Thu, 28 Nov 2024 16:34:07 +0900 Subject: [PATCH 30/96] cargo-feature: fix build failure --- pkgs/by-name/ca/cargo-feature/package.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix index 81f0a1c62bb6..469099900219 100644 --- a/pkgs/by-name/ca/cargo-feature/package.nix +++ b/pkgs/by-name/ca/cargo-feature/package.nix @@ -1,4 +1,10 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + libiconv, +}: rustPlatform.buildRustPackage rec { pname = "cargo-feature"; @@ -15,13 +21,22 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; + checkFlags = [ + # The following tests require empty CARGO_BUILD_TARGET env variable, but we + # set it ever since https://github.com/NixOS/nixpkgs/pull/298108. + "--skip=add_target_feature" + "--skip=list_optional_deps_as_feature" + ]; + meta = with lib; { description = "Cargo plugin to manage dependency features"; mainProgram = "cargo-feature"; homepage = "https://github.com/Riey/cargo-feature"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ riey matthiasbeyer ]; + maintainers = with maintainers; [ + riey + matthiasbeyer + ]; }; } - From bc563dea3274bffc7af7fca6abd67b42b6e6cfa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 09:10:36 +0100 Subject: [PATCH 31/96] python312Packages.types-awscrt: 0.23.0 -> 0.23.1 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.23.1 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index a783600fc5de..ff987b2deb25 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w="; + hash = "sha256-ogtCXauyWLw9B6Xn3lA/2VWN0VQtct55bnTkAsbUk7I="; }; build-system = [ setuptools ]; From 9a4eeca7a67653009daca66f3676fbe215525fd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 09:16:23 +0100 Subject: [PATCH 32/96] python312Packages.withings-sync: 4.2.5 -> 4.2.6 Diff: https://github.com/jaroslawhartman/withings-sync/compare/refs/tags/v4.2.5...v4.2.6 Changelog: https://github.com/jaroslawhartman/withings-sync/releases/tag/v4.2.6 --- .../development/python-modules/withings-sync/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 8f1468ab3993..928403789a33 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.5"; + version = "4.2.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "jaroslawhartman"; repo = "withings-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-4gxJwe8v4trTysGBNORX7C54EUzFIPwpVLfKSNxJ8y4="; + hash = "sha256-rljzE/sEVBqG2vWcKmoC2fm9I06onMmDkf60rkq9k3g="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'read(".VERSION")' '"${version}"' + ''; + build-system = [ setuptools ]; dependencies = [ From 0419cb537e6e60c40463a8664a8becec3bd7444d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 27 Nov 2024 20:29:50 +0800 Subject: [PATCH 33/96] python312Packages.django-rest-registration: fix build --- .../django-rest-registration/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index b62c60d70372..2644da1d606f 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -7,23 +7,27 @@ pytest-django, pytestCheckHook, pythonOlder, + jwt, + setuptools, }: buildPythonPackage rec { pname = "django-rest-registration"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "apragacz"; - repo = pname; + repo = "django-rest-registration"; rev = "refs/tags/v${version}"; hash = "sha256-EaS1qN7GpfPPeSLwwQdVWSRO2dv0DG5LD7vnXckz4Bg="; }; - propagatedBuildInputs = [ + dependencies = [ django djangorestframework ]; @@ -31,6 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django + jwt ]; pythonImportsCheck = [ "rest_registration" ]; @@ -42,11 +47,11 @@ buildPythonPackage rec { "test_coreapi_autoschema_success" ]; - meta = with lib; { + meta = { description = "User-related REST API based on the awesome Django REST Framework"; homepage = "https://github.com/apragacz/django-rest-registration/"; changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ sephi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sephi ]; }; } From 009616cc4db6307ee153e32dd3eb9456d5be0f43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 11:37:39 +0000 Subject: [PATCH 34/96] php81Extensions.blackfire: 1.92.25 -> 1.92.28 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index fe07298b47f3..eee55e34faeb 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.25"; + version = "1.92.28"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-owV7Eo/2Qszm5alNppm6DHS7YLZyFDHnQ//jRfM+m1s="; - "8.2" = "sha256-1eECdIo+eET5tZz9neuC8WRtuJpNbJz+A2i0J9lqnms="; - "8.3" = "sha256-rfY849xL5AjWNtzzLIud+8+JWuOpmhNM7pdpR1tnNmo="; + "8.1" = "sha256-zJ6SOBGLzu3C47P9BrQCQjPVSpZq3PPLPfhXjL7Rnns="; + "8.2" = "sha256-jiHmAs2O047sjOzOTk/k2VQXBz6OT+kBlTElW3TSZjU="; + "8.3" = "sha256-yop48pyCT/904Sh9hQTCVagc38giLDDZJebtdTRQV3w="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-b3Dy18FawjtuiASwYCdS1Q5gOv1WSx6f3ESwow8wj4E="; - "8.2" = "sha256-vFNT/KR1RkxsYwjxLZewSYv2MbG1P7qdcxwzGZho7as="; - "8.3" = "sha256-TtsWgvrw4orrOFTuWPaPlS3LT9d101HiCGIrBKz4MaI="; + "8.1" = "sha256-wK/P+4K0fmyzIsrp360TaNSxiols5KVIvMY6ABdXN+s="; + "8.2" = "sha256-jJId/K7+27UbCMeWwT1Z0sMOe6Uj2Gw6FgBTv794rwQ="; + "8.3" = "sha256-Am8UKQCxAn2up4laZ/u55vVKIJSdunuc85amSWQg8wI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-bCS3gfUDr68KKmWy73G9ripYlCTAZuMssThyEDCGDgM="; - "8.2" = "sha256-FQlfdsVeClSLLCJqQPp0fo1CqpshkTo1iUw/9QI9JBc="; - "8.3" = "sha256-cThRmDf1HTaCT/KuvT3TMcmsCMky407p9u3hwtGtWDQ="; + "8.1" = "sha256-JtEKfZnPqWCBUUHrhlnc/My+zllVySiJlsgdSYP3s5A="; + "8.2" = "sha256-FMd17GarNGlCO5a9X4I1SVo0qKIjsBaJMtLCcoi/uvk="; + "8.3" = "sha256-ZFckNiN0cAQEoc7m53MH/fiTNrWTLzIDzjpvsSbd0Xo="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-ZbUUtljjvQ0dcly/eTovTECTZn9OOcx3VDe1gKEICyA="; - "8.2" = "sha256-8xjs5IrsdbcjmTfni/hbtN+qFmnUgFK3KG8ntbNgBeI="; - "8.3" = "sha256-kDf+5rATt6/DMH5zZoom2Y5j/6CFFj8claJHlMq285o="; + "8.1" = "sha256-fI1ACatqdKQJqh5fBWC1ikLUEsXfqegJlJWUDQYiI2w="; + "8.2" = "sha256-BhSL2ee1viVKoS3R1F/kuHgzyojDk3Pxrvor/xQ3b+4="; + "8.3" = "sha256-fZk0n/nUSOyQNXhUObGwZj0n7MBM7RS86ShKkEfRDws="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-i1QxRGump5G3eMKjXFokqRr9FD6wsdPoUbjE7w3/a0A="; - "8.2" = "sha256-O7L4LgAbLRsz/F+esGwwnxAdD1gT30QEy3FEOQxTNu0="; - "8.3" = "sha256-a5oCtzCb8T/bA5GOOfyN7dMzeK29ZUBZceEnlqme41I="; + "8.1" = "sha256-YglriIPnixhsg1wlLHyu17CUETVEPOenu41Gq7maewU="; + "8.2" = "sha256-zvucvA2w1gQMApud2ozIK5BY4noSUooruRXjevELeBw="; + "8.3" = "sha256-hMRZHO4sVZCVHBifyVAD2b59Be8teqx+/QKH+ytQKuI="; }; }; }; From 9dea01228a5a1867391dff56e92a64b88d3fd09f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Nov 2024 10:55:51 -0500 Subject: [PATCH 35/96] anki-sync-server: fix cross compilation --- pkgs/games/anki/sync-server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/sync-server.nix b/pkgs/games/anki/sync-server.nix index 0b351ae3ffad..6ef2c3279b81 100644 --- a/pkgs/games/anki/sync-server.nix +++ b/pkgs/games/anki/sync-server.nix @@ -6,7 +6,7 @@ , openssl , pkg-config -, protobuf +, buildPackages }: rustPlatform.buildRustPackage { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { "--skip=scheduler::answering::test::state_application" ]; - nativeBuildInputs = [ protobuf pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage { darwin.apple_sdk.frameworks.SystemConfiguration ]; - env.PROTOC = lib.getExe protobuf; + env.PROTOC = lib.getExe buildPackages.protobuf; meta = with lib; { description = "Standalone official anki sync server"; From 1bca51002363052af0c52e5867494c583476b87c Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 15:04:29 +0000 Subject: [PATCH 36/96] mpvScripts: Use `lib.packagesFromDirectoryRecursive` As a side-effect, scripts built from the same repo are now grouped into attrsets. Aliases for the current scripts were added. --- pkgs/applications/video/mpv/default.nix | 2 +- .../mpv/{scripts/default.nix => scripts.nix} | 87 ++++++------------- pkgs/applications/video/mpv/scripts/mpv.nix | 26 +++--- .../video/mpv/scripts/occivink.nix | 28 +++--- 4 files changed, 56 insertions(+), 87 deletions(-) rename pkgs/applications/video/mpv/{scripts/default.nix => scripts.nix} (51%) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 30a3fa8be994..e66f19778605 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -282,7 +282,7 @@ stdenv.mkDerivation (finalAttrs: { ; wrapper = callPackage ./wrapper.nix { }; - scripts = callPackage ./scripts { }; + scripts = callPackage ./scripts.nix { }; tests = { inherit (nixosTests) mpv; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts.nix similarity index 51% rename from pkgs/applications/video/mpv/scripts/default.nix rename to pkgs/applications/video/mpv/scripts.nix index 5e3d3aa4e3ab..06df10beecd5 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts.nix @@ -82,69 +82,31 @@ let scope = self: - let - inherit (self) callPackage; - in - lib.mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests ( - lib.recurseIntoAttrs { - inherit (callPackage ./mpv.nix { }) - acompressor - autocrop - autodeint - autoload - ; - inherit (callPackage ./occivink.nix { }) - blacklistExtensions - crop - encode - seekTo - ; - - buildLua = callPackage ./buildLua.nix { }; - autosub = callPackage ./autosub.nix { }; - autosubsync-mpv = callPackage ./autosubsync-mpv.nix { }; - chapterskip = callPackage ./chapterskip.nix { }; - convert = callPackage ./convert.nix { }; - cutter = callPackage ./cutter.nix { }; - dynamic-crop = callPackage ./dynamic-crop.nix { }; - evafast = callPackage ./evafast.nix { }; - inhibit-gnome = callPackage ./inhibit-gnome.nix { }; - memo = callPackage ./memo.nix { }; - manga-reader = callPackage ./manga-reader.nix { }; - modernx = callPackage ./modernx.nix { }; - modernx-zydezu = callPackage ./modernx-zydezu.nix { }; - mpris = callPackage ./mpris.nix { }; - mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; - mpv-discord = callPackage ./mpv-discord.nix { }; - mpv-notify-send = callPackage ./mpv-notify-send.nix { }; - mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; - mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; - mpv-slicing = callPackage ./mpv-slicing.nix { }; - mpv-subtitle-lines = callPackage ./mpv-subtitle-lines.nix { }; - mpv-webm = callPackage ./mpv-webm.nix { }; - mpvacious = callPackage ./mpvacious.nix { }; - quack = callPackage ./quack.nix { }; - quality-menu = callPackage ./quality-menu.nix { }; - reload = callPackage ./reload.nix { }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; - smart-copy-paste-2 = callPackage ./smart-copy-paste-2.nix { }; - smartskip = callPackage ./smartskip.nix { }; - sponsorblock = callPackage ./sponsorblock.nix { }; - sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; - thumbfast = callPackage ./thumbfast.nix { }; - thumbnail = callPackage ./thumbnail.nix { }; - uosc = callPackage ./uosc.nix { }; - videoclip = callPackage ./videoclip.nix { }; - visualizer = callPackage ./visualizer.nix { }; - vr-reversal = callPackage ./vr-reversal.nix { }; - webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - youtube-chat = callPackage ./youtube-chat.nix { }; - youtube-upnext = callPackage ./youtube-upnext.nix { }; + with lib; + pipe + { + inherit (self) callPackage; + directory = ./scripts; } - ); + [ + packagesFromDirectoryRecursive + recurseIntoAttrs + (mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests) + ]; - aliases = { + mkAliases = self: { + inherit (self.mpv) + acompressor + autocrop + autodeint + autoload + ; # added 2024-11-28 + inherit (self.occivink) + blacklistExtensions + crop + encode + seekTo + ; # added 2024-11-28 youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 }; in @@ -153,6 +115,9 @@ lib.pipe scope [ (lib.makeScope newScope) ( self: + let + aliases = mkAliases self; + in assert builtins.intersectAttrs self aliases == { }; self // lib.optionalAttrs config.allowAliases aliases ) diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix index a81ac77686d5..5e0af3403fb2 100644 --- a/pkgs/applications/video/mpv/scripts/mpv.nix +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -25,18 +25,20 @@ let } args ); in -lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { - acompressor.meta = { - description = "Script to toggle and control ffmpeg's dynamic range compression filter"; - maintainers = with lib.maintainers; [ nicoo ]; - }; +lib.recurseIntoAttrs ( + lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { + acompressor.meta = { + description = "Script to toggle and control ffmpeg's dynamic range compression filter"; + maintainers = with lib.maintainers; [ nicoo ]; + }; - autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video"; + autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video"; - autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video"; + autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video"; - autoload.meta = { - description = "This script automatically loads playlist entries before and after the currently played file"; - maintainers = [ lib.maintainers.dawidsowa ]; - }; -} + autoload.meta = { + description = "This script automatically loads playlist entries before and after the currently played file"; + maintainers = [ lib.maintainers.dawidsowa ]; + }; + } +) diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index f9fe912a612f..cadb4933e9b5 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -42,19 +42,21 @@ let in buildLua (lib.attrsets.recursiveUpdate self args); in -lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { +lib.recurseIntoAttrs ( + lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { - # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` - crop.meta.description = "Crop the current video in a visual manner"; - seekTo.meta.description = "Mpv script for seeking to a specific position"; - blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension"; + # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` + crop.meta.description = "Crop the current video in a visual manner"; + seekTo.meta.description = "Mpv script for seeking to a specific position"; + blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension"; - encode = { - meta.description = "Make an extract of the video currently playing using ffmpeg"; + encode = { + meta.description = "Make an extract of the video currently playing using ffmpeg"; - postPatch = '' - substituteInPlace scripts/encode.lua \ - --replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg}"' - ''; - }; -} + postPatch = '' + substituteInPlace scripts/encode.lua \ + --replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg}"' + ''; + }; + } +) From 3f7d6de841ca6a3f00c5866771c013a064efd400 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Nov 2024 10:56:57 -0500 Subject: [PATCH 37/96] anki-sync-server: use new darwin sdk pattern, format with nixfmt --- pkgs/games/anki/sync-server.nix | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/games/anki/sync-server.nix b/pkgs/games/anki/sync-server.nix index 6ef2c3279b81..a312887f5d27 100644 --- a/pkgs/games/anki/sync-server.nix +++ b/pkgs/games/anki/sync-server.nix @@ -1,12 +1,11 @@ -{ lib -, stdenv -, rustPlatform -, anki -, darwin +{ + lib, + rustPlatform, + anki, -, openssl -, pkg-config -, buildPackages + openssl, + pkg-config, + buildPackages, }: rustPlatform.buildRustPackage { @@ -30,22 +29,21 @@ rustPlatform.buildRustPackage { "--skip=scheduler::answering::test::state_application" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; env.PROTOC = lib.getExe buildPackages.protobuf; - meta = with lib; { + meta = { description = "Standalone official anki sync server"; homepage = "https://apps.ankiweb.net"; - license = with licenses; [ agpl3Plus ]; - maintainers = with maintainers; [ martinetd ]; + license = with lib.licenses; [ agpl3Plus ]; + maintainers = with lib.maintainers; [ martinetd ]; mainProgram = "anki-sync-server"; }; } From e7535d9bc9b06377cfb61ba937246a7c5c3a3884 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 15:05:43 +0000 Subject: [PATCH 38/96] =?UTF-8?q?mpvScripts:=20mpv=20=E2=86=92=20builtins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts.nix | 2 +- pkgs/applications/video/mpv/scripts/{mpv.nix => builtins.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/video/mpv/scripts/{mpv.nix => builtins.nix} (100%) diff --git a/pkgs/applications/video/mpv/scripts.nix b/pkgs/applications/video/mpv/scripts.nix index 06df10beecd5..151674c8a958 100644 --- a/pkgs/applications/video/mpv/scripts.nix +++ b/pkgs/applications/video/mpv/scripts.nix @@ -95,7 +95,7 @@ let ]; mkAliases = self: { - inherit (self.mpv) + inherit (self.builtins) acompressor autocrop autodeint diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/builtins.nix similarity index 100% rename from pkgs/applications/video/mpv/scripts/mpv.nix rename to pkgs/applications/video/mpv/scripts/builtins.nix From 542b211fa736e6b6f296eb1e5a555d103626bfc4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Nov 2024 10:58:41 -0500 Subject: [PATCH 39/96] bear: fix cross compilation, set strictDeps --- pkgs/by-name/be/bear/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/bear/package.nix b/pkgs/by-name/be/bear/package.nix index 01d7560b9302..32fe7f95435d 100644 --- a/pkgs/by-name/be/bear/package.nix +++ b/pkgs/by-name/be/bear/package.nix @@ -31,10 +31,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ninja pkg-config + grpc + protobuf ]; buildInputs = [ @@ -72,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: { # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" - (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.doCheck) - (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.finalPackage.doCheck) ]; checkTarget = lib.concatStringsSep " " [ From 9941229fd90d5ebb4b1427ef636b3c60d3a245ca Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Nov 2024 11:00:41 -0500 Subject: [PATCH 40/96] bear: use lib.cmakeFeature, drop with lib --- pkgs/by-name/be/bear/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/be/bear/package.nix b/pkgs/by-name/be/bear/package.nix index 32fe7f95435d..98e64fe535f5 100644 --- a/pkgs/by-name/be/bear/package.nix +++ b/pkgs/by-name/be/bear/package.nix @@ -74,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Build system and generated files concatenate install prefix and # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.finalPackage.doCheck) ]; @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { # Functional tests use loopback networking. __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Tool that generates a compilation database for clang tooling"; mainProgram = "bear"; longDescription = '' @@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: { and run `bear make`. It's not perfect, but it gets a long way. ''; homepage = "https://github.com/rizsotto/Bear"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ DieracDelta ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ DieracDelta ]; }; }) From c52537868cc300c944d04fb1dfd5096e8f427402 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 28 Nov 2024 17:28:43 +0100 Subject: [PATCH 41/96] =?UTF-8?q?ocamlPackages.sedlex:=203.2=20=E2=86=92?= =?UTF-8?q?=203.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/sedlex/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 53a3c718ed6e..480083d6253a 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -11,8 +11,8 @@ let param = if lib.versionAtLeast ppxlib.version "0.26.0" then { - version = "3.2"; - sha256 = "sha256-5Vf1LRhSotNpTPzHmRgCMRYtrpgaspLlyzv1XdGt+u8="; + version = "3.3"; + sha256 = "sha256-33eJKVdoR4mlWdPZUdjQ26w+kuQWoUN68+bxy2o+Pjs="; } else { version = "2.5"; @@ -21,20 +21,20 @@ let param = ; in let - unicodeVersion = "15.0.0"; + unicodeVersion = "16.0.0"; baseUrl = "https://www.unicode.org/Public/${unicodeVersion}"; DerivedCoreProperties = fetchurl { url = "${baseUrl}/ucd/DerivedCoreProperties.txt"; - sha256 = "sha256-02cpC8CGfmtITGg3BTC90aCLazJARgG4x6zK+D4FYo0="; + sha256 = "sha256-OdNRYfKVRJf2ngi9uecBST9Haj0wIi3iACj+2jbB2r0="; }; DerivedGeneralCategory = fetchurl { url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt"; - sha256 = "sha256-/imkXAiCUA5ZEUCqpcT1Bn5qXXRoBhSK80QAxIucBvk="; + sha256 = "sha256-dnardVpB74IQhGAjhWnmCtZcGR3a/mGzbGdl7BNT8pM="; }; PropList = fetchurl { url = "${baseUrl}/ucd/PropList.txt"; - sha256 = "sha256-4FwKKBHRE9rkq9gyiEGZo+qNGH7huHLYJAp4ipZUC/0="; + sha256 = "sha256-U9YUUI4qCyMFqKohzWDZk96TJs32WZNmDfzORQNUhYM="; }; atLeast31 = lib.versionAtLeast param.version "3.1"; in @@ -43,7 +43,6 @@ buildDunePackage rec { inherit (param) version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-community"; From 8a2c001038cb4fda545361ab542fb4d67d91a96c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Nov 2024 12:01:32 -0500 Subject: [PATCH 42/96] cloudflared: fix cross compilation --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b088f38c580..ad31c861a6f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2144,7 +2144,7 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 buildGoModule = buildGoModule.override { - go = go_1_22.overrideAttrs { + go = buildPackages.go_1_22.overrideAttrs { pname = "cloudflare-go"; version = "1.22.2-devel-cf"; src = fetchFromGitHub { From 543abba9d00b5fd02968f8218955a5a9b2c48ab2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 28 Nov 2024 22:06:30 +0100 Subject: [PATCH 43/96] bazel_7: fix fhsenv version --- .../development/tools/build-managers/bazel/bazel_7/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index aa29308798c3..ba2a84127703 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -159,7 +159,8 @@ let }; bazelFhs = buildFHSEnv { - name = "bazel"; + pname = "bazel"; + inherit version; targetPkgs = _: [ bazelBootstrap ]; runScript = "bazel"; }; From 2330454c04ad11b54a6fb4c68087b4ba949cabf8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:31:40 +0100 Subject: [PATCH 44/96] checkov: 3.2.316 -> 3.2.322 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.316...3.2.322 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.322 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 8c246c084ff8..9982f82da591 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.316"; + version = "3.2.322"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-dPjeKMDRPuT0zh7VXeTvw42YRElorJPEQHjrEllKgfA="; + hash = "sha256-75KNuTCTk5eohTg0M2wrcS9xySDqN1LR6UomF3ZEQmM="; }; patches = [ ./flake8-compat-5.x.patch ]; From 572df3a23383cd1dc61351fe703a9f3c62df3d05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:32:46 +0100 Subject: [PATCH 45/96] exploitdb: 2024-11-16 -> 2024-11-26 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-11-16...2024-11-26 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 91ae39a73c64..7be657f58d96 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-11-16"; + version = "2024-11-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-49xG3mVh5M9MfK4WuU3rc9Q+QlZo7IyV3jwAdBUEmu0="; + hash = "sha256-o95B9zqKGlI1zpknw1yXhiaPIos3DoMCQXmSranf83c="; }; nativeBuildInputs = [ makeWrapper ]; From 3ebbc677637daf6fbff07a13f4a23441e612f2c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:32:51 +0100 Subject: [PATCH 46/96] cnspec: 11.31.1 -> 11.32.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.31.1...v11.32.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.32.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index d0a3624b46bb..cdf66385c103 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.31.1"; + version = "11.32.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-xdnyW9nZSQrTSA6B2dFcKanNVJRcZXgpxLJHsLsL6LQ="; + hash = "sha256-Jret8LFSswdbb6MUEn2RlytWBcARAvk+Sm2EmjCmSig="; }; proxyVendor = true; - vendorHash = "sha256-9/N76JWnzR6/k2yeLR49hpxNfKHgrV7lXVb9pnV/tn8="; + vendorHash = "sha256-+EhNEHLt337G0UAuXvlpz19YQ+q9J8TMv0j9TI8FsxM="; subPackages = [ "apps/cnspec" ]; From 2f682051a9792d1ec038103ff62a58c12accb929 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:33:45 +0100 Subject: [PATCH 47/96] python312Packages.tencentcloud-sdk-python: 3.0.1273 -> 3.0.1274 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1273...3.0.1274 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1274/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 3e621c2a2a6d..02d532fa9072 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1273"; + version = "3.0.1274"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-VuclFe6Msa4vll2X82a1LeKnq28H6xy+HYV3mLKu/jQ="; + hash = "sha256-TVslzZzLzs1B3WBoJVlyNbBj03c5q0YdtGIfxZ25Z2c="; }; build-system = [ setuptools ]; From 81684eba3f5d2d76ef4b442609543d9154012d7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:40:16 +0100 Subject: [PATCH 48/96] python312Packages.boto3-stubs: 1.35.29 -> 1.35.71 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d9c249fef4ad..5cecd18abbbd 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.29"; + version = "1.35.71"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-bl8IL3zQKL3zv8V8nbO3hOD27CIysQSChZqRnWzWv8k="; + hash = "sha256-UOIPp0JIyWs+NJiy2BOIWFWD44ufBgnS+lglfknJhqU="; }; build-system = [ setuptools ]; From dfb9a94013dc24c3c16329fe465fe83c9161e060 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:40:20 +0100 Subject: [PATCH 49/96] python312Packages.botocore-stubs: 1.35.29 -> 1.35.71 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 119c5345ef93..6ac1816a9919 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.29"; + version = "1.35.71"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-QNTPX8Un+604G+GM+DdADW8WiogOJu55TIwE+go+YsU="; + hash = "sha256-xfcgiyCuGUAPpz61aQF/HjcpkPelUFpyEW7WQgkE9mY="; }; nativeBuildInputs = [ setuptools ]; From 3b6448baa5ccdfd9ffbbb7352bbd949f51b41a2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:41:16 +0100 Subject: [PATCH 50/96] python312Packages.neo4j: 5.26.0 -> 5.27.0 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.26.0...5.27.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.27.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 0aa2309df04b..958df3c078b1 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.26.0"; + version = "5.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-4rvs313MU4EXqpnxRZPKy5Z64OJmQnsWRq9T0MIoaOo="; + hash = "sha256-tocgH2LuZ56Yej0lRWYHUkR6aqviQwJqG5P2g4P1+uk="; }; postPatch = '' From 8d41c901450c7ed9e1bb651d0c7a4912dc3ee3f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:47:13 +0100 Subject: [PATCH 51/96] ldeep: 1.0.75 -> 1.0.76 Diff: https://github.com/franc-pentest/ldeep/compare/refs/tags/1.0.75...1.0.76 Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.76 --- pkgs/by-name/ld/ldeep/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index 1a6c3ddd93fc..fecda9ef2c9f 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.75"; + version = "1.0.76"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-WdEOhyWZZRqBZQCNl2vqYiy+sT/gPk3xDpMFVILxmK4="; + hash = "sha256-NVUU1VFUojeQYBHNpOqDCDjuzSUw8j5+uFxaQL1pA2U="; }; pythonRelaxDeps = [ From 3e3d4ca65adaf5f7606d65e979855568c64dd3eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:50:51 +0100 Subject: [PATCH 52/96] trufflehog: 3.84.0 -> 3.84.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.84.0...v3.84.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.84.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 49cfbb338f30..b268cfd0207d 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.84.0"; + version = "3.84.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-r/7mpq5yQCcPoNr4d/3ShR6V+cyX8p2vFcGkiza1WLk="; + hash = "sha256-wwNef5cP9f+kSHkCFYaB5y6sMqVPRqijnzj4gzU2J/E="; }; - vendorHash = "sha256-SNhWDGvLAT2vP43x0chvzyjvpku7YGDvA7P+V175gIg="; + vendorHash = "sha256-awfnzRN6px+DnCU2/8bN1gX4JFJOXgAwsDSlHNb22oU="; proxyVendor = true; From b3e8cfc28b06be0229e2d5c12ce3cc0d96ca9c57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:52:44 +0100 Subject: [PATCH 53/96] greenmask: 0.2.3 -> 0.2.5 Diff: https://github.com/GreenmaskIO/greenmask/compare/refs/tags/v0.2.3...v0.2.5 Changelog: https://github.com/GreenmaskIO/greenmask/releases/tag/v0.2.5 --- pkgs/by-name/gr/greenmask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 53dadf66516d..8ecc7f25c3bd 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; rev = "refs/tags/v${version}"; - hash = "sha256-wAYkr6vCqRQIfZaK31/NSluZZbZYGN5QJkLgdubEGoM="; + hash = "sha256-OysYBoS/y4vKoyYpRlbkTvDaSPIIEM7QGI3lNkvNSGA="; }; vendorHash = "sha256-D4XMEFi0uk6ogdo6+G1k/g16QpHynB1OjdoGcY2fSds="; From bc05d768e3b0cb1f9c6f1d7a641cebd1c8439e6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:54:47 +0100 Subject: [PATCH 54/96] python312Packages.garminconnect: 0.2.21 -> 0.2.23 Diff: https://github.com/cyberjunky/python-garminconnect/compare/refs/tags/0.2.21...0.2.23 Changelog: https://github.com/cyberjunky/python-garminconnect/releases/tag/0.2.23 --- pkgs/development/python-modules/garminconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index e4d5c3fba533..d5e646a89fa9 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.21"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-sSprHu6VCa+VRipmSX/YcfyTe5dKHhNkxmbO9hzNYq8="; + hash = "sha256-rY3jIrCl5y2Pyw7qakUuMtdPTR7e61n5pScPavvBtbM="; }; build-system = [ pdm-backend ]; From 504fcfb198a120242aad30f4d25d6cd225cc348f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 22:55:35 +0100 Subject: [PATCH 55/96] python312Packages.haversine: 2.8.1 -> 2.9.0 Diff: https://github.com/mapado/haversine/compare/refs/tags/v2.8.1...v2.9.0 Changelog: https://github.com/mapado/haversine/blob/v2.9.0/CHANGELOG.md --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 5264545cca5a..a406988c52f1 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.8.1"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mapado"; repo = "haversine"; rev = "refs/tags/v${version}"; - hash = "sha256-MKOg2awpamupvuXstiH7VoIY4ax+hy2h2cFXDFKJ2mA="; + hash = "sha256-KqcDDQdAOnrmiq+kf8rLHy85rNnhatZTOzCCU91lOrU="; }; nativeBuildInputs = [ setuptools ]; From 171142d09cbed4de2c5e90b2cc22e9a8f7ca22f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 23:00:13 +0100 Subject: [PATCH 56/96] python312Packages.checkdmarc: 5.5.0 -> 5.7.8 Changelog: https://github.com/domainaware/checkdmarc/blob/5.7.8/CHANGELOG.md --- .../python-modules/checkdmarc/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 7a1e122b737d..cbc15b287faa 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -6,17 +6,20 @@ expiringdict, fetchFromGitHub, hatchling, + pem, publicsuffixlist, pyleri, + pyopenssl, pytestCheckHook, pythonOlder, requests, timeout-decorator, + xmltodict, }: buildPythonPackage rec { pname = "checkdmarc"; - version = "5.5.0"; + version = "5.7.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,19 +28,24 @@ buildPythonPackage rec { owner = "domainaware"; repo = "checkdmarc"; rev = "refs/tags/${version}"; - hash = "sha256-skQqLWBEmfyiW2DsRRbj3Lfj52QZca0zKenFC7LltjM="; + hash = "sha256-fqSRqiakwFk1Cfb79oOEBbPF/fbtumuV7M6Mjl09Vmw="; }; - nativeBuildInputs = [ hatchling ]; + pythonRelaxDeps = [ "xmltodict" ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ cryptography dnspython expiringdict + pem publicsuffixlist pyleri + pyopenssl requests timeout-decorator + xmltodict ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +56,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access + "testBIMI" "testDMARCPctLessThan100Warning" "testSPFMissingARecord" "testSPFMissingMXRecord" From 51c0f230d5f0c4ee9726e9663a16acbb0341d32c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 23:02:22 +0100 Subject: [PATCH 57/96] python312Packages.halohome: 0.6.0 -> 0.7.0 Diff: https://github.com/nayaverdier/halohome/compare/refs/tags/0.6.0...0.7.0 Changelog: https://github.com/nayaverdier/halohome/blob/0.7.0/CHANGELOG.md --- pkgs/development/python-modules/halohome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/halohome/default.nix b/pkgs/development/python-modules/halohome/default.nix index bbb445b4eb5f..1308fe4658d4 100644 --- a/pkgs/development/python-modules/halohome/default.nix +++ b/pkgs/development/python-modules/halohome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "halohome"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nayaverdier"; repo = "halohome"; rev = "refs/tags/${version}"; - hash = "sha256-oGwg9frE5LaUxmXjwaD0ZtY6D8D7f8tH0knZDaSm+XI="; + hash = "sha256-JOQ2q5lbdVTerXPt6QHBiTG9PzN9LiuLcN+XnOoyYjA="; }; build-system = [ setuptools ]; From 3c268106ae970dbbc5d362be27313e8dfee1a20e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 23:11:22 +0100 Subject: [PATCH 58/96] vunnel: 0.28.0 -> 0.29.0 Diff: https://github.com/anchore/vunnel/compare/refs/tags/v0.28.0...v0.29.0 Changelog: https://github.com/anchore/vunnel/releases/tag/v0.29.0 --- pkgs/by-name/vu/vunnel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index fff20fecc568..70ae55a56075 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-KemiM+dCLSU3a6IIbI9VKtaIeY4SVcHsuE9QwZtzNxU="; + hash = "sha256-oHK855EQglFZrjW30n/z0vgf/NtaXVOcntEWQMcAbDw="; }; pythonRelaxDeps = [ From 421aafb453c14b670fcf83d8f28d5b1fc4557564 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 22:47:09 +0000 Subject: [PATCH 59/96] vkdt: 0.9.0 -> 0.9.1 --- pkgs/by-name/vk/vkdt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vk/vkdt/package.nix b/pkgs/by-name/vk/vkdt/package.nix index 41380271dd7d..acaf09e43977 100644 --- a/pkgs/by-name/vk/vkdt/package.nix +++ b/pkgs/by-name/vk/vkdt/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-LXUTDwUjlfyhtXkYW4Zivqt8vyctoz+ID5AQ7gg+d9A="; + hash = "sha256-+oVPZRI01IxMSPXOjvUXJutYXftQM7GxwVLG8wqoaY4="; }; strictDeps = true; From 913dffe34cee2bec0b9f62abc7bf43946eb45c8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 00:24:47 +0000 Subject: [PATCH 60/96] python312Packages.markdownify: 0.13.1 -> 0.14.1 --- pkgs/development/python-modules/markdownify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 12a3fcac60c6..aa69e9835c95 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "markdownify"; - version = "0.13.1"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "matthewwithanm"; repo = "python-markdownify"; rev = "refs/tags/${version}"; - hash = "sha256-EqQ4DKIGaMNivw9cWCSP/Mh+1YxyTaHGPYRjGxPFOnA="; + hash = "sha256-YJdR1wV72f9/tWQhuhGwScuRcE243fCP+wnYAzBOoV8="; }; build-system = [ From 4f2b642f6cff15be166a11251f3cb7b46f5c443f Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:06:14 +0000 Subject: [PATCH 61/96] apacheAnt: make ant the primary name apacheAnt is unused in the tree; `ant` is more commonly used. --- .github/labeler.yml | 2 +- pkgs/by-name/{ap/apacheAnt => an/ant}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/by-name/{ap/apacheAnt => an/ant}/package.nix (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 34da4f3c8f43..6384e13bdbfc 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -194,7 +194,7 @@ - pkgs/by-name/ma/maven/**/* - doc/languages-frameworks/maven.section.md # Ant - - pkgs/by-name/ap/apacheAnt/**/* + - pkgs/by-name/an/ant/**/* # javaPackages attrset - pkgs/development/java-modules/**/* - pkgs/top-level/java-packages.nix diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/an/ant/package.nix similarity index 100% rename from pkgs/by-name/ap/apacheAnt/package.nix rename to pkgs/by-name/an/ant/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4ff2d475eeb..6fdda136f76d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,6 +111,7 @@ mapAliases { ao = libfive; # Added 2024-10-11 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 + apacheAnt = ant; # Added 2024-11-28 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 aria = aria2; # Added 2024-03-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e806f98b32b..a4915e277edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7804,8 +7804,6 @@ with pkgs; antlr = antlr4; - ant = apacheAnt; - inherit (callPackages ../servers/apache-kafka { }) apacheKafka_3_6 apacheKafka_3_7 From 2538d58436b8d0b56d29780aeebf4bf720ddb9ea Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:08:54 +0000 Subject: [PATCH 62/96] ant: format with nixfmt-rfc-style Also: * Remove a stray unused comment --- pkgs/by-name/an/ant/package.nix | 112 +++++++++++++++++--------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index 785a518edd3b..ad79b1388b6f 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -1,4 +1,11 @@ -{ fetchurl, lib, stdenv, coreutils, makeWrapper, gitUpdater }: +{ + fetchurl, + lib, + stdenv, + coreutils, + makeWrapper, + gitUpdater, +}: stdenv.mkDerivation rec { pname = "ant"; @@ -16,67 +23,66 @@ stdenv.mkDerivation rec { sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; }; - installPhase = - '' - mkdir -p $out/bin $out/lib/ant - mv * $out/lib/ant/ + installPhase = '' + mkdir -p $out/bin $out/lib/ant + mv * $out/lib/ant/ - # Get rid of the manual (35 MiB). Maybe we should put this in a - # separate output. Keep the antRun script since it's vanilla sh - # and needed for the task (but since we set ANT_HOME to - # a weird value, we have to move antRun to a weird location). - # Get rid of the other Ant scripts since we provide our own. - mv $out/lib/ant/bin/antRun $out/bin/ - rm -rf $out/lib/ant/{manual,bin,WHATSNEW} - mkdir $out/lib/ant/bin - mv $out/bin/antRun $out/lib/ant/bin/ + # Get rid of the manual (35 MiB). Maybe we should put this in a + # separate output. Keep the antRun script since it's vanilla sh + # and needed for the task (but since we set ANT_HOME to + # a weird value, we have to move antRun to a weird location). + # Get rid of the other Ant scripts since we provide our own. + mv $out/lib/ant/bin/antRun $out/bin/ + rm -rf $out/lib/ant/{manual,bin,WHATSNEW} + mkdir $out/lib/ant/bin + mv $out/bin/antRun $out/lib/ant/bin/ - # Install ant-contrib. - unpackFile $contrib - cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ + # Install ant-contrib. + unpackFile $contrib + cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ - cat >> $out/bin/ant <> $out/bin/ant <&2 - exit 1 - fi - fi + # Find the JDK by looking for javac. As a fall-back, find the + # JRE by looking for java. The latter allows just the JRE to be + # used with (say) ECJ as the compiler. Finally, allow the GNU + # JVM. + if [ -z "\''${JAVA_HOME-}" ]; then + for i in javac java gij; do + if p="\$(type -p \$i)"; then + export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" + break + fi + done + if [ -z "\''${JAVA_HOME-}" ]; then + echo "\$0: cannot find the JDK or JRE" >&2 + exit 1 + fi + fi - if [ -z \$NIX_JVM ]; then - if [ -e \$JAVA_HOME/bin/java ]; then - NIX_JVM=\$JAVA_HOME/bin/java - elif [ -e \$JAVA_HOME/bin/gij ]; then - NIX_JVM=\$JAVA_HOME/bin/gij - else - NIX_JVM=java - fi - fi + if [ -z \$NIX_JVM ]; then + if [ -e \$JAVA_HOME/bin/java ]; then + NIX_JVM=\$JAVA_HOME/bin/java + elif [ -e \$JAVA_HOME/bin/gij ]; then + NIX_JVM=\$JAVA_HOME/bin/gij + else + NIX_JVM=java + fi + fi - LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" + LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ - -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ - org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ - -cp "\$CLASSPATH" "\$@" - EOF + exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ + -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ + org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ + -cp "\$CLASSPATH" "\$@" + EOF - chmod +x $out/bin/ant - ''; # */ + chmod +x $out/bin/ant + ''; passthru = { updateScript = gitUpdater { From acf1b4900e58af3b914fc491e7e62a1dfffca5a1 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:11:06 +0000 Subject: [PATCH 63/96] .git-blame-ignore-revs: add 2538d58436b8d0b56d29780aeebf4bf720ddb9ea --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 05ce9aec0135..86415c860b42 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -204,5 +204,8 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b # sqlc: format with nixfmt 2bdec131b2bb2c8563f4556d741d34ccb77409e2 +# ant: format with nixfmt-rfc-style +2538d58436b8d0b56d29780aeebf4bf720ddb9ea + # treewide: migrate packages to pkgs/by-name, take 1 571c71e6f73af34a229414f51585738894211408 From 0b87b1feb6024e4ebcc4ad259c4eb1a43e867833 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:11:06 +0000 Subject: [PATCH 64/96] ant: use finalAttrs --- pkgs/by-name/an/ant/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index ad79b1388b6f..bedaa9b13949 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -7,14 +7,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ant"; version = "1.10.15"; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + url = "mirror://apache/ant/binaries/apache-ant-${finalAttrs.version}-bin.tar.bz2"; hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs="; }; @@ -122,4 +122,4 @@ stdenv.mkDerivation rec { maintainers = [ ] ++ lib.teams.java.members; platforms = lib.platforms.all; }; -} +}) From b0fb9d547c02caf9aba427757dd78536d1851342 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 02:41:50 +0000 Subject: [PATCH 65/96] ipfs-cluster: 1.1.1 -> 1.1.2 --- pkgs/by-name/ip/ipfs-cluster/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/ipfs-cluster/package.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix index ebdb19ee5b77..c31e56038412 100644 --- a/pkgs/by-name/ip/ipfs-cluster/package.nix +++ b/pkgs/by-name/ip/ipfs-cluster/package.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.1.1"; + version = "1.1.2"; - vendorHash = "sha256-pCp2ox08wWUdAnqBqoiMLy/qBQg1PsNnMl8nLCNifC8="; + vendorHash = "sha256-y8eE1GYFiHbLY5zeSSQO86I4buZZJROGp7KzXbKjMqI="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-FnofI7IpG0hA9/60cILbQ7xnGKJ2zdYk/pRZPTyOmzA="; + hash = "sha256-CpMnhqRlikKdPT3/tsLpKdKm6icePDsmqEnUEBwvCT0="; }; meta = with lib; { From 33e47243a2d23bcbc7930bab1c97b45578ff3c53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 04:11:12 +0000 Subject: [PATCH 66/96] node-red: 4.0.4 -> 4.0.5 --- pkgs/by-name/no/node-red/package-lock.json | 368 ++++++++------------- pkgs/by-name/no/node-red/package.nix | 6 +- 2 files changed, 147 insertions(+), 227 deletions(-) diff --git a/pkgs/by-name/no/node-red/package-lock.json b/pkgs/by-name/no/node-red/package-lock.json index 9dc012ff7f4e..31124ba8a95d 100644 --- a/pkgs/by-name/no/node-red/package-lock.json +++ b/pkgs/by-name/no/node-red/package-lock.json @@ -1,12 +1,12 @@ { "name": "node-red", - "version": "4.0.4", + "version": "4.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-red", - "version": "4.0.4", + "version": "4.0.5", "license": "Apache-2.0", "dependencies": { "acorn": "8.12.1", @@ -134,13 +134,14 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz", - "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/highlight": "^7.25.7", + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", "picocolors": "^1.0.0" }, "engines": { @@ -148,13 +149,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz", - "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.7", + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -164,9 +166,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz", - "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, "license": "MIT", "engines": { @@ -174,117 +176,23 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz", - "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz", - "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-validator-identifier": "^7.25.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz", - "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.25.7" + "@babel/types": "^7.26.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -294,9 +202,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", - "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -306,32 +214,32 @@ } }, "node_modules/@babel/template": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz", - "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/types": "^7.25.7" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz", - "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/parser": "^7.25.7", - "@babel/template": "^7.25.7", - "@babel/types": "^7.25.7", + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -365,15 +273,14 @@ "license": "MIT" }, "node_modules/@babel/types": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz", - "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.25.7", - "@babel/helper-validator-identifier": "^7.25.7", - "to-fast-properties": "^2.0.0" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -431,9 +338,9 @@ "license": "Apache-2.0" }, "node_modules/@emnapi/core": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.0.tgz", - "integrity": "sha512-9hRqVlhwqBqCoToZ3hFcNVqL+uyHV06Y47ax4UB8L6XgVRqYz7MFnfessojo6+5TK89pKwJnpophwjTMOeKI9Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", + "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", "license": "MIT", "optional": true, "dependencies": { @@ -442,9 +349,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.0.tgz", - "integrity": "sha512-XMBySMuNZs3DM96xcJmLW4EfGnf+uGmFNjzpehMjuX5PLB5j87ar2Zc4e3PVeZ3I5g3tYtAqskB28manlF69Zw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", + "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", "license": "MIT", "optional": true, "dependencies": { @@ -1132,18 +1039,18 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.7.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", - "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", + "version": "22.10.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz", + "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==", "license": "MIT", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~6.20.0" } }, "node_modules/@types/readable-stream": { - "version": "4.0.15", - "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.15.tgz", - "integrity": "sha512-oAZ3kw+kJFkEqyh7xORZOku1YAKvsFTogRY8kVl4vHpEKiDkfnSA/My8haRE7fvmix5Zyy+1pwzOi7yycGLBJw==", + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz", + "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==", "license": "MIT", "dependencies": { "@types/node": "*", @@ -1151,9 +1058,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", + "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "license": "MIT", "dependencies": { "@types/node": "*" @@ -1636,9 +1543,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -2700,9 +2607,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -2742,9 +2649,9 @@ } }, "node_modules/cytoscape": { - "version": "3.30.2", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.2.tgz", - "integrity": "sha512-oICxQsjW8uSaRmn4UK/jkczKOqTrVqt5/1WL0POiJUT2EKNc9STM4hYFHv917yu55aTBMFNRzymlJhVAiWPCxw==", + "version": "3.30.4", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.4.tgz", + "integrity": "sha512-OxtlZwQl1WbwMmLiyPSEBuzeTIQnwZhJYYWFzZ2PhEHVFwpeaqNIkUzSiso00D98qk60l8Gwon2RP304d3BJ1A==", "dev": true, "license": "MIT", "engines": { @@ -3992,10 +3899,10 @@ } }, "node_modules/fast-uri": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz", - "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==", - "license": "MIT" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz", + "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==", + "license": "BSD-3-Clause" }, "node_modules/fastq": { "version": "1.17.1", @@ -6146,9 +6053,9 @@ } }, "node_modules/jsdoc-api/node_modules/jsdoc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", - "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", + "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -6741,14 +6648,14 @@ } }, "node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.1.tgz", + "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==", "dev": true, "license": "MIT", "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" + "mlly": "^1.7.3", + "pkg-types": "^1.2.1" }, "engines": { "node": ">=14" @@ -7384,18 +7291,31 @@ "license": "MIT" }, "node_modules/mlly": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz", - "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.3.tgz", + "integrity": "sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.12.1", + "acorn": "^8.14.0", "pathe": "^1.1.2", - "pkg-types": "^1.2.0", + "pkg-types": "^1.2.1", "ufo": "^1.5.4" } }, + "node_modules/mlly/node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/mocha": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", @@ -7614,9 +7534,9 @@ } }, "node_modules/mqtt-packet": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.0.tgz", - "integrity": "sha512-8v+HkX+fwbodsWAZIZTI074XIoxVBOmPeggQuDFCGg1SqNcC+uoRMWu7J6QlJPqIUIJXmjNYYHxBBLr1Y/Df4w==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.1.tgz", + "integrity": "sha512-koZF1V/X2RZUI6uD9wN5OK1JxxcG1ofAR4H3LjCw1FkeKzruZQ26aAA6v2m1lZyWONZIR5wMMJFrZJDRNzbiQw==", "license": "MIT", "dependencies": { "bl": "^6.0.8", @@ -7987,20 +7907,30 @@ } }, "node_modules/node-red-node-test-helper/node_modules/formidable": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz", - "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz", + "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==", "dev": true, "license": "MIT", "dependencies": { "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", + "hexoid": "^2.0.0", "once": "^1.4.0" }, "funding": { "url": "https://ko-fi.com/tunnckoCore/commissions" } }, + "node_modules/node-red-node-test-helper/node_modules/hexoid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz", + "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/node-red-node-test-helper/node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -8602,9 +8532,9 @@ "license": "MIT" }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -8816,9 +8746,9 @@ "license": "BlueOak-1.0.0" }, "node_modules/package-manager-detector": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.2.tgz", - "integrity": "sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.5.tgz", + "integrity": "sha512-3dS7y28uua+UDbRCLBqltMBrbI+A5U2mI9YuxHRxIWYmLj3DwntEBmERYzIAQ4DMeuCUOBSak7dBHHoXKpOTYQ==", "dev": true, "license": "MIT" }, @@ -9106,9 +9036,9 @@ "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" }, "node_modules/picocolors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", - "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "dev": true, "license": "ISC" }, @@ -10352,9 +10282,9 @@ } }, "node_modules/sort-array/node_modules/typical": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-7.2.0.tgz", - "integrity": "sha512-W1+HdVRUl8fS3MZ9ogD51GOb46xMmhAZzR0WPw5jcgIZQJVvkddYzAl4YTU6g5w33Y1iRQLdIi2/1jhi2RNL0g==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-7.3.0.tgz", + "integrity": "sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==", "dev": true, "license": "MIT", "engines": { @@ -11027,40 +10957,30 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz", - "integrity": "sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz", + "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==", "dev": true, "license": "MIT" }, "node_modules/tldts": { - "version": "6.1.50", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.50.tgz", - "integrity": "sha512-q9GOap6q3KCsLMdOjXhWU5jVZ8/1dIib898JBRLsN+tBhENpBDcAVQbE0epADOjw11FhQQy9AcbqKGBQPUfTQA==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.64.tgz", + "integrity": "sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==", "license": "MIT", "dependencies": { - "tldts-core": "^6.1.50" + "tldts-core": "^6.1.64" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.50", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.50.tgz", - "integrity": "sha512-na2EcZqmdA2iV9zHV7OHQDxxdciEpxrjbkp+aHmZgnZKHzoElLajP59np5/4+sare9fQBfixgvXKx8ev1d7ytw==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.64.tgz", + "integrity": "sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==", "license": "MIT" }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -11123,9 +11043,9 @@ } }, "node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, "node_modules/type-detect": { @@ -11256,9 +11176,9 @@ } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "license": "MIT" }, "node_modules/universalify": { diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix index 91df4684ba47..6d6465e13d32 100644 --- a/pkgs/by-name/no/node-red/package.nix +++ b/pkgs/by-name/no/node-red/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "node-red"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "node-red"; repo = "node-red"; rev = "refs/tags/${version}"; - hash = "sha256-s+3OrTj/VwjnK6Ml+4aSlLo/GcpC6BWmGmxAaj1SsMI="; + hash = "sha256-vasI72dVHarQcLLNypabRQUL/WdcERYWD8PTue5v/DM="; }; - npmDepsHash = "sha256-y3agiGh5qApyjFUkxjgEG+Ztx1FL4IOMaJsS4WwZY/c="; + npmDepsHash = "sha256-f/lh/nA7Ycrqdf0kwOTNTVkjcifh+bzbQNgdqXTfF1Q="; postPatch = let From 4feee538478144418647dc17d844c2943b35182d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 06:25:01 +0000 Subject: [PATCH 67/96] python312Packages.growattserver: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index ba873ae059da..ad142b6c6cae 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-ATxXjIF5QRsdLuXZCOWMwvbBzawrhlYZ+wodITz36sE="; + hash = "sha256-P7HZPmDUQM3DuaGSkAHc0jQBGeurS+KgtdwT7ZJ/8q8="; }; nativeBuildInputs = [ setuptools ]; From 5d55f09c224b6aa4878593a430e8cbee7a6dd4d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 06:48:06 +0000 Subject: [PATCH 68/96] python312Packages.authcaptureproxy: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/authcaptureproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 7aa705244501..98540b643186 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-gdu0Ror/epu6huTEpBrqHD62O9uaL6273pKnpqPKskc="; + hash = "sha256-H5Dl1incS5+lmZaLZXMCOqEIGTcTr4A5J3r3ngpDGtY="; }; nativeBuildInputs = [ poetry-core ]; From d566f2494f0eccc23ed30e232355e772dae1a747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 06:52:03 +0000 Subject: [PATCH 69/96] qadwaitadecorations-qt6: 0.1.5 -> 0.1.6 --- pkgs/by-name/qa/qadwaitadecorations/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix index 1949373f2d1c..bbfeec06f27d 100644 --- a/pkgs/by-name/qa/qadwaitadecorations/package.nix +++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qadwaitadecorations"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QAdwaitaDecorations"; rev = finalAttrs.version; - hash = "sha256-aqjm93tmBfDkmce1WG5xx8MCDCvo6AOrRHArj/+Ko9E="; + hash = "sha256-ZU3cwFwQECh4Z6YcTzD2WooZmJ2nSUABYft3dfakSuY="; }; nativeBuildInputs = [ From 614d7099212871a90e0e117ddc153734f18e66e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Nov 2024 08:10:14 +0100 Subject: [PATCH 70/96] python312Packages.publicsuffixlist: 1.0.2.20241127 -> 1.0.2.20241129 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241129-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 9259bd24e752..d1fa42772f6f 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241127"; + version = "1.0.2.20241129"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RoBtvaWAu9VRNSzbYkFZFEPvbUUu0tc/Z16bxm+ELas="; + hash = "sha256-MPeNx0jW1RLO1HwJqvFKuR4oEjmELA/bGHGDKn93rag="; }; build-system = [ setuptools ]; From 38260c284ce93cc94994d4192a5ba9979db77431 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 07:57:41 +0000 Subject: [PATCH 71/96] python312Packages.python-arango: 8.1.2 -> 8.1.3 --- pkgs/development/python-modules/python-arango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 2242b0b7c891..ed8ded65d5bc 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.2"; + version = "8.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-EK1jZajACdc5IWF/Tgg3albUAH566G0IwUsHk4dZpoQ="; + hash = "sha256-DNcKmjlolku0BiV+4G0TClIMAeBRWg96OZgv601V/LA="; }; nativeBuildInputs = [ From b0bb6ea985671a1d5f93392a9374b48c7047f5f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 08:09:12 +0000 Subject: [PATCH 72/96] glamoroustoolkit: 1.1.7 -> 1.1.8 --- pkgs/by-name/gl/glamoroustoolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index d09dec9a18aa..f28c82283722 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.7"; + version = "1.1.8"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-ji77uc7UnfiDVCERWwDpMnBiSJjDrr84yYrobLhKWlE="; + hash = "sha256-r7q8apszeiON3MPMSY7GHHTh+hSXlAl35pUTxFV78kk="; }; nativeBuildInputs = [ From b04ca6b759bddcd84f4010676388b77acd5735b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 08:10:45 +0000 Subject: [PATCH 73/96] python312Packages.datasette: 0.65 -> 0.65.1 --- pkgs/development/python-modules/datasette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index dbc9828c5803..92959241988e 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.65"; + version = "0.65.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-POdw2vB0D2B5SyrC/HkFqlsMlWtbdC3cRM/cfDhv7Z4="; + hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec="; }; postPatch = '' From e43ca6ae7712fb2216a27dbc302abb2a6fddb272 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 08:27:21 +0000 Subject: [PATCH 74/96] python312Packages.pylint-django: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 170fb0af1d60..9b080c52e730 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pylint-django"; rev = "refs/tags/v${version}"; - hash = "sha256-Rnty8ryKd5PxFFVYcvB8p9VS3qlHCprxR8+/ySY5qC8="; + hash = "sha256-9b0Sbo6E036UmUmP/CVPrS9cxxKtkMMZtqJsI53g4sU="; }; build-system = [ poetry-core ]; From bdf1baf6849de9dc8f0dc6c8eef7720eab33445e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 09:25:48 +0000 Subject: [PATCH 75/96] c2fmzq: 0.4.22 -> 0.4.25 --- pkgs/by-name/c2/c2fmzq/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index a1245ac7b37a..69942a05fdd1 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.22"; + version = "0.4.25"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-IqLG8dLi47Swp6YPxDXsM6LVDPvzcH5rWeqpgghbYsE="; + hash = "sha256-1c2C+BVgf7NumOoCCMfGFpn1qwQ2V4524aG5yZO98vI="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-PTWi/M51cydmWoOj1JPyaI0wbjd0BMLlaSlQRIcmShg="; + vendorHash = "sha256-9eWLg0+HkpwUC+De62Izh3vadV3dnwPpf8ksH8KwGqQ="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; From 8e750424b4cf3848900f5aad7011e226e1521f2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 09:46:58 +0000 Subject: [PATCH 76/96] jumppad: 0.15.0 -> 0.16.0 --- pkgs/by-name/ju/jumppad/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 4ededb4c2832..837d0156018e 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-UO1a8CoHLNoo74zJkzgSlTkB7XWWHWu2EUiqCvLOQj8="; + hash = "sha256-zJS27lguSHvJge/iRwFhm9GtK0t3VQUt+uFZdjgkaeU="; }; - vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw="; + vendorHash = "sha256-kn7rI5XwpqHeK7mA4FT67tLo2edb+dyD+rveVrGIjIo="; subPackages = [ "." ]; From 2deaa487264cb1c1ad0406a7ddcbf8863f84c882 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 29 Nov 2024 11:10:18 +0100 Subject: [PATCH 77/96] nextcloud28Packages: update --- pkgs/servers/nextcloud/packages/28.json | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index b48b3c64342d..0d570221cc1c 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -50,9 +50,9 @@ ] }, "deck": { - "hash": "sha256-XzflNdPCNfOYJkZopxBR6es0Fv9x0kpxtMqOxLthG6o=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.5/deck-v1.12.5.tar.gz", - "version": "1.12.5", + "hash": "sha256-63yeX5w8nOdZuzbICJ6hJCjIHzigBKJToTPoEVPm/EE=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.6/deck-v1.12.6.tar.gz", + "version": "1.12.6", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- šŸ“„ Add your tasks to cards and put them in order\n- šŸ“„ Write down additional notes in Markdown\n- šŸ”– Assign labels for even better organization\n- šŸ‘„ Share with your team, friends or family\n- šŸ“Ž Attach files and embed them in your Markdown description\n- šŸ’¬ Discuss with your team using comments\n- āš” Keep track of changes in the activity stream\n- šŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -70,9 +70,9 @@ ] }, "files_mindmap": { - "hash": "sha256-VsaJT3lsPqnCmgLYkkdLhyIRmi/CumEdezsvhra2NQk=", - "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.30/files_mindmap-0.0.30.tar.gz", - "version": "0.0.30", + "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", + "version": "0.0.31", "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", "homepage": "https://github.com/ACTom/files_mindmap", "licenses": [ @@ -80,9 +80,9 @@ ] }, "forms": { - "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", - "version": "4.3.2", + "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", + "version": "4.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **šŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **šŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **šŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **šŸ§‘ā€šŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **šŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -103,7 +103,7 @@ "hash": "sha256-Plgmnp3fIzvHVcy8+wEmjNHegHqBeUtcbsRA/PHEAlc=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.11/groupfolders-v16.0.11.tar.gz", "version": "16.0.11", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -123,7 +123,7 @@ "hash": "sha256-qU86h6DHNetWOmt7yXCknQ3MBB9KdQ15UDJggqZgWMk=", "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.3/integration_openai-v2.0.3.tar.gz", "version": "2.0.3", - "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nāš ļø Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nāš ļø This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "mail": { - "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", - "version": "3.7.9", + "hash": "sha256-cgwXyqxeZggsd6RhrSPbwim2Yzg7ztWcrEgo3ocFO44=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.13/mail-v3.7.13.tar.gz", + "version": "3.7.13", "description": "**šŸ’Œ A mail app for Nextcloud**\n\n- **šŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files ā€“ more to come.\n- **šŸ“„ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **šŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **šŸ™ˆ Weā€™re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **šŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** šŸŸ¢/šŸŸ”/šŸŸ /šŸ”“\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -220,9 +220,9 @@ ] }, "polls": { - "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", - "version": "7.2.4", + "hash": "sha256-7KSQDY2LXMWEbo3PFH3VMfq819swNnxCT5kiFvHI83s=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.5/polls-v7.2.5.tar.gz", + "version": "7.2.5", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -230,9 +230,9 @@ ] }, "previewgenerator": { - "hash": "sha256-hjlwZfgfoH3iqbtJrPovgBC0Tu/vBhFqC752DZvndFY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.6.0/previewgenerator-v5.6.0.tar.gz", - "version": "5.6.0", + "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", + "version": "5.7.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -240,9 +240,9 @@ ] }, "qownnotesapi": { - "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", - "version": "24.9.0", + "hash": "sha256-ydz8e8ZOLOT60yt55DI0gGpSaLz9sCz5Zyt1jhMYIv0=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.11.0/qownnotesapi-nc.tar.gz", + "version": "24.11.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -320,9 +320,9 @@ ] }, "unsplash": { - "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", - "version": "3.0.1", + "hash": "sha256-hUKpIGvu7aX45Pz/xCssOuyZ7E+kJ4cmqhhycX5DG6A=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.3/unsplash.tar.gz", + "version": "3.0.3", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ From 2d7406c6827a73e5789f5c575b10c4186c6b0f49 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 29 Nov 2024 11:10:32 +0100 Subject: [PATCH 78/96] nextcloud29Packages: update --- pkgs/servers/nextcloud/packages/29.json | 74 ++++++++++++++----------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 7254d237e70d..33995969a6ee 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-48ERJ9DQ9w71encT2XVvcVaV+EbthgExQliKO1sQ+1A=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.0/contacts-v6.0.0.tar.gz", - "version": "6.0.0", + "hash": "sha256-gOOb++cylFsD7dSe5ZOBgTxLgO6Aa3om4q3Y79ElcfI=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.1/contacts-v6.0.1.tar.gz", + "version": "6.0.1", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* šŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar ā€“ more to come.\n* šŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* šŸ‘„ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* šŸ™ˆ **Weā€™re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "hash": "sha256-3vwl+KxYQTDAANdR3XKLU/jv5TbhDZBktKpITJaaGBo=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.2/deck-v1.13.2.tar.gz", - "version": "1.13.2", + "hash": "sha256-yhUkB1IodvWOg2fl+gJW3x68YrG0+eyIrrlpXTFVAwE=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.13.3/deck-v1.13.3.tar.gz", + "version": "1.13.3", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- šŸ“„ Add your tasks to cards and put them in order\n- šŸ“„ Write down additional notes in Markdown\n- šŸ”– Assign labels for even better organization\n- šŸ‘„ Share with your team, friends or family\n- šŸ“Ž Attach files and embed them in your Markdown description\n- šŸ’¬ Discuss with your team using comments\n- āš” Keep track of changes in the activity stream\n- šŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -69,10 +69,20 @@ "agpl" ] }, + "files_mindmap": { + "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", + "version": "0.0.31", + "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", + "homepage": "https://github.com/ACTom/files_mindmap", + "licenses": [ + "agpl" + ] + }, "forms": { - "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", - "version": "4.3.2", + "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", + "version": "4.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **šŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **šŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **šŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **šŸ§‘ā€šŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **šŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,10 +100,10 @@ ] }, "groupfolders": { - "hash": "sha256-/pREdGW7kM2imVx6Jk5iZ9odQpk/93AwkFECVPJhyuI=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.5/groupfolders-v17.0.5.tar.gz", - "version": "17.0.5", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-Mkt6rp/cFSQE6WnSE1Xds57qcuEfEQj3Y//2E6gVI4o=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.6/groupfolders-v17.0.6.tar.gz", + "version": "17.0.6", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -113,7 +123,7 @@ "hash": "sha256-qU86h6DHNetWOmt7yXCknQ3MBB9KdQ15UDJggqZgWMk=", "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v2.0.3/integration_openai-v2.0.3.tar.gz", "version": "2.0.3", - "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nāš ļø Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nāš ļø This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" @@ -130,9 +140,9 @@ ] }, "mail": { - "hash": "sha256-Y591RR3m4k8G0+sNU+hRN013LikCFJ/41SbrILEfp8A=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.9/mail-v3.7.9.tar.gz", - "version": "3.7.9", + "hash": "sha256-cgwXyqxeZggsd6RhrSPbwim2Yzg7ztWcrEgo3ocFO44=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.13/mail-v3.7.13.tar.gz", + "version": "3.7.13", "description": "**šŸ’Œ A mail app for Nextcloud**\n\n- **šŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files ā€“ more to come.\n- **šŸ“„ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **šŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **šŸ™ˆ Weā€™re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **šŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** šŸŸ¢/šŸŸ”/šŸŸ /šŸ”“\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -170,9 +180,9 @@ ] }, "news": { - "hash": "sha256-m2Q+vq7G5oPr9fwIX+65NReaxzcxXehQBQ52T4VrYfw=", - "url": "https://github.com/nextcloud/news/releases/download/25.0.0/news.tar.gz", - "version": "25.0.0", + "hash": "sha256-iQvgyXqOwZrWDoZgXNivxqnSLjNeWm9MLJ9R/Wx/jOg=", + "url": "https://github.com/nextcloud/news/releases/download/25.0.3/news.tar.gz", + "version": "25.0.3", "description": "šŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- šŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- šŸ”„ Automatic updates of your news feeds\n- šŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -220,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", - "version": "7.2.4", + "hash": "sha256-7KSQDY2LXMWEbo3PFH3VMfq819swNnxCT5kiFvHI83s=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.5/polls-v7.2.5.tar.gz", + "version": "7.2.5", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -230,9 +240,9 @@ ] }, "previewgenerator": { - "hash": "sha256-hjlwZfgfoH3iqbtJrPovgBC0Tu/vBhFqC752DZvndFY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.6.0/previewgenerator-v5.6.0.tar.gz", - "version": "5.6.0", + "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", + "version": "5.7.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -240,9 +250,9 @@ ] }, "qownnotesapi": { - "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", - "version": "24.9.0", + "hash": "sha256-ydz8e8ZOLOT60yt55DI0gGpSaLz9sCz5Zyt1jhMYIv0=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.11.0/qownnotesapi-nc.tar.gz", + "version": "24.11.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -320,9 +330,9 @@ ] }, "unsplash": { - "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", - "version": "3.0.1", + "hash": "sha256-hUKpIGvu7aX45Pz/xCssOuyZ7E+kJ4cmqhhycX5DG6A=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.3/unsplash.tar.gz", + "version": "3.0.3", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ From 98bbdd1246eb06223e8ff2b98ad8e91200892319 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Fri, 29 Nov 2024 11:10:42 +0100 Subject: [PATCH 79/96] nextcloud30Packages: update --- pkgs/servers/nextcloud/packages/30.json | 90 +++++++++++++++---------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index d9af7fd32824..f75be5c1dabb 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-v9qjcyc2UBZK7QeO1XBZu11coPI92PRZcTipzBEMm3c=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.1/calendar-v5.0.1.tar.gz", - "version": "5.0.1", + "hash": "sha256-HWe9YFSJuV6AFvLy+QO8kioK+VnUESaHUwxdfNPNue8=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.0.6/calendar-v5.0.6.tar.gz", + "version": "5.0.6", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* šŸš€ **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* šŸŒ **WebCal Support!** Want to see your favorite teamā€™s matchdays in your calendar? No problem!\n* šŸ™‹ **Attendees!** Invite people to your events\n* āŒšļø **Free/Busy!** See when your attendees are available to meet\n* ā° **Reminders!** Get alarms for events inside your browser and via email\n* šŸ” Search! Find your events at ease\n* ā˜‘ļø Tasks! See tasks with a due date directly in the calendar\n* šŸ™ˆ **Weā€™re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "hash": "sha256-/vikmy5phOK1OhFu6w5A1BYiNfbYaU7Js2+jiurM2ug=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.0/contacts-v6.1.0.tar.gz", - "version": "6.1.0", + "hash": "sha256-M3AC9KT3aMpDYeGgfqVWdI4Lngg/yw/36HSBS3N+G5c=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.1.2/contacts-v6.1.2.tar.gz", + "version": "6.1.1", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* šŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar ā€“ more to come.\n* šŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* šŸ‘„ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* šŸ™ˆ **Weā€™re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "hash": "sha256-X64B6l7h8MglBW5apC21G8jkg7WfnRYroczguI58V9g=", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.1/deck-v1.14.1.tar.gz", - "version": "1.14.1", + "hash": "sha256-BiUu//ouJiQt/BhrDBH16yGHoH4Kzb260A7ALIqSyEk=", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.2/deck-v1.14.2.tar.gz", + "version": "1.14.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- šŸ“„ Add your tasks to cards and put them in order\n- šŸ“„ Write down additional notes in Markdown\n- šŸ”– Assign labels for even better organization\n- šŸ‘„ Share with your team, friends or family\n- šŸ“Ž Attach files and embed them in your Markdown description\n- šŸ’¬ Discuss with your team using comments\n- āš” Keep track of changes in the activity stream\n- šŸš€ Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -69,10 +69,20 @@ "agpl" ] }, + "files_mindmap": { + "hash": "sha256-USwTVkcEDzmaJMMaztf86yag5t7b79sQW8OOHEw0hec=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.31/files_mindmap-0.0.31.tar.gz", + "version": "0.0.31", + "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", + "homepage": "https://github.com/ACTom/files_mindmap", + "licenses": [ + "agpl" + ] + }, "forms": { - "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", - "version": "4.3.2", + "hash": "sha256-NW57bhZiNqKfUhMvGN9Ncy21Y0GucC/CFCmHTf8kJ2I=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.4/forms-v4.3.4.tar.gz", + "version": "4.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **šŸ“ Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **šŸ“Š View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **šŸ”’ Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **šŸ§‘ā€šŸ’» Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **šŸ™‹ Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,10 +100,10 @@ ] }, "groupfolders": { - "hash": "sha256-IrxzWjxqsA6prPn/gKj9MAw0R/1Qi3kHsddNU5E9sVk=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.3/groupfolders-v18.0.3.tar.gz", - "version": "18.0.3", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-m4hKIo96MYhkOtyeu6Sh5yPFKQdwFtuX2rSzElfC8rs=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.0.6/groupfolders-v18.0.6.tar.gz", + "version": "18.0.6", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -110,10 +120,10 @@ ] }, "integration_openai": { - "hash": "sha256-J7ePjQlYy5gxVK6AmERWCo0aOFf9OP6KyYVZm8y82ek=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.1.2/integration_openai-v3.1.2.tar.gz", - "version": "3.1.2", - "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "hash": "sha256-jAAsX9NA09rM5kWBrlfZXIdkF5Go2CIYAtxzKvYd4nM=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.2.0/integration_openai-v3.2.0.tar.gz", + "version": "3.2.0", + "description": "āš ļø The smart pickers have been removed from this app\nas they are now included in the [Assistant app](https://apps.nextcloud.com/apps/assistant).\n\nThis app implements:\n\n* Text generation providers: Free prompt, Summarize, Headline, Context Write, Chat, and Reformulate (using any available large language model)\n* A Translation provider (using any available language model)\n* A SpeechToText provider (using Whisper)\n* An image generation provider\n\nāš ļø Context Write, Summarize, Headline and Reformulate have mainly been tested with OpenAI.\nThey might work when connecting to other services, without any guarantee.\n\nInstead of connecting to the OpenAI API for these, you can also connect to a self-hosted [LocalAI](https://localai.io) instance or [Ollama](https://ollama.com/) instance\nor to any service that implements an API similar to the OpenAI one, for example: [Plusserver](https://www.plusserver.com/en/ai-platform/) or [MistralAI](https://mistral.ai).\n\nāš ļø This app is mainly tested with OpenAI. We do not guarantee it works perfectly\nwith other services that implement OpenAI-compatible APIs with slight differences.\n\n## Improve AI task pickup speed\n\nTo avoid task processing execution delay, setup at 4 background job workers in the main server (where Nextcloud is installed). The setup process is documented here: https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed\n\n## Ethical AI Rating\n### Rating for Text generation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n\n### Rating for Translation using ChatGPT via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inference of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be run on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model's performance and CO2 usage.\n\n### Rating for Image generation using DALLĀ·E via the OpenAI API: šŸ”“\n\nNegative:\n* The software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* The trained model is not freely available, so the model can not be ran on-premises\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via the OpenAI API: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can run on-premise\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n### Rating for Text generation via LocalAI: šŸŸ¢\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n* The training data is freely available, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n\n### Rating for Image generation using Stable Diffusion via LocalAI : šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\n\n### Rating for Speech-To-Text using Whisper via LocalAI: šŸŸ”\n\nPositive:\n* The software for training and inferencing of this model is open source\n* The trained model is freely available, and thus can be ran on-premises\n\nNegative:\n* The training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the modelā€™s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/integration_openai", "licenses": [ "agpl" @@ -130,9 +140,9 @@ ] }, "mail": { - "hash": "sha256-iCK+B/BP4fCzaELNxL/A9OJ6Y34gZl9KIgh7lmSgtSA=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.2/mail-v4.0.2.tar.gz", - "version": "4.0.2", + "hash": "sha256-fiG9smhCztmoBfkXcbrXLjfREMYHPOF1JD8u2HUCnhk=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.5/mail-stable4.0.tar.gz", + "version": "4.0.5", "description": "**šŸ’Œ A mail app for Nextcloud**\n\n- **šŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files ā€“ more to come.\n- **šŸ“„ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **šŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **šŸ™ˆ Weā€™re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **šŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** šŸŸ¢/šŸŸ”/šŸŸ /šŸ”“\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -170,9 +180,9 @@ ] }, "news": { - "hash": "sha256-m2Q+vq7G5oPr9fwIX+65NReaxzcxXehQBQ52T4VrYfw=", - "url": "https://github.com/nextcloud/news/releases/download/25.0.0/news.tar.gz", - "version": "25.0.0", + "hash": "sha256-iQvgyXqOwZrWDoZgXNivxqnSLjNeWm9MLJ9R/Wx/jOg=", + "url": "https://github.com/nextcloud/news/releases/download/25.0.3/news.tar.gz", + "version": "25.0.3", "description": "šŸ“° A RSS/Atom Feed reader App for Nextcloud\n\n- šŸ“² Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- šŸ”„ Automatic updates of your news feeds\n- šŸ†“ Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -220,9 +230,9 @@ ] }, "polls": { - "hash": "sha256-rLNB0idaKoL4e5O5NYXyhIyFpYguDG4Hg5OkHUEaQUM=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.4/polls-v7.2.4.tar.gz", - "version": "7.2.4", + "hash": "sha256-7KSQDY2LXMWEbo3PFH3VMfq819swNnxCT5kiFvHI83s=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.5/polls-v7.2.5.tar.gz", + "version": "7.2.5", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -230,9 +240,9 @@ ] }, "previewgenerator": { - "hash": "sha256-hjlwZfgfoH3iqbtJrPovgBC0Tu/vBhFqC752DZvndFY=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.6.0/previewgenerator-v5.6.0.tar.gz", - "version": "5.6.0", + "hash": "sha256-kTYmN/tAJwjj2KwnrKVIZa5DhyXHjuNWNskqJZxs4sY=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.7.0/previewgenerator-v5.7.0.tar.gz", + "version": "5.7.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -240,9 +250,9 @@ ] }, "qownnotesapi": { - "hash": "sha256-jnKtJrzW5FzrluO5S+2Qdrune6TfWDOXlOh9xNm8h1M=", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.9.0/qownnotesapi-nc.tar.gz", - "version": "24.9.0", + "hash": "sha256-ydz8e8ZOLOT60yt55DI0gGpSaLz9sCz5Zyt1jhMYIv0=", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v24.11.0/qownnotesapi-nc.tar.gz", + "version": "24.11.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -309,6 +319,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-hUKpIGvu7aX45Pz/xCssOuyZ7E+kJ4cmqhhycX5DG6A=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.3/unsplash.tar.gz", + "version": "3.0.3", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-hdFEruRfEFL5PQykOpHHb19NOKh+p5hGOMo0tPVg0eE=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.2/user_oidc-v6.1.2.tar.gz", From cb460d69fbcc78a178fe55736283b18fe9554c3f Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Thu, 28 Nov 2024 09:29:00 +0100 Subject: [PATCH 80/96] gswatcher: init at 1.7.1 --- pkgs/by-name/gs/gswatcher/package.nix | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/gs/gswatcher/package.nix diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix new file mode 100644 index 000000000000..cfdae25a27f8 --- /dev/null +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + meson, + ninja, + vala, + wrapGAppsHook4, + desktop-file-utils, + pkg-config, + imagemagick, + + gtk4, + libadwaita, + libgee, + lua5_4, + geoip, + geolite-legacy, + + versionCheckHook, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gswatcher"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "lxndr"; + repo = "gswatcher"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-U09vovOanYmDl5ymFC3bXU8pi8aUq2tPUE5AEoqmfpc="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + wrapGAppsHook4 + desktop-file-utils + # Not packaged yet, optional + # appstream-util + pkg-config + imagemagick + ]; + + buildInputs = [ + gtk4 + libadwaita + libgee + lua5_4 + geoip + ]; + + postInstall = '' + ln -s ${geolite-legacy}/share/GeoIP $out/share/GeoIP + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple game server monitor and administrative tool"; + homepage = "https://github.com/lxndr/gswatcher"; + license = with lib.licenses; [ agpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pluiedev ]; + }; +}) From 14f8fd6e81b976d6900437ae1e7ce083d58ed069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 11:17:33 +0000 Subject: [PATCH 81/96] python312Packages.jupyter-ydoc: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/jupyter-ydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 5fa69f424fbd..7a5c9d6aaa02 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-nPOU7nxpVSh+6tERJq2DYIOpyjze8uJyIdxN/gW7arE="; + hash = "sha256-ztrp8+4KdyiDF/IbuBhI7WFnTRukaLDDlsFgomSiEGs="; }; build-system = [ From b4fd89b737b39014ff9157db21c8fbd479f57e9a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 29 Nov 2024 12:39:09 +0100 Subject: [PATCH 82/96] rl-2411: Match to release branch This specific change was already done before the branch-off in https://github.com/NixOS/nixpkgs/pull/346059, but https://github.com/NixOS/nixpkgs/pull/335832 reverted it accidentally on master after the branch-off. --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index ed4e49e876f5..d3947c7737da 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -915,7 +915,7 @@ - `freecad` now supports addons and custom configuration in nix-way, which can be used by calling `freecad.customize`. -## Detailed migration information {#sec-release-24.11-migration} +## Detailed Migration Information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} From 0196082f6cadfe4859d487db91e67c9d162d8837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 12:10:35 +0000 Subject: [PATCH 83/96] ergo: 5.0.23 -> 5.0.24 --- pkgs/by-name/er/ergo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix index f44cadc785fe..075d4febe95a 100644 --- a/pkgs/by-name/er/ergo/package.nix +++ b/pkgs/by-name/er/ergo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.23"; + version = "5.0.24"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-bVvqsgfsIlAUwbTbFAYbI+Dtgbxv71cMlDpaReTE56Q="; + sha256 = "sha256-+dpSgqJGHUNzIBQBbfbeclB5t+NyaluGRTCZ4OESZu8="; }; nativeBuildInputs = [ makeWrapper ]; From 311ccd7dd82d0a0f3c64e588bf4d745eda583a57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 12:41:21 +0000 Subject: [PATCH 84/96] cargo-component: 0.17.0 -> 0.19.0 --- pkgs/by-name/ca/cargo-component/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 66f9356a6e20..fd0c1806e27d 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-j1gQgtse3DQWyR4D5BzQ0aAEGhNKoFT0ACRBVOqDdFE="; + hash = "sha256-HiDwFWEzzCmwlEKsVmKREtn5OfAziC+irgeh66fRWIQ="; }; - cargoHash = "sha256-1YDnqopghS6MpQ2h8e5kQj0bxKAC2B6XzVeC60+M3MM="; + cargoHash = "sha256-AtOZGYH0ya5mza3QFTfaXvw9tcFDGuz72JUhfTdUml8="; nativeBuildInputs = [ pkg-config From a5865295af1aeb4a7e869fbdebbfc663065dabd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Wed, 27 Nov 2024 00:07:02 +0100 Subject: [PATCH 85/96] websurfx: init at 1.20.7 --- pkgs/by-name/we/websurfx/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/we/websurfx/package.nix diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix new file mode 100644 index 000000000000..724b41098867 --- /dev/null +++ b/pkgs/by-name/we/websurfx/package.nix @@ -0,0 +1,60 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssl, + pkg-config, +}: +let + version = "1.20.7"; +in +rustPlatform.buildRustPackage { + pname = "websurfx"; + inherit version; + + src = fetchFromGitHub { + owner = "neon-mmd"; + repo = "websurfx"; + rev = "refs/tags/v${version}"; + hash = "sha256-fpyelpzskwuVrQB1SZ3llnenox7MiOeF+sSJONSdEf0="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + useFetchCargoVendor = true; + + cargoHash = "sha256-LnMVfsKb1oTsEKmD/dDnABbWyrYC52e9ASbcMY7qXMw="; + + postPatch = '' + substituteInPlace src/handler/mod.rs \ + --replace-fail "/etc/xdg" "$out/etc/xdg" \ + --replace-fail "/opt/websurfx" "$out/opt/websurfx" + ''; + + postInstall = '' + mkdir -p $out/etc/xdg + mkdir -p $out/opt/websurfx + + cp -r websurfx $out/etc/xdg/ + cp -r public $out/opt/websurfx/ + ''; + + meta = { + description = "Open source alternative to searx"; + longDescription = '' + An open source alternative to searx which provides a modern-looking, + lightning-fast, privacy respecting, secure meta search engine. + ''; + homepage = "https://github.com/neon-mmd/websurfx"; + changelog = "https://github.com/neon-mmd/websurfx/releases"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "websurfx"; + }; +} From 8a3d41aa0fb5f96a1a974ad7a2f7d4a7db730973 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Nov 2024 09:01:48 +0100 Subject: [PATCH 86/96] python312Packages.asteroid-filterbanks: fix tests --- .../asteroid-filterbanks/default.nix | 73 +++++++++++++------ 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix index e7dc0cba9798..f70a5bfe40f1 100644 --- a/pkgs/development/python-modules/asteroid-filterbanks/default.nix +++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix @@ -1,17 +1,20 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - wheel, - black, - coverage, - librosa, + + # dependencies numpy, - pre-commit, - pytest, - scipy, torch, + typing-extensions, + + # tests + pytestCheckHook, + scipy, }: buildPythonPackage rec { @@ -22,32 +25,58 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asteroid-team"; repo = "asteroid-filterbanks"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Z5M2Xgj83lzqov9kCw/rkjJ5KXbjuP+FHYCjhi5nYFE="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + # np.float is deprecated + postPatch = '' + substituteInPlace asteroid_filterbanks/multiphase_gammatone_fb.py \ + --replace-fail "np.float(" "float(" + ''; - propagatedBuildInputs = [ - black - coverage - librosa + build-system = [ setuptools ]; + + dependencies = [ numpy - pre-commit - pytest - scipy torch + typing-extensions ]; pythonImportsCheck = [ "asteroid_filterbanks" ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + scipy + ]; + + disabledTests = + [ + # RuntimeError: cannot cache function '__o_fold': no locator available for file + # '/nix/store/d1znhn1n48z2raj0j9zbz80hhg4k2shw-python3.12-librosa-0.10.2.post1/lib/python3.12/site-packages/librosa/core/notation.py' + "test_melgram_encoder" + "test_melscale" + + # AssertionError: The values for attribute 'shape' do not match + "test_torch_stft" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Issue with JIT on darwin: + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_jit_filterbanks" + "test_jit_filterbanks_enc" + "test_pcen_jit" + "test_stateful_pcen_jit" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Flaky: AssertionError: Tensor-likes are not close! + "test_fb_def_and_forward_lowdim" + ]; + + meta = { description = "PyTorch-based audio source separation toolkit for researchers"; homepage = "https://github.com/asteroid-team/asteroid-filterbanks"; - license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewcroughan ]; }; } From 836d207c6c64f9398ad3c816be72f79ec2d3fb4a Mon Sep 17 00:00:00 2001 From: Priyanshu Tripathi Date: Fri, 29 Nov 2024 19:33:08 +0530 Subject: [PATCH 87/96] nixos-render-docs-redirects: init (#357383) Co-authored-by: Valentin Gagarin --- doc/doc-support/package.nix | 10 +- nixos/doc/manual/shell.nix | 6 +- .../nixos-render-docs-redirects/package.nix | 22 +++ .../nixos_render_docs_redirects/__init__.py | 130 ++++++++++++++++++ .../src/pyproject.toml | 16 +++ .../src/tests/__init__.py | 1 + .../src/tests/test_redirects.py | 86 ++++++++++++ .../src/nixos_render_docs/redirects.py | 36 ++++- 8 files changed, 300 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/ni/nixos-render-docs-redirects/package.nix create mode 100644 pkgs/by-name/ni/nixos-render-docs-redirects/src/nixos_render_docs_redirects/__init__.py create mode 100644 pkgs/by-name/ni/nixos-render-docs-redirects/src/pyproject.toml create mode 100644 pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/__init__.py create mode 100644 pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/test_redirects.py diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index f1d9996120ce..c2bbdf09e533 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -9,6 +9,8 @@ mkShellNoCC, documentation-highlighter, nixos-render-docs, + nixos-render-docs-redirects, + writeShellScriptBin, nixpkgs ? { }, }: @@ -105,8 +107,14 @@ stdenvNoCC.mkDerivation ( buildArgs = "./."; open = "/share/doc/nixpkgs/manual.html"; }; + nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@"; in - mkShellNoCC { packages = [ devmode' ]; }; + mkShellNoCC { + packages = [ + devmode' + nixos-render-docs-redirects' + ]; + }; tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; }; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index aeec93118fc0..4f6ab400f22c 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -10,7 +10,11 @@ let buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; open = "/${outputPath}/${indexPath}"; }; + nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@"; in pkgs.mkShellNoCC { - packages = [ devmode ]; + packages = [ + devmode + nixos-render-docs-redirects + ]; } diff --git a/pkgs/by-name/ni/nixos-render-docs-redirects/package.nix b/pkgs/by-name/ni/nixos-render-docs-redirects/package.nix new file mode 100644 index 000000000000..a473fd1533ca --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs-redirects/package.nix @@ -0,0 +1,22 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication { + pname = "nixos-render-docs-redirects"; + version = "0.0"; + pyproject = true; + + src = ./src; + + build-system = with python3.pkgs; [ setuptools ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + meta = { + description = "Redirects manipulation for nixos manuals"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getpsyched ]; + mainProgram = "redirects"; + }; +} diff --git a/pkgs/by-name/ni/nixos-render-docs-redirects/src/nixos_render_docs_redirects/__init__.py b/pkgs/by-name/ni/nixos-render-docs-redirects/src/nixos_render_docs_redirects/__init__.py new file mode 100644 index 000000000000..d09849ac4866 --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs-redirects/src/nixos_render_docs_redirects/__init__.py @@ -0,0 +1,130 @@ +import argparse +import json +import sys +from pathlib import Path + + +def add_content(redirects: dict[str, list[str]], identifier: str, path: str) -> dict[str, list[str]]: + if identifier in redirects: + raise IdentifierExists(identifier) + + # Insert the new identifier in alphabetical order + new_redirects = list(redirects.items()) + insertion_index = 0 + for i, (key, _) in enumerate(new_redirects): + if identifier > key: + insertion_index = i + 1 + else: + break + new_redirects.insert(insertion_index, (identifier, [f"{path}#{identifier}"])) + return dict(new_redirects) + + +def move_content(redirects: dict[str, list[str]], identifier: str, path: str) -> dict[str, list[str]]: + if identifier not in redirects: + raise IdentifierNotFound(identifier) + redirects[identifier].insert(0, f"{path}#{identifier}") + return redirects + + +def rename_identifier( + redirects: dict[str, list[str]], + old_identifier: str, + new_identifier: str +) -> dict[str, list[str]]: + if old_identifier not in redirects: + raise IdentifierNotFound(old_identifier) + if new_identifier in redirects: + raise IdentifierExists(new_identifier) + + # To minimise the diff, we recreate the redirects mapping allowing + # the new key to be updated in-place, preserving the index. + new_redirects = {} + current_path = "" + for key, value in redirects.items(): + if key == old_identifier: + new_redirects[new_identifier] = value + current_path = value[0].split('#')[0] + continue + new_redirects[key] = value + new_redirects[new_identifier].insert(0, f"{current_path}#{new_identifier}") + return new_redirects + + +def remove_and_redirect( + redirects: dict[str, list[str]], + old_identifier: str, + new_identifier: str +) -> dict[str, list[str]]: + if old_identifier not in redirects: + raise IdentifierNotFound(old_identifier) + if new_identifier not in redirects: + raise IdentifierNotFound(new_identifier) + redirects[new_identifier].extend(redirects.pop(old_identifier)) + return redirects + + +def main(): + parser = argparse.ArgumentParser(description="redirects manipulation for nixos manuals") + commands = parser.add_subparsers(dest="command", required=True) + parser.add_argument("-f", "--file", type=Path, required=True) + + add_content_cmd = commands.add_parser("add-content") + add_content_cmd.add_argument("identifier", type=str) + add_content_cmd.add_argument("path", type=str) + + move_content_cmd = commands.add_parser("move-content") + move_content_cmd.add_argument("identifier", type=str) + move_content_cmd.add_argument("path", type=str) + + rename_id_cmd = commands.add_parser("rename-identifier") + rename_id_cmd.add_argument("old_identifier", type=str) + rename_id_cmd.add_argument("new_identifier", type=str) + + remove_redirect_cmd = commands.add_parser("remove-and-redirect") + remove_redirect_cmd.add_argument("identifier", type=str) + remove_redirect_cmd.add_argument("target_identifier", type=str) + + args = parser.parse_args() + + with open(args.file) as file: + redirects = json.load(file) + + try: + if args.command == "add-content": + redirects = add_content(redirects, args.identifier, args.path) + print(f"Added new identifier: {args.identifier}") + + elif args.command == "move-content": + redirects = move_content(redirects, args.identifier, args.path) + print(f"Moved '{args.identifier}' to the new path: {args.path}") + + elif args.command == "rename-identifier": + redirects = rename_identifier(redirects, args.old_identifier, args.new_identifier) + print(f"Renamed identifier from {args.old_identifier} to {args.new_identifier}") + + elif args.command == "remove-and-redirect": + redirects = remove_and_redirect(redirects, args.identifier, args.target_identifier) + print(f"Redirect from '{args.identifier}' to '{args.target_identifier}' added.") + except Exception as error: + print(error, file=sys.stderr) + else: + with open(args.file, "w") as file: + json.dump(redirects, file, indent=2) + file.write("\n") + + +class IdentifierExists(Exception): + def __init__(self, identifier: str): + self.identifier = identifier + + def __str__(self): + return f"The identifier '{self.identifier}' already exists." + + +class IdentifierNotFound(Exception): + def __init__(self, identifier: str): + self.identifier = identifier + + def __str__(self): + return f"The identifier '{self.identifier}' does not exist in the redirect mapping." diff --git a/pkgs/by-name/ni/nixos-render-docs-redirects/src/pyproject.toml b/pkgs/by-name/ni/nixos-render-docs-redirects/src/pyproject.toml new file mode 100644 index 000000000000..50f7bcb95507 --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs-redirects/src/pyproject.toml @@ -0,0 +1,16 @@ +[project] +name = "nixos-render-docs-redirects" +version = "0.0" +description = "redirects manipulation for nixos manuals" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", +] + +[project.scripts] +redirects = "nixos_render_docs_redirects:main" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/__init__.py b/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/__init__.py new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/__init__.py @@ -0,0 +1 @@ + diff --git a/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/test_redirects.py b/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/test_redirects.py new file mode 100644 index 000000000000..ae648d5e26c9 --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs-redirects/src/tests/test_redirects.py @@ -0,0 +1,86 @@ +import unittest +from nixos_render_docs_redirects import ( + add_content, + move_content, + rename_identifier, + remove_and_redirect, + IdentifierExists, + IdentifierNotFound, +) + + +class RedirectsTestCase(unittest.TestCase): + def test_add_content(self): + initial_redirects = { + "bar": ["path/to/bar.html#bar"], + "foo": ["path/to/foo.html#foo"], + } + final_redirects = { + "bar": ["path/to/bar.html#bar"], + "baz": ["path/to/baz.html#baz"], + "foo": ["path/to/foo.html#foo"], + } + + result = add_content(initial_redirects, "baz", "path/to/baz.html") + self.assertEqual(list(result.items()), list(final_redirects.items())) + + with self.assertRaises(IdentifierExists): + add_content(result, "foo", "another/path.html") + + + def test_move_content(self): + initial_redirects = { + "foo": ["path/to/foo.html#foo"], + "bar": ["path/to/bar.html#bar"], + } + final_redirects = { + "foo": ["new/path.html#foo", "path/to/foo.html#foo"], + "bar": ["path/to/bar.html#bar"], + } + + result = move_content(initial_redirects, "foo", "new/path.html") + self.assertEqual(list(result.items()), list(final_redirects.items())) + + with self.assertRaises(IdentifierNotFound): + move_content(result, "baz", "path.html") + + + def test_rename_identifier(self): + initial_redirects = { + "foo": ["path/to/foo.html#foo"], + "bar": ["path/to/bar.html#bar"], + "baz": ["path/to/baz.html#baz"], + } + final_redirects = { + "foo": ["path/to/foo.html#foo"], + "boo": ["path/to/bar.html#boo", "path/to/bar.html#bar"], + "baz": ["path/to/baz.html#baz"], + } + + result = rename_identifier(initial_redirects, "bar", "boo") + self.assertEqual(list(result.items()), list(final_redirects.items())) + + with self.assertRaises(IdentifierNotFound): + rename_identifier(result, "bar", "boo") + with self.assertRaises(IdentifierExists): + rename_identifier(result, "boo", "boo") + + + def test_remove_and_redirect(self): + initial_redirects = { + "foo": ["new/path.html#foo", "path/to/foo.html#foo"], + "bar": ["path/to/bar.html#bar"], + "baz": ["path/to/baz.html#baz"], + } + final_redirects = { + "bar": ["path/to/bar.html#bar", "new/path.html#foo", "path/to/foo.html#foo"], + "baz": ["path/to/baz.html#baz"], + } + + result = remove_and_redirect(initial_redirects, "foo", "bar") + self.assertEqual(list(result.items()), list(final_redirects.items())) + + with self.assertRaises(IdentifierNotFound): + remove_and_redirect(result, "foo", "bar") + with self.assertRaises(IdentifierNotFound): + remove_and_redirect(initial_redirects, "foo", "baz") diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py index 57a6d6bbb3aa..1a891a1af238 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py @@ -47,23 +47,49 @@ The first element of an identifier's redirects list must denote its current loca If you moved content, add its new location as the first element of the redirects mapping. Please update doc/redirects.json or nixos/doc/manual/redirects.json! -""") # TODO: automatically detect if you just missed adding a new location, and make a tool to do that for you +""") if self.identifiers_without_redirects: error_messages.append(f""" Identifiers present in the source must have a mapping in the redirects file. - {"\n - ".join(self.identifiers_without_redirects)} This can happen when an identifier was added or renamed. - Please update doc/redirects.json or nixos/doc/manual/redirects.json! -""") # TODO: add tooling in the development shell to do that automatically and point to that command + + Added new content? + redirects add-content ā¬identifierā­ ā¬pathā­ + + Moved existing content to a different output path? + redirects move-content ā¬identifierā­ ā¬pathā­ + + Renamed existing identifiers? + redirects rename-identifier ā¬old-identifierā­ ā¬new-identifierā­ + + Removed content? Redirect to alternatives or relevant release notes. + redirects remove-and-redirect ā¬identifierā­ ā¬target-identifierā­ + + Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command. +""") if self.orphan_identifiers: error_messages.append(f""" Keys of the redirects mapping must correspond to some identifier in the source. - {"\n - ".join(self.orphan_identifiers)} This can happen when an identifier was removed or renamed. - Please update doc/redirects.json or nixos/doc/manual/redirects.json! -""") # TODO: add tooling in the development shell to do that automatically and point to that command + + Added new content? + redirects add-content ā¬identifierā­ ā¬pathā­ + + Moved existing content to a different output path? + redirects move-content ā¬identifierā­ ā¬pathā­ + + Renamed existing identifiers? + redirects rename-identifier ā¬old-identifierā­ ā¬new-identifierā­ + + Removed content? (good for redirecting deprecations to new content or release notes) + redirects remove-and-redirect ā¬identifierā­ ā¬target-identifierā­ + + Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command. +""") error_messages.append("NOTE: If your Manual build passes locally and you see this message in CI, you probably need a rebase.") return "\n".join(error_messages) From be9539b79400ae5a0179c20ee7feceba5f4581e5 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Fri, 29 Nov 2024 14:52:24 +0000 Subject: [PATCH 88/96] treefmt2: 2.1.0 -> 2.1.1 (#360123) --- pkgs/by-name/tr/treefmt2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 1a6c4d0049a2..46a3913cbadc 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-I97mCxQMPq6fV0GD9gVbtQ/i/Sju9/+ZazbkbGqy9Qw="; + hash = "sha256-XD61nZhdXYrFzprv/YuazjXK/NWP5a9oCF6WBO2XTY0="; }; - vendorHash = "sha256-PiH+FMSPeTFwS6cMgZX8Uy2bjZnQ+APqL5d7FMnqR9U="; + vendorHash = "sha256-0qCOpLMuuiYNCX2Lqa/DUlkmDoPIyUzUHIsghoIaG1s="; subPackages = [ "." ]; @@ -19,8 +19,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/numtide/treefmt/build.Name=treefmt" - "-X github.com/numtide/treefmt/build.Version=v${version}" + "-X github.com/numtide/treefmt/v2/build.Name=treefmt" + "-X github.com/numtide/treefmt/v2/build.Version=v${version}" ]; meta = { From cc9e038ab7d84e75626c0fe5162a34c99bc259bc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 17 Nov 2024 13:12:17 +0100 Subject: [PATCH 89/96] minutor: init at 2.21.0 --- pkgs/by-name/mi/minutor/package.nix | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/mi/minutor/package.nix diff --git a/pkgs/by-name/mi/minutor/package.nix b/pkgs/by-name/mi/minutor/package.nix new file mode 100644 index 000000000000..1bf92d38431f --- /dev/null +++ b/pkgs/by-name/mi/minutor/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchFromGitHub, + qt5, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "minutor"; + version = "2.21.0"; + + src = fetchFromGitHub { + owner = "mrkite"; + repo = finalAttrs.pname; + rev = "refs/tags/${finalAttrs.version}"; + sha256 = "0ldjnrk429ywf8cxdpjkam5k73s6fq7lvksandfn3xn7gl9np5rk"; + }; + + preConfigure = '' + substituteInPlace minutor.pro \ + --replace-fail /usr "$out" + ''; + + nativeBuildInputs = [ + qt5.qmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + zlib + ]; + + meta = { + description = "Easy to use mapping tool for Minecraft"; + maintainers = [ lib.maintainers.sternenseemann ]; + license = lib.licenses.bsd2; + homepage = "https://seancode.com/minutor/"; + inherit (qt5.qtbase.meta) platforms; + mainProgram = "minutor"; + }; +}) From b989e7e8ad8560f73b66d3300fb328197464588a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Nov 2024 16:21:24 +0100 Subject: [PATCH 90/96] python312Packages.imgcat: 0.5.0 -> 0.6.0 Diff: https://github.com/wookayin/python-imgcat/compare/refs/tags/v0.5.0...v0.6.0 Changelog: https://github.com/wookayin/python-imgcat/releases/tag/v0.6.0 --- .../python-modules/imgcat/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/imgcat/default.nix b/pkgs/development/python-modules/imgcat/default.nix index e17c249670e2..0f190463c444 100644 --- a/pkgs/development/python-modules/imgcat/default.nix +++ b/pkgs/development/python-modules/imgcat/default.nix @@ -2,29 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + matplotlib, numpy, pillow, pytestCheckHook, - pythonOlder, setuptools, tensorflow, torch, - torchvision, }: buildPythonPackage rec { pname = "imgcat"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "wookayin"; repo = "python-imgcat"; rev = "refs/tags/v${version}"; - hash = "sha256-LFXfCMWMdOjFYhXba9PCCIYnqR7gTRG63NAoC/nD2wk="; + hash = "sha256-FsLa8Z4aKuj3E5twC2LTXZDM0apmyYfgeyZQu/wLdAo="; }; postPatch = '' @@ -41,16 +38,15 @@ buildPythonPackage rec { pytestCheckHook tensorflow torch - torchvision ]; pythonImportsCheck = [ "imgcat" ]; - meta = with lib; { + meta = { description = "Imgcat in Python"; homepage = "https://github.com/wookayin/python-imgcat"; changelog = "https://github.com/wookayin/python-imgcat/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 5b0ffc8037afa4843548fd91d16fbc8719ac4053 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 29 Nov 2024 08:29:56 -0700 Subject: [PATCH 91/96] gettext: remove dead patch causing failures on BSDs (#360044) --- .../development/libraries/gettext/default.nix | 11 +--- .../libraries/gettext/fix-getcwd-clang.patch | 63 ------------------- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/gettext/fix-getcwd-clang.patch diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 2a69b5702172..0518a40c2930 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -19,16 +19,7 @@ stdenv.mkDerivation rec { # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ] - # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2 - # resulted in a getcwd prototype to be added in when it isn't needed. - # Clang does not like this unless the "overridable" attribute was appied. - # Since we don't need to redeclare getcwd, we can just remove it. - # - # Issue: https://github.com/NixOS/nixpkgs/issues/348658 - # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e - # Remove in 0.22.5 upgrade. - ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch; + ]; outputs = [ "out" "man" "doc" "info" ]; diff --git a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch deleted file mode 100644 index ae253b3cd0ec..000000000000 --- a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch +++ /dev/null @@ -1,63 +0,0 @@ -From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Thu, 9 Feb 2023 16:58:20 +0100 -Subject: [PATCH] Fix compilation errors with ISO C 23 compilers. - -* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the -system header files. -* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility. ---- - gettext-runtime/intl/dcigettext.c | 5 +---- - gettext-runtime/intl/gettextP.h | 7 +------ - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c -index e7cb9b962..666a624b0 100644 ---- a/gettext-runtime/intl/dcigettext.c -+++ b/gettext-runtime/intl/dcigettext.c -@@ -1,5 +1,5 @@ - /* Implementation of the internal dcigettext function. -- Copyright (C) 1995-2020 Free Software Foundation, Inc. -+ Copyright (C) 1995-2023 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by -@@ -139,13 +139,10 @@ extern int errno; - # define tfind __tfind - #else - # if !defined HAVE_GETCWD --char *getwd (); - # define getcwd(buf, max) getwd (buf) - # else - # if VMS - # define getcwd(buf, max) (getcwd) (buf, max, 0) --# else --char *getcwd (); - # endif - # endif - # ifndef HAVE_STPCPY -diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h -index bb00555ee..536e8bd43 100644 ---- a/gettext-runtime/intl/gettextP.h -+++ b/gettext-runtime/intl/gettextP.h -@@ -1,5 +1,5 @@ - /* Header describing internals of libintl library. -- Copyright (C) 1995-2020 Free Software Foundation, Inc. -+ Copyright (C) 1995-2023 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. - - This program is free software: you can redistribute it and/or modify -@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname, - # define SWAP(i) bswap_32 (i) - #else - static inline nls_uint32 --# ifdef __cplusplus - SWAP (nls_uint32 i) --# else --SWAP (i) -- nls_uint32 i; --# endif - { - return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); - } - From f50a1bd99de9fff62d09887b81d3e1a00f2e69ee Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 22 Nov 2024 12:01:03 -0500 Subject: [PATCH 92/96] nixos/lxc/container: fix useDhcp with veth https://github.com/NixOS/nixpkgs/pull/347283 changed the default to exclude non-physical network Kind, but that unfortunately also includes `veth` which LXC uses for its network interfaces. Re-enable that functionality so users can use networkd with useDHCP. --- nixos/modules/virtualisation/lxc-container.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 42c323ee4503..ff7a4c11060b 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -31,6 +31,22 @@ ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; + # supplement 99-ethernet-default-dhcp which excludes veth + systemd.network = lib.mkIf config.networking.useDHCP { + networks."99-lxc-veth-default-dhcp" = { + matchConfig = { + Type = "ether"; + Kind = "veth"; + Name = [ + "en*" + "eth*" + ]; + }; + DHCP = "yes"; + networkConfig.IPv6PrivacyExtensions = "kernel"; + }; + }; + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { extraArgs = "--owner=0"; From e6b629da2735d17d47e32626591f4d6fd3499fe7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Nov 2024 02:09:23 +1000 Subject: [PATCH 93/96] mpvScripts.uosc: 5.6.0 -> 5.6.2 (#359802) --- pkgs/applications/video/mpv/scripts/uosc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index a65a1c86078a..2838dd5e4942 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,14 +9,14 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.6.0"; + version = "5.6.2"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-oEU1mPDzaW5j6zMpnSn1baQ+qlr/MtErxRfiyVBWMHU="; + hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU="; }; passthru.updateScript = gitUpdater { }; From ab4517e2fce15d67322ad61923e677f4f102a8b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 10:18:17 +0000 Subject: [PATCH 94/96] bloat: 0-unstable-2024-06-17 -> 0-unstable-2024-10-28 --- pkgs/by-name/bl/bloat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/bloat/package.nix b/pkgs/by-name/bl/bloat/package.nix index 84004ef16e2d..e4181ceac575 100644 --- a/pkgs/by-name/bl/bloat/package.nix +++ b/pkgs/by-name/bl/bloat/package.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "0-unstable-2024-06-17"; + version = "0-unstable-2024-10-28"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "51d6ff26fe224444b921b5b1f367f15782cf84d3"; - hash = "sha256-g5CbX134o9aeFggsVYnPfbZ4bsRQUUNnAe1KhTlONuU="; + rev = "68d7acc2f7266c47001445229ff235546c8c71b4"; + hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY="; }; vendorHash = null; From b9da4f27d9413f70408ecd18d09037e56a1d66fe Mon Sep 17 00:00:00 2001 From: Fedi Jamoussi Date: Fri, 29 Nov 2024 17:34:24 +0000 Subject: [PATCH 95/96] nixos/omnom: init module (#357830) --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/omnom.nix | 251 ++++++++++++++++++++++++++ 2 files changed, 252 insertions(+) create mode 100644 nixos/modules/services/misc/omnom.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8551e1b3406c..fdda9fad8ca6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -813,6 +813,7 @@ ./services/misc/octoprint.nix ./services/misc/ollama.nix ./services/misc/ombi.nix + ./services/misc/omnom.nix ./services/misc/open-webui.nix ./services/misc/osrm.nix ./services/misc/owncast.nix diff --git a/nixos/modules/services/misc/omnom.nix b/nixos/modules/services/misc/omnom.nix new file mode 100644 index 000000000000..da21648105e3 --- /dev/null +++ b/nixos/modules/services/misc/omnom.nix @@ -0,0 +1,251 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.omnom; + settingsFormat = pkgs.formats.yaml { }; + + configFile = settingsFormat.generate "omnom-config.yml" cfg.settings; +in +{ + options = { + services.omnom = { + enable = lib.mkEnableOption "Omnom, a webpage bookmarking and snapshotting service"; + package = lib.mkPackageOption pkgs "omnom" { }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/omnom"; + description = "The directory where Omnom stores its data files."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 7331; + description = "The Omnom service port."; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open ports in the firewall."; + }; + + user = lib.mkOption { + type = lib.types.nonEmptyStr; + default = "omnom"; + description = "The Omnom service user."; + }; + + group = lib.mkOption { + type = lib.types.nonEmptyStr; + default = "omnom"; + description = "The Omnom service group."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = "File containing the password for the SMTP user."; + }; + + settings = lib.mkOption { + description = '' + Configuration options for the /etc/omnom/config.yml file. + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + app = { + debug = lib.mkEnableOption "debug mode"; + disable_signup = lib.mkEnableOption "restricting user creation"; + results_per_page = lib.mkOption { + type = lib.types.int; + default = 20; + description = "Number of results per page."; + }; + }; + db = { + connection = lib.mkOption { + type = lib.types.str; + default = "${cfg.dataDir}/db.sqlite3"; + description = "Database connection URI."; + defaultText = lib.literalExpression '' + "''${config.services.omnom.dataDir}/db.sqlite3" + ''; + }; + type = lib.mkOption { + type = lib.types.enum [ "sqlite" ]; + default = "sqlite"; + description = "Database type."; + }; + }; + server = { + address = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:${toString cfg.port}"; + description = "Server address."; + defaultText = lib.literalExpression '' + "127.0.0.1:''${config.services.omnom.port}" + ''; + }; + secure_cookie = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to limit cookies to a secure channel."; + }; + }; + storage = { + type = lib.mkOption { + type = lib.types.str; + default = "fs"; + description = "Storage type."; + }; + root = lib.mkOption { + type = lib.types.path; + default = "${cfg.dataDir}/static/data"; + defaultText = lib.literalExpression '' + "''${config.services.omnom.dataDir}/static/data" + ''; + description = "Where the snapshots are saved."; + }; + }; + smtp = { + tls = lib.mkEnableOption "Whether TLS encryption should be used."; + tls_allow_insecure = lib.mkEnableOption "Whether to allow insecure TLS."; + host = lib.mkOption { + type = lib.types.str; + default = ""; + description = "SMTP server hostname."; + }; + port = lib.mkOption { + type = lib.types.port; + default = 25; + description = "SMTP server port address."; + }; + sender = lib.mkOption { + type = lib.types.str; + default = "Omnom "; + description = "Omnom sender e-mail."; + }; + send_timeout = lib.mkOption { + type = lib.types.int; + default = 10; + description = "Send timeout duration in seconds."; + }; + connection_timeout = lib.mkOption { + type = lib.types.int; + default = 5; + description = "Connection timeout duration in seconds."; + }; + }; + }; + }; + default = { }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !lib.hasAttr "password" cfg.settings.smtp; + message = '' + `services.omnom.settings.smtp.password` must be defined in `services.omnom.passwordFile`. + ''; + } + { + assertion = !(cfg.settings.storage.root != "${cfg.dataDir}/static/data"); + message = '' + For Omnom to access the snapshots, it needs the storage root + directory to be inside the service's working directory. + + As such, `services.omnom.settings.storage.root` must be the same as + `''${services.omnom.dataDir}/static/data`. + ''; + } + ]; + + systemd.services.omnom = { + path = with pkgs; [ + yq-go # needed by startup script + ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + StateDirectory = "omnom"; + WorkingDirectory = cfg.dataDir; + Restart = "on-failure"; + RestartSec = "10s"; + LoadCredential = lib.optional (cfg.passwordFile != null) "PASSWORD_FILE:${cfg.passwordFile}"; + }; + script = '' + install -m 600 ${configFile} $STATE_DIRECTORY/config.yml + + ${lib.optionalString (cfg.passwordFile != null) '' + # merge password into main config + yq -i '.smtp.password = load(env(CREDENTIALS_DIRECTORY) + "/PASSWORD_FILE")' \ + "$STATE_DIRECTORY/config.yml" + ''} + + ${lib.getExe cfg.package} listen --config "$STATE_DIRECTORY/config.yml" + ''; + after = [ + "network.target" + "systemd-tmpfiles-setup.service" + ]; + wantedBy = [ "multi-user.target" ]; + }; + + # TODO: The program needs to run from the dataDir for it the work, which + # is difficult to do with a DynamicUser. + # After this has been fixed upstream, remove this and use DynamicUser, instead. + # See: https://github.com/asciimoo/omnom/issues/21 + users = { + users = lib.mkIf (cfg.user == "omnom") { + omnom = { + group = cfg.group; + home = cfg.dataDir; + isSystemUser = true; + }; + }; + groups = lib.mkIf (cfg.group == "omnom") { omnom = { }; }; + }; + + systemd.tmpfiles.settings."10-omnom" = + let + settings = { + inherit (cfg) user group; + }; + in + { + "${cfg.dataDir}"."d" = settings; + "${cfg.dataDir}/templates"."L+" = settings // { + argument = "${cfg.package}/share/templates"; + }; + "${cfg.settings.storage.root}"."d" = settings; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + environment.systemPackages = + let + omnom-wrapped = pkgs.writeScriptBin "omnom" '' + #! ${pkgs.runtimeShell} + cd ${cfg.dataDir} + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user}' + fi + $sudo ${lib.getExe cfg.package} "$@" + ''; + in + [ omnom-wrapped ]; + }; +} From cdc2e32ea44cc80433848f75607ca5a76d613310 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Sat, 30 Nov 2024 01:27:59 +0900 Subject: [PATCH 96/96] samba: fix broken tarball URLs Samba and cifs-utils source tarballs have been silently moved to https://download.samba.org/ without redirects. --- pkgs/by-name/ci/cifs-utils/package.nix | 2 +- pkgs/servers/samba/4.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cifs-utils/package.nix b/pkgs/by-name/ci/cifs-utils/package.nix index b96298aa2cd9..0deb89ea46bc 100644 --- a/pkgs/by-name/ci/cifs-utils/package.nix +++ b/pkgs/by-name/ci/cifs-utils/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "7.1"; src = fetchurl { - url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; + url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; sha256 = "sha256-ohEj92pKajbJZTGJukkY6988/NP5CScwpH/zRQtbWyo="; }; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 8158c3d2d32b..2b06fb9175a0 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { version = "4.20.4"; src = fetchurl { - url = "mirror://samba/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; + url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; hash = "sha256-OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU="; };