From ce799c73e5eb78e5011ebedaa25fec4b11792ac2 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 25 May 2024 19:01:01 +0000 Subject: [PATCH 001/123] nixos/influxdb: Replace custom drv with `pkgs.formats.toml` --- nixos/modules/services/databases/influxdb.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 9bc0b935d08f..0f8517703acc 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -93,11 +93,7 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommandLocal "config.toml" { } '' - ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ - > $out - ''; + configFile = (pkgs.formats.toml {}).generate "config.toml" configOptions; in { From 429f89688ae073199a52371d16ebe6c624f2f84d Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 25 May 2024 19:03:56 +0000 Subject: [PATCH 002/123] nixos/athens: Replace custom `jq`-based `runCommand` with `pkgs.formats` --- nixos/modules/services/development/athens.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix index ddd4699fea2a..214a262a65e2 100644 --- a/nixos/modules/services/development/athens.nix +++ b/nixos/modules/services/development/athens.nix @@ -140,12 +140,10 @@ let } ); - configFile = pkgs.runCommandLocal "config.toml" { } '' - ${pkgs.buildPackages.jq}/bin/jq 'del(..|nulls)' \ - < ${pkgs.writeText "config.json" (builtins.toJSON athensConfig)} | \ - ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \ - > $out - ''; + configFile = lib.pipe athensConfig [ + (lib.filterAttrsRecursive (_k: v: v != null)) + ((pkgs.formats.toml {}).generate "config.toml") + ]; in { meta = { From 94b7b469aa6ae3f3b7adb08d325eaa6eb434735e Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 25 May 2024 19:05:56 +0000 Subject: [PATCH 003/123] nixos/promtail: Replace custom `jq`-based `runCommand` with `pkgs.formats` --- nixos/modules/services/logging/promtail.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index d6038055c05c..7dabe13de41d 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -2,9 +2,11 @@ let cfg = config.services.promtail; - prettyJSON = conf: pkgs.runCommandLocal "promtail-config.json" {} '' - echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out - ''; + format = pkgs.formats.json {}; + prettyJSON = conf: with lib; pipe conf [ + (flip removeAttrs [ "_module" ]) + (format.generate "promtail-config.json") + ]; allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs; @@ -20,7 +22,7 @@ in { enable = mkEnableOption "the Promtail ingresser"; configuration = mkOption { - type = (pkgs.formats.json {}).type; + type = format.type; description = '' Specify the configuration for Promtail in Nix. This option will be ignored if `services.promtail.configFile` is defined. From 7a2e88f7c13ca9043d6ee1606f7d3239dde8d76b Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 25 May 2024 19:03:56 +0000 Subject: [PATCH 004/123] nixos/traefik: Replace custom config format handling with `pkgs.formats` --- .../modules/services/web-servers/traefik.nix | 50 ++++--------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 1a65ce21112e..b02944719275 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -4,48 +4,18 @@ with lib; let cfg = config.services.traefik; - jsonValue = with types; - let - valueType = nullOr (oneOf [ - bool - int - float - str - (lazyAttrsOf valueType) - (listOf valueType) - ]) // { - description = "JSON value"; - emptyValue.value = { }; - }; - in valueType; + + format = pkgs.formats.toml {}; + dynamicConfigFile = if cfg.dynamicConfigFile == null then - pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - } '' - remarshal -if json -of toml \ - < ${ - pkgs.writeText "dynamic_config.json" - (builtins.toJSON cfg.dynamicConfigOptions) - } \ - > $out - '' + format.generate "config.toml" cfg.dynamicConfigOptions else cfg.dynamicConfigFile; + staticConfigFile = if cfg.staticConfigFile == null then - pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.yj ]; - preferLocalBuild = true; - } '' - yj -jt -i \ - < ${ - pkgs.writeText "static_config.json" (builtins.toJSON - (recursiveUpdate cfg.staticConfigOptions { - providers.file.filename = "${dynamicConfigFile}"; - })) - } \ - > $out - '' + format.generate "config.toml" (recursiveUpdate cfg.staticConfigOptions { + providers.file.filename = "${dynamicConfigFile}"; + }) else cfg.staticConfigFile; @@ -71,7 +41,7 @@ in { description = '' Static configuration for Traefik. ''; - type = jsonValue; + type = format.type; default = { entryPoints.http.address = ":80"; }; example = { entryPoints.web.address = ":8080"; @@ -95,7 +65,7 @@ in { description = '' Dynamic configuration for Traefik. ''; - type = jsonValue; + type = format.type; default = { }; example = { http.routers.router1 = { From adaee656c26fcfb6c84f0d9b742b102851b4aa5f Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 26 May 2024 18:17:02 +0000 Subject: [PATCH 005/123] nixos/ncdns: Replace custom config format handling with `pkgs.formats.toml` --- nixos/modules/services/networking/ncdns.nix | 22 +++------------------ 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/networking/ncdns.nix b/nixos/modules/services/networking/ncdns.nix index 115726381eb7..6de8248bbee8 100644 --- a/nixos/modules/services/networking/ncdns.nix +++ b/nixos/modules/services/networking/ncdns.nix @@ -6,23 +6,7 @@ let dataDir = "/var/lib/ncdns"; username = "ncdns"; - valueType = with lib.types; oneOf [ int str bool path ] - // { description = "setting type (integer, string, bool or path)"; }; - - configType = with lib.types; attrsOf (nullOr (either valueType configType)) - // { description = '' - ncdns.conf configuration type. The format consists of an - attribute set of settings. Each setting can be either `null`, - a value or an attribute set. The allowed values are integers, - strings, booleans or paths. - ''; - }; - - configFile = pkgs.runCommand "ncdns.conf" - { json = builtins.toJSON cfg.settings; - passAsFile = [ "json" ]; - } - "${pkgs.remarshal}/bin/json2toml < $jsonPath > $out"; + format = pkgs.formats.toml {}; defaultFiles = { public = "${dataDir}/bit.key"; @@ -160,7 +144,7 @@ in }; settings = lib.mkOption { - type = configType; + type = format.type; default = { }; example = lib.literalExpression '' { # enable webserver @@ -257,7 +241,7 @@ in User = "ncdns"; StateDirectory = "ncdns"; Restart = "on-failure"; - ExecStart = "${pkgs.ncdns}/bin/ncdns -conf=${configFile}"; + ExecStart = "${pkgs.ncdns}/bin/ncdns -conf=${format.generate "ncdns.conf" cfg.settings}"; }; preStart = lib.optionalString (cfg.dnssec.enable && needsKeygen) '' From b375b56327f6c8ea3756dfd3d79fddeb17e96a05 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 26 May 2024 18:58:28 +0000 Subject: [PATCH 006/123] nixos/ncdns: remove dead code, mark unused parameters with `_` Found using `deadnix`. --- nixos/modules/services/networking/ncdns.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ncdns.nix b/nixos/modules/services/networking/ncdns.nix index 6de8248bbee8..011cdd5adaf6 100644 --- a/nixos/modules/services/networking/ncdns.nix +++ b/nixos/modules/services/networking/ncdns.nix @@ -4,7 +4,6 @@ let cfg = cfgs.ncdns; dataDir = "/var/lib/ncdns"; - username = "ncdns"; format = pkgs.formats.toml {}; @@ -19,7 +18,7 @@ let needsKeygen = lib.all lib.id (lib.flip lib.mapAttrsToList cfg.dnssec.keys (n: v: v == lib.getAttr n defaultFiles)); - mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v); + mkDefaultAttrs = lib.mapAttrs (_n: v: lib.mkDefault v); in From 46c93546e1d6fe0ab337ba0453a67efa4b1340ae Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 26 May 2024 19:38:52 +0000 Subject: [PATCH 007/123] nixos/thanos: Replace custom config format handling with `pkgs.formats.yaml` --- nixos/modules/services/monitoring/thanos.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 10f4d08f8874..097d34e6440d 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -28,7 +28,7 @@ let cfg = config.services.thanos; nullOpt = type: description: mkOption { - type = types.nullOr type; + type = if type.check null then type else types.nullOr type; default = null; description = description; }; @@ -85,11 +85,7 @@ let }; }; - toYAML = name: attrs: pkgs.runCommand name { - preferLocalBuild = true; - json = builtins.toFile "${name}.json" (builtins.toJSON attrs); - nativeBuildInputs = [ pkgs.remarshal ]; - } "json2yaml -i $json -o $out"; + format = pkgs.formats.yaml {}; thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" + (let args = cfg.${cmd}.arguments; @@ -144,10 +140,10 @@ let option = mkOption { type = with types; nullOr str; default = if cfg.tracing.config == null then null - else toString (toYAML "tracing.yaml" cfg.tracing.config); + else toString (format.generate "tracing.yaml" cfg.tracing.config); defaultText = literalExpression '' if config.services.thanos..tracing.config == null then null - else toString (toYAML "tracing.yaml" config.services.thanos..tracing.config); + else toString (format.generate "tracing.yaml" config.services.thanos..tracing.config); ''; description = '' Path to YAML file that contains tracing configuration. @@ -160,7 +156,7 @@ let tracing.config = { toArgs = _opt: _attrs: []; - option = nullOpt types.attrs '' + option = nullOpt format.type '' Tracing configuration. When not `null` the attribute set gets converted to @@ -209,10 +205,10 @@ let option = mkOption { type = with types; nullOr str; default = if cfg.objstore.config == null then null - else toString (toYAML "objstore.yaml" cfg.objstore.config); + else toString (format.generate "objstore.yaml" cfg.objstore.config); defaultText = literalExpression '' if config.services.thanos..objstore.config == null then null - else toString (toYAML "objstore.yaml" config.services.thanos..objstore.config); + else toString (format.generate "objstore.yaml" config.services.thanos..objstore.config); ''; description = '' Path to YAML file that contains object store configuration. @@ -225,7 +221,7 @@ let objstore.config = { toArgs = _opt: _attrs: []; - option = nullOpt types.attrs '' + option = nullOpt format.type '' Object store configuration. When not `null` the attribute set gets converted to From 846ed3d86b7ada28ede8a8847990aacb9cff74fd Mon Sep 17 00:00:00 2001 From: LucasFA <23667494+LucasFA@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:48:56 +0000 Subject: [PATCH 008/123] qc71_laptop: 2023-03-02 -> 2025-01-07 --- pkgs/os-specific/linux/qc71_laptop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index e6e51938518b..aaeedb91c612 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "qc71_laptop"; - version = "unstable-2023-03-02"; + version = "0-unstable-2025-01-07"; src = fetchFromGitHub { owner = "pobrn"; repo = "qc71_laptop"; - rev = "8805dc5639f6659addf153a295ad4bbaa2483fa3"; - hash = "sha256-wg7APGArjrl9DEAHTG6BknOBx+UbtNrzziwmLueKPfA="; + rev = "ebab4af0b2c5b162bb9f27c80cd284c36b8fb7a9"; + hash = "sha256-sRvxcdocYKnwMH/qYkKj66uClI1bSmMSxXHrHsc7uco="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 0d6d5b3a0fb15c46b6c1282c6ffef0dbba98f7f3 Mon Sep 17 00:00:00 2001 From: LucasFA <23667494+LucasFA@users.noreply.github.com> Date: Tue, 7 Jan 2025 21:54:46 +0000 Subject: [PATCH 009/123] qc71_laptop: add updateScript --- pkgs/os-specific/linux/qc71_laptop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index aaeedb91c612..73a6a77dbad9 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, kernel, kernelModuleMakeFlags, + nix-update-script, }: stdenv.mkDerivation rec { @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = with lib; { description = "Linux driver for QC71 laptop"; homepage = "https://github.com/pobrn/qc71_laptop/"; From b9837ee74cf176fb5932fe895fa7a3c5bbf09328 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Mar 2025 01:12:37 +0000 Subject: [PATCH 010/123] p2pool: 4.3 -> 4.4 --- pkgs/by-name/p2/p2pool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index e0c94735fd54..16fb274d0130 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-PHrmTkmpYOPKx9q+/mhjr8MIbFqmljKs2F26tqyCzcE="; + hash = "sha256-+wkcTkHhGNanCznL5d9yUezi9wLIchxt6TPPpEUqgN8="; fetchSubmodules = true; }; From 6a3d4273d82649aa207f1c54981f52de379d58fd Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 6 Mar 2025 10:33:39 -0300 Subject: [PATCH 011/123] backgroundremover: 0.2.8 -> 0.2.9 Signed-off-by: lucasew --- pkgs/by-name/ba/backgroundremover/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 3c9eab61566a..a39448c661fb 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -11,14 +11,14 @@ let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "nadermx"; repo = "backgroundremover"; rev = "v${version}"; - hash = "sha256-LjVT4j0OzfbVSQgU0z/gzRTLm7N0RQRrfxtTugWwOxs="; + hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM="; }; models = runCommand "background-remover-models" { } '' From 3bd16814b01d7ab805201a7f0ee7c7f960988067 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 6 Mar 2025 10:37:53 -0300 Subject: [PATCH 012/123] backgroundremover: fix build, remove with lib in meta Signed-off-by: lucasew --- pkgs/by-name/ba/backgroundremover/package.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index a39448c661fb..1b963d940c7d 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -14,6 +14,10 @@ let version = "0.2.9"; pyproject = true; + build-system = [ + p.setuptools + ]; + src = fetchFromGitHub { owner = "nadermx"; repo = "backgroundremover"; @@ -29,21 +33,21 @@ let ''; postPatch = '' + rm -rf *dist substituteInPlace backgroundremover/bg.py backgroundremover/u2net/detect.py \ --replace-fail 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" - ''; - nativeBuildInputs = [ - p.setuptools - p.wheel - ]; + substituteInPlace backgroundremover/bg.py \ + --replace-fail 'import moviepy.editor' 'import moviepy' + ''; pythonRelaxDeps = [ "pillow" "torchvision" + "moviepy" ]; - propagatedBuildInputs = [ + dependencies = [ p.certifi p.charset-normalizer p.ffmpeg-python @@ -95,13 +99,13 @@ let doCheck = false; # no tests - meta = with lib; { + meta = { mainProgram = "backgroundremover"; description = "Command line tool to remove background from image and video, made by nadermx to power"; homepage = "https://BackgroundRemoverAI.com"; downloadPage = "https://github.com/nadermx/backgroundremover/releases"; - license = licenses.mit; - maintainers = [ maintainers.lucasew ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lucasew ]; }; }; in From 58cbaece2ff01cc818b51fdd85d5024d00aabced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 19:33:34 +0000 Subject: [PATCH 013/123] lastversion: 3.5.0 -> 3.5.7 --- pkgs/development/python-modules/lastversion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lastversion/default.nix b/pkgs/development/python-modules/lastversion/default.nix index 8e5e2d28d876..48d3b15ff000 100644 --- a/pkgs/development/python-modules/lastversion/default.nix +++ b/pkgs/development/python-modules/lastversion/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "lastversion"; - version = "3.5.0"; + version = "3.5.7"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dvershinin"; repo = "lastversion"; - rev = "v${version}"; - hash = "sha256-SeDLpMP8cF6CC3qJ6V8dLErl6ihpnl4lHeBkp7jtQgI="; + tag = "v${version}"; + hash = "sha256-z3QrtnhIgXLVyaDNm0XqaVqZb05K3pq8mbweTpphdBQ="; }; build-system = [ setuptools ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "Find the latest release version of an arbitrary project"; homepage = "https://github.com/dvershinin/lastversion"; - changelog = "https://github.com/dvershinin/lastversion/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/dvershinin/lastversion/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ShamrockLee ]; mainProgram = "lastversion"; From c1ffb6f8f458d9684dacfafadd0aa6518f6d8a62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 19:55:14 +0000 Subject: [PATCH 014/123] klayout: 0.29.11 -> 0.29.12 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 14cfbaab1619..8c045da4e3fd 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.29.11"; + version = "0.29.12"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-MIXuqDnK8kXjQOSTALVPQHIE1eMk1Dl1M+/GMbw92bg="; + hash = "sha256-TLLAIlZYKGeQENtzfc9ilWwl4yu2ln7yBy+VW7Zwexc="; }; postPatch = '' From 984fdf059d7a08d8def03785748e88847e4336e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 20:24:42 +0000 Subject: [PATCH 015/123] python312Packages.pywinctl: 0.4 -> 0.4.01 --- pkgs/development/python-modules/pywinctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pywinctl/default.nix b/pkgs/development/python-modules/pywinctl/default.nix index e5e1726e5522..fa3bc56b0f59 100644 --- a/pkgs/development/python-modules/pywinctl/default.nix +++ b/pkgs/development/python-modules/pywinctl/default.nix @@ -11,15 +11,15 @@ }: buildPythonPackage rec { - version = "0.4"; + version = "0.4.01"; pname = "pywinctl"; pyproject = true; src = fetchFromGitHub { owner = "Kalmat"; repo = "pywinctl"; - rev = "refs/tags/v${version}"; - hash = "sha256-n7P12+8e1pPnJQrsYnRiYlzsKJTIYPH+iF1FuRx8A7M="; + tag = "v${version}"; + hash = "sha256-l9wUnEjOpKrjulruUX+AqQIjduDfX+iMmSv/V32jpdc="; }; build-system = [ setuptools ]; From bcca3d2a69c5f48502d08b603f6053720551c268 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 10:07:51 +0000 Subject: [PATCH 016/123] jumppad: 0.16.1 -> 0.17.1 --- 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 da89f6a260a6..72326c2c36e3 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.16.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-2xJsTkgvBYbbKGLr24Mpgcpd3AJkuePi+FXnbZJP2wg="; + hash = "sha256-SoiF5y0Vc2T8qT75cII3HqNSEZhWAzKEk3xw4BGICpo="; }; - vendorHash = "sha256-dxMCkLrE97fpRI60PqWoo/+HKDbTLKmMNtegDigQPAI="; + vendorHash = "sha256-mJKawveIoDu2v+GxIoljmFbCwle9d1SQiHzsoerP66I="; subPackages = [ "." ]; From 82197b2933cb272be2c04655f81d892d8d9f1ecf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 12:14:25 +0000 Subject: [PATCH 017/123] heptabase: 1.53.1 -> 1.53.4 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index b647068fdd5d..89dae6c414f9 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.53.1"; + version = "1.53.4"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-CRV+ihjaGz+I2CdZVbASGTUbOjSb8TXcrBb8dvR/hDc="; + hash = "sha256-dDwz9bn5UZJ3aQYy2SJYKSSaZJzj/B+zRmfwxgsUjBc="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From f60528a6adfd3860c6b503dcb91c719adbbee8cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 14:41:22 +0000 Subject: [PATCH 018/123] treesheets: 0-unstable-2025-02-20 -> 0-unstable-2025-03-03 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 1639807aaca1..e08be9dd7609 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-02-20"; + version = "0-unstable-2025-03-03"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4e4d99df2080535cf4838319a8b3526425ba7bb7"; - hash = "sha256-zM890w0GgtW++mAhze73GaCThx7WhyucrC24yDZYq0k="; + rev = "a09352dabf6c491eed411bca5e613ba58142debc"; + hash = "sha256-3lO8bsdluj24EMikvSQ7qOciHmIlKVxR3GWAG/SfUFM="; }; nativeBuildInputs = [ From 3058a46486f6d0da38c9864d514e16286bfb3f65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 19:46:07 +0000 Subject: [PATCH 019/123] python312Packages.anthropic: 0.47.2 -> 0.49.0 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 8eb822384747..aea6f985f2a5 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.47.2"; + version = "0.49.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-W7ByBoPTpSOww+hf/uOQdpRm0NxX7vA9QbSLd9mVQdE="; + hash = "sha256-vbK8rqCekWbgLAU7YlHUhfV+wB7Q3Rpx0OUYvq3WYWw="; }; build-system = [ From f55d3963ff51fc9bdbf375c2cac205d35b369c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 20:07:09 +0000 Subject: [PATCH 020/123] mongoc: 1.30.1 -> 1.30.2 --- pkgs/by-name/mo/mongoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongoc/package.nix b/pkgs/by-name/mo/mongoc/package.nix index 8466419fc869..5812ffda8bef 100644 --- a/pkgs/by-name/mo/mongoc/package.nix +++ b/pkgs/by-name/mo/mongoc/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; tag = version; - hash = "sha256-jkMt6+nNV0fO8jp6L0ayed3MEWO56yQP7Rd1r7ccIrM="; + hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM="; }; nativeBuildInputs = [ From 5dca34fab089d6ee74e0947a835253fbeec8be24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 21:04:43 +0000 Subject: [PATCH 021/123] mihomo-party: 1.7.1 -> 1.7.2 --- pkgs/by-name/mi/mihomo-party/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 02467ca6ebd1..ecdc61aebd4b 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "mihomo-party"; - version = "1.7.1"; + version = "1.7.2"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { fetchurl { url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-fVPW4lk+1uY+zTPk0wNeHz7ILKB+7p9hunHrqnuPI6w="; - aarch64-linux = "sha256-wEOOP5ha7R0z0DCTCsmn5lfwJdzEWtNGdWNjVB5cI6k="; + x86_64-linux = "sha256-hJnb0K3ytw0ITwL6dY1klSG260WrZQiHhz4FRZ0idI4="; + aarch64-linux = "sha256-6hAB1QezewgKI2We0zDTK+vNgxcMP2AEmGZqdSbMcWQ="; }; }; From 125106731e410a4ba0e9fe3706c6082d1e8810dd Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 7 Mar 2025 23:30:08 -0600 Subject: [PATCH 022/123] goverlay: 1.2 -> 1.3-2 --- pkgs/by-name/go/goverlay/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index 4e4e6f90028c..694aab6df2a5 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -13,8 +13,8 @@ libGLU, libnotify, libX11, - lsb-release, nix-update-script, + pciutils, polkit, procps, qt6Packages, @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "goverlay"; - version = "1.2"; + version = "1.3-2"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - sha256 = "sha256-tSpM+XLlFQLfL750LTNWbWFg1O+0fSfsPRXuRCm/KlY="; + sha256 = "sha256-Vxmmsf/l3OK1Q6UKdhCWvU4WPJkdQG2Hn+s9tS+D5KM="; }; outputs = [ @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \ --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \ --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \ - --replace-fail '/usr/lib/os-release' '/etc/os-release' \ - --replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null" + --replace-fail '/bin/uname' "${lib.getExe' coreutils "uname"}" \ + --replace-fail '/usr/bin/lspci' "${lib.getExe' pciutils "lspci"}" \ + --replace-fail "FONTFOLDER := '/usr/share/fonts/'" "FONTFOLDER := GetEnvironmentVariable('HOME') + '/.local/share/fonts/'" \ + --replace-fail "'/usr/share/fonts/'" 'FONTFOLDER' ''; nativeBuildInputs = [ From acec30b2a87ad21b3bd5bdc58d1b6e6b15637ea5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 19:44:49 +0000 Subject: [PATCH 023/123] python312Packages.python-arango: 8.1.4 -> 8.1.6 --- pkgs/development/python-modules/python-arango/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index ac9b3e62c53f..683fb494643e 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,16 +33,16 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.4"; + version = "8.1.6"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-NAFleaZaZFWwhAPsuJG9S81w/FlkHgefqVWg5F+lhUo="; + hash = "sha256-y+ECfrLoenjXl71hty7snNdu6tN5q8XTGtBlXtkSg7g="; }; nativeBuildInputs = [ @@ -153,7 +153,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Driver for ArangoDB"; homepage = "https://github.com/ArangoDB-Community/python-arango"; - changelog = "https://github.com/ArangoDB-Community/python-arango/releases/tag/${version}"; + changelog = "https://github.com/ArangoDB-Community/python-arango/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ jsoo1 ]; }; From 9858b625f354c02fa91b9318dc37efdafc9b7b79 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 4 Mar 2025 21:10:45 -0800 Subject: [PATCH 024/123] steam: Allow overriding privateTmp Some programs use /tmp to communicate, and steam having a private tmp causes issues with that. Allow disabling privateTmp in an override. Things that rely on /tmp: - PROTON_DUMP_DEBUG_COMMANDS dumps files to /tmp, where they can't be retrieved because steam-run gets a different /tmp - I'm not sure why this is, but in my testing, running tasklist through proton + cmd.exe would only show running steam games when privateTmp was false. I wanted this to get the windows pid of a steam game for attaching to it with Textractor. - Communication between teamspeak/arma 3 as reported in https://github.com/NixOS/nixpkgs/issues/381923 --- pkgs/by-name/st/steam/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix index a5ee7aa7e88b..5301e0071f2b 100644 --- a/pkgs/by-name/st/steam/package.nix +++ b/pkgs/by-name/st/steam/package.nix @@ -10,11 +10,12 @@ extraBwrapArgs ? [ ], # extra arguments to pass to bubblewrap (real default is at usage site) extraArgs ? "", # arguments to always pass to steam extraEnv ? { }, # Environment variables to pass to Steam + privateTmp ? true, # if the steam bubblewrap should isolate /tmp }: let steamEnv = { name, runScript, passthru ? {}, meta ? {} }: buildFHSEnv { - inherit name runScript passthru meta; + inherit name runScript passthru meta privateTmp; multiArch = true; includeClosures = true; @@ -105,8 +106,6 @@ let ${extraProfile} ''; - privateTmp = true; - inherit extraPreBwrapCmds; extraBwrapArgs = [ From 1d257b0265110596d56d9356823b1f64d3bd74be Mon Sep 17 00:00:00 2001 From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com> Date: Sun, 9 Mar 2025 17:42:00 +0200 Subject: [PATCH 025/123] burpsuite: 2025.1.3 -> 2025.1.4 --- pkgs/by-name/bu/burpsuite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 037873bf10f9..2da9223144ec 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.1.3"; + version = "2025.1.4"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-BlVAQe6KLn9THVJTk+rDZoLeAbIW8IA3rDpS6xPhDLo="; + hash = "sha256-NpWqrdUaxPvU4O2MplLTRfnqOB2yC/zQJx7o9stjKCU="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-M1T7atQmB0fRmH9NDZ3uyc3rQpqBc2u3WRZO5rDBj+g="; + hash = "sha256-jLwI9r1l/bf2R7BOImEnbW3iLgsF+/1n0/N55Jx8Lzw="; }; src = fetchurl { From 0b56ca464154a9ca2d24dd768f7f8ae383041f26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Mar 2025 16:43:51 +0000 Subject: [PATCH 026/123] qtox: 1.18.2 -> 1.18.3 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 0c3d2e114762..64ee393b73a1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "qtox"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "TokTok"; repo = "qTox"; tag = "v${version}"; - hash = "sha256-NPJ1tBIcM4zR5izsoiydUO2+cEuWOdWAf2xte7bwOxg="; + hash = "sha256-5pH39NsJdt4+ldlbpkvA0n/X/LkEUEv4UL1K/W3BqmM="; }; buildInputs = [ From 46c26ded520b2ba6e8c64f6e5a60c821f47834a4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 10 Mar 2025 00:36:07 +0100 Subject: [PATCH 027/123] xbattbar: fix build with gcc 14 --- pkgs/by-name/xb/xbattbar/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xb/xbattbar/package.nix b/pkgs/by-name/xb/xbattbar/package.nix index 1775107fc744..f9e2fc3a1362 100644 --- a/pkgs/by-name/xb/xbattbar/package.nix +++ b/pkgs/by-name/xb/xbattbar/package.nix @@ -28,8 +28,13 @@ stdenv.mkDerivation rec { # does. # - perl shebang patches for acpi/sys scripts # - unhardcode path to checker scripts - patchPhase = '' - patch -p1 < ${./sys-by-default.patch} + # - add missing return type in main function + patches = [ ./sys-by-default.patch ]; + + postPatch = '' + substituteInPlace xbattbar.c \ + --replace-fail "main(int argc" "int main(int argc" + sed -i -e "s,/usr/lib/xbattbar/,$out/libexec/," xbattbar.c sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-acpi sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-sys From da1467e413f66b5da8ffcce92781875af1c28255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Mar 2025 11:12:34 +0000 Subject: [PATCH 028/123] python312Packages.llama-cloud: 0.1.13 -> 0.1.14 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index faca7c52a78d..79165c27c231 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.13"; + version = "0.1.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-y2Ui+9D15MHNKCXnC7lD0NiRaBbiMqXOO+OnJy8ymow="; + hash = "sha256-kHQaGbqWln+iSECEko4yaulXc2eAoVtnvDrV9S6UeC0="; }; build-system = [ poetry-core ]; From beca19cde5ade3b719291117c395bd4dbe4e0617 Mon Sep 17 00:00:00 2001 From: Gaston Jorquera Date: Tue, 11 Mar 2025 18:38:15 -0400 Subject: [PATCH 029/123] onlyoffice-desktopeditors: 8.3.0 -> 8.3.1 Fixes #385406. --- pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index 742b692a16c5..218b1a7bcfb5 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -66,11 +66,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.3.0"; + version = "8.3.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - hash = "sha256-rx9jh2jWA7+EOoNackHEUsLg1lX+VXbqp+cCUQAoQuM="; + hash = "sha256-6eoXLOLshHpn3eaEx57ll66nD+gs1LZUET0CSm4od5c="; }; nativeBuildInputs = [ From 157fdcab35371352c5446f0e7a167115eaafcb24 Mon Sep 17 00:00:00 2001 From: Naufal Fikri Date: Tue, 5 Nov 2024 17:18:56 +1100 Subject: [PATCH 030/123] maintainers: add naufik --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b9cc3b38425e..2efa692eaafc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16462,6 +16462,13 @@ githubId = 56316606; name = "Amneesh Singh"; }; + naufik = { + email = "naufal@naufik.net"; + github = "naufik"; + githubId = 8577904; + name = "Naufal Fikri"; + keys = [ { fingerprint = "1575 D651 E31EC 6117A CF0AA C1A3B 8BBC A515 8835"; } ]; + }; naxdy = { name = "Naxdy"; email = "naxdy@naxdy.org"; From 887a02ef6907001bcfb1aa0d5e2b2c3bc1aee7ee Mon Sep 17 00:00:00 2001 From: Naufal Fikri Date: Wed, 12 Mar 2025 19:58:21 +1100 Subject: [PATCH 031/123] python3Packages.marqo: init at 3.11.0 --- .../python-modules/marqo/default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/marqo/default.nix diff --git a/pkgs/development/python-modules/marqo/default.nix b/pkgs/development/python-modules/marqo/default.nix new file mode 100644 index 000000000000..eeb794c22fc4 --- /dev/null +++ b/pkgs/development/python-modules/marqo/default.nix @@ -0,0 +1,78 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + requests, + packaging, + pydantic, + typing-extensions, + requests-mock, +}: + +buildPythonPackage rec { + name = "marqo"; + version = "3.11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "marqo-ai"; + repo = "py-marqo"; + rev = "refs/tags/${version}"; + hash = "sha256-8BcYJZ7tXkuvtQzopZO9bvLXAJQdd8MnQflVTawTaw0="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + typing-extensions + ]; + + disabledTestPaths = [ + # Tests require network + "tests/v2_tests/test_tensor_search.py" + "tests/v2_tests/test_client.py" + "tests/v2_tests/test_get_settings.py" + "tests/v2_tests/test_tensor_search.py" + "tests/v2_tests/test_add_documents.py" + "tests/v2_tests/test_delete_documents.py" + "tests/v2_tests/test_demos.py" + "tests/v2_tests/test_custom_vector_search.py" + "tests/v2_tests/test_create_index.py" + "tests/v2_tests/test_image_chunking.py" + "tests/v2_tests/test_telemetry.py" + "tests/v2_tests/test_score_modifier_search.py" + "tests/v2_tests/test_model_cache_management.py" + "tests/v2_tests/test_embed.py" + "tests/v2_tests/test_index_init_logging.py" + "tests/v2_tests/test_marqo_cloud_instance_mapping.py" + "tests/v2_tests/test_index_manipulation_features.py" + "tests/v2_tests/test_index.py" + "tests/v2_tests/test_get_indexes.py" + "tests/v2_tests/test_hybrid_search.py" + "tests/v2_tests/test_logging.py" + "tests/v2_tests/test_recommend.py" + ]; + + dependencies = [ + packaging + pydantic + requests + + ]; + + pythonRemoveDeps = [ "urllib3" ]; + + pythonImportsCheck = [ "marqo" ]; + + meta = with lib; { + description = "Unified embedding generation and search engine"; + homepage = "https://marqo.ai"; + changelog = "https://github.com/marqo-ai/py-marqo/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ naufik ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ada9268c90d1..b91ee46f5fa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8108,6 +8108,8 @@ self: super: with self; { markups = callPackage ../development/python-modules/markups { }; + marqo = callPackage ../development/python-modules/marqo { }; + marshmallow = callPackage ../development/python-modules/marshmallow { }; marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { }; From a497c9bc9b1bc038ae4b9576282bad261c32704e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 12 Mar 2025 11:52:13 +0100 Subject: [PATCH 032/123] golangci-lint: 1.64.6 -> 1.64.7 Changelog: https://github.com/golangci/golangci-lint/releases/tag/v1.64.7 --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index f3348efcf181..2959f3f41f8d 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "1.64.6"; + version = "1.64.7"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-uJKZRJx+hUCXrLrLq1UcBknRSR/o+R9trfacgg27MLs="; + hash = "sha256-nxJ+b491qdtT2pSznYPhKZtLZENsmQj8zYCd3KRSqRc="; }; - vendorHash = "sha256-6vL6lYZcpi9roRa+sFbQPq4Ysd8TM3j40wg68B5VbX0="; + vendorHash = "sha256-i7ec4U4xXmRvHbsDiuBjbQ0xP7xRuilky3gi+dT1H10="; subPackages = [ "cmd/golangci-lint" ]; From 2af7c649197adfd86ee49f0bb5321f8c9ba18b83 Mon Sep 17 00:00:00 2001 From: Connor Nelson Date: Wed, 12 Mar 2025 12:07:12 -0700 Subject: [PATCH 033/123] python312Packages.angrop: remove progressbar dependency --- pkgs/development/python-modules/angrop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 58c5efab8d76..d65d3060a0cb 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -3,7 +3,6 @@ angr, buildPythonPackage, fetchFromGitHub, - progressbar, pythonOlder, setuptools, tqdm, @@ -27,7 +26,6 @@ buildPythonPackage rec { dependencies = [ angr - progressbar tqdm ]; From 1b5fb010a63b7357ed8eba91c36fd0a5fd8717f9 Mon Sep 17 00:00:00 2001 From: XYenon Date: Thu, 13 Mar 2025 14:12:21 +0800 Subject: [PATCH 034/123] quickjs-ng: 0.8.0 -> 0.9.0 --- pkgs/by-name/qu/quickjs-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index 3f7adae93363..6191b00cd4c4 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; tag = "v${finalAttrs.version}"; - hash = "sha256-o0Cpy+20EqNdNENaYlasJcKIGU7W4RYBcTMsQwFTUNc="; + hash = "sha256-/E9JSINmuv+9M5qODsmTCkcpdTyG0qN6I+iUbq5XclE="; }; outputs = [ From 8fc3917f2004e44591ca706713250fe7d6e33c76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 12:38:21 +0000 Subject: [PATCH 035/123] python312Packages.zwave-js-server-python: 0.60.1 -> 0.61.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index c18ed1d3ec99..ad8fb97f4e1b 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.60.1"; + version = "0.61.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = version; - hash = "sha256-YRC9DA77sLuTxw7YRbhYKxUOaBQaERTV4UWAwAEldhU="; + hash = "sha256-bIo+Kggk8vQHtdey36WunhTR3x8nfySVaJOyZDzKXRk="; }; build-system = [ setuptools ]; From fac7cd448787cf65a31bbe3e18e76ba5bf4df551 Mon Sep 17 00:00:00 2001 From: henrispriet Date: Mon, 27 Jan 2025 18:00:27 +0100 Subject: [PATCH 036/123] maintainers: add henrispriet --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 45bd2de0e157..b6a0bf24b789 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9462,6 +9462,12 @@ githubId = 49935860; name = "Henri Rosten"; }; + henrispriet = { + email = "henri.spriet@gmail.com"; + github = "henrispriet"; + githubId = 36509362; + name = "Henri Spriet"; + }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; From d74db9de3706848c556e70c44559e1b83f7df07c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 17:16:54 +0000 Subject: [PATCH 037/123] alvr: 20.12.1 -> 20.13.0 --- pkgs/by-name/al/alvr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index b814e56fe5d0..83593f568972 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -40,18 +40,18 @@ rustPlatform.buildRustPackage rec { pname = "alvr"; - version = "20.12.1"; + version = "20.13.0"; src = fetchFromGitHub { owner = "alvr-org"; repo = "ALVR"; tag = "v${version}"; fetchSubmodules = true; #TODO devendor openvr - hash = "sha256-T7KyGZwnJ9t4Bh8KFy190IV3igWCG+yn+OW9a6mgmYI="; + hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DE88nMC6qpbPJsBpdyITv6igMgwy4g40VCgFQQuRRTA="; + cargoHash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ="; patches = [ (replaceVars ./fix-finding-libs.patch { From 3794caac6a5b5735bd82b9d949f6723152d3ae0f Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 13 Mar 2025 11:05:32 -0700 Subject: [PATCH 038/123] signalbackup-tools: 20250305-2 -> 20250313-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250305-2...20250313-1 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index d9b088ed6c7a..c7417a32c988 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250305-2"; + version = "20250313-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-y655shDg3gnm5V1qhEbw6l0JzabhALXPeRQxyFhq2Cs="; + hash = "sha256-N72BNa/6ZqWD5epdVIeuC7tOCkn5Hy8+txPT4ScUgjo="; }; nativeBuildInputs = [ From b786de9445d1de8406eea0149801ce9b02b91f79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:37:06 +0100 Subject: [PATCH 039/123] python313Packages.coinmetrics-api-client: 2025.3.3.16 -> 2025.3.12.17 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index a82e825890b3..905543a5bbbe 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2025.3.3.16"; + version = "2025.3.12.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-HQoP9HkNZmNJWKfMNfnIQpQygRpBQPmRUkV/nyp/dUw="; + hash = "sha256-vmmsslR+4fhNqkzvXB87ilc6vQ+b9PdMlj6LEV7ms7A="; }; pythonRelaxDeps = [ "typer" ]; From 4f03df4b5147dc942976c9ad8b1c50cf0c8339bc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 13 Mar 2025 21:39:59 +0100 Subject: [PATCH 040/123] alvr: change maintainers --- pkgs/by-name/al/alvr/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 83593f568972..06cbe513917e 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -142,7 +142,10 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}"; license = licenses.mit; mainProgram = "alvr_dashboard"; - maintainers = with maintainers; [ passivelemon ]; + maintainers = with maintainers; [ + luNeder + jopejoe1 + ]; platforms = platforms.linux; }; } From a2729782f64e8fd1cb2caab6c15885484fc02443 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:40:52 +0100 Subject: [PATCH 041/123] python313Packages.mailchecker: 6.0.16 -> 6.0.17 Changelog: https://github.com/FGRibreau/mailchecker/blob/v6.0.17/CHANGELOG.md --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 0a4db11e4e1c..96650858ffbc 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.16"; + version = "6.0.17"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XZT70Nc1L/WGPM4tRgOrjs1N1AUD4O1V/evjcqS5qOk="; + hash = "sha256-FHIFsBltIe1BMiN9hzP99uig9mq68hQ0p5D9C8utClw="; }; build-system = [ setuptools ]; From 473395b1a3050d1ff4f95f949abfd270ac0b0ee7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:41:51 +0100 Subject: [PATCH 042/123] python313Packages.model-checker: 0.8.6 -> 0.8.8 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 487657bfa430..cb918a23394f 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.8.6"; + version = "0.8.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-rg2Z6Twwm7cDagfYt1kJoXv+o9LWWkc5ui8jaUtamx8="; + hash = "sha256-jxj397xLP0VMlqPfFLHQ2Uh5Bo3n9EUh/BeZdWZEVaQ="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 38abeabd8479a6cf052d37974ac8d6cf31192bd7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:44:22 +0100 Subject: [PATCH 043/123] python313Packages.msgraph-sdk: 1.23.0 -> 1.24.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/refs/tags/v1.23.0...v1.24.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.24.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index ef680c615243..bf18f6a5b292 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-dx79wF6BXhTRGW31TPJ1bbMCPGEm+Hrc5EVFeg6HyHk="; + hash = "sha256-7r7TuGR8J31BZdG8wJJAgWwllbkf3wYj1xLULNm8+xQ="; }; build-system = [ flit-core ]; From 23d96ba1ae7f3631d766000b8b9ebf6753a5f53c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:45:40 +0100 Subject: [PATCH 044/123] python313Packages.pipdeptree: 2.25.0 -> 2.25.1 Diff: https://github.com/tox-dev/pipdeptree/compare/refs/tags/2.25.0...2.25.1 Changelog: https://github.com/tox-dev/pipdeptree/releases/tag/2.25.1 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 989ce41bad38..7b4feb7ac8b2 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.25.0"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; tag = version; - hash = "sha256-U1zr38eZks7uMXKgsbRZUZlDsxScUsKaq+scH/mLRG4="; + hash = "sha256-vZPxpbR8O3XIyGcp2rn4skjy2xMQb6+5BHc4tjO84tw="; }; postPatch = '' From bd54aaca11582a127fd183d658e8113b09416094 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:47:13 +0100 Subject: [PATCH 045/123] python313Packages.pylutron-caseta: 0.23.0 -> 0.24.0 Diff: https://github.com/gurumitts/pylutron-caseta/compare/refs/tags/v0.23.0...v0.24.0 Changelog: https://github.com/gurumitts/pylutron-caseta/blob/v0.24.0/CHANGELOG.md --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 4a0a2105d172..6d9191b2dbfd 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; tag = "v${version}"; - hash = "sha256-p8c+WY+x5KcF7r6FXeF89JNtAwogRZELqXWgDc2iJek="; + hash = "sha256-67y/YaXWHklSppUxsJ44CDMsvBXLzKBGl00LXBWi4+g="; }; build-system = [ hatchling ]; From 2b127a4be9ab119260bf5fdcee52a3250b9aafcb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Mar 2025 21:50:01 +0100 Subject: [PATCH 046/123] python313Packages.reolink-aio: 0.12.1 -> 0.12.2 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.12.1...0.12.2 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.12.2 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 36b1784731dd..0f7f49721228 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-P2h4vVFNs2PChNviFknzGKDhy4aHy/0ptMVaKfzV/9I="; + hash = "sha256-js7+x5Ft3gBsycaUKTz7qDaPOlgOZmnmxmfHSVGy1cw="; }; build-system = [ setuptools ]; From 9d2ee1d6be434aac1368ccb878bc63bdcaea477e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 21:11:23 +0000 Subject: [PATCH 047/123] flameshot: 12.1.0-unstable-2025-02-12 -> 12.1.0-unstable-2025-03-10 --- pkgs/by-name/fl/flameshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 559fc3c476b4..882685e3ced5 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -25,13 +25,13 @@ in stdenv'.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) - version = "12.1.0-unstable-2025-02-12"; + version = "12.1.0-unstable-2025-03-10"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "7aa69e4e253b0a69b67c018b701db5ee8448142c"; - hash = "sha256-1OPZsOoe+z7xql1o44BisxF/pWqd5vx2a+Ar0gLerVA="; + rev = "1997aed8a332eeb3b468559bf454c5d78b4d2cbb"; + hash = "sha256-liiL0/H70XfsG2zM7N+GuIdvd6RE29QXYQLExiYCuvc="; }; patches = [ From 7ae50b26949948e6ec910e75af658d4744822117 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 01:37:10 +0100 Subject: [PATCH 048/123] nextcloud29: 29.0.12 -> 29.0.13 Diff: https://github.com/nextcloud/server/compare/v29.0.12...v29.0.13 Changelog: https://github.com/nextcloud/server/releases/tag/v29.0.13 --- pkgs/servers/nextcloud/default.nix | 4 +- pkgs/servers/nextcloud/packages/29.json | 56 ++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 972a0f289723..4deb330546cb 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ let in { nextcloud29 = generic { - version = "29.0.12"; - hash = "sha256-wCA1T/Ph0ghzcPcOBY/hcXE2NroPBzpRlK29/zwcr8Y="; + version = "29.0.13"; + hash = "sha256-B3hipF/CzO/mSJA3MIYh8H3Gw2bK20/Wo1JbiRGaXb8="; packages = nextcloud29Packages; }; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 962cfcd09ebf..8617f1e8beb8 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-o7RoBhg0UFzZoxXj1Qovbheq1i7wBHnn4hSnEbc/D/c=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.3/contacts-v6.0.3.tar.gz", - "version": "6.0.3", + "hash": "sha256-NctHwZmGw3eF0DhreHAqVd87En1PTNfJ0CyL8nZeQKU=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v6.0.4/contacts-v6.0.4.tar.gz", + "version": "6.0.4", "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 @@ ] }, "cookbook": { - "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", - "version": "0.11.2", + "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz", + "version": "0.11.3", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ @@ -120,9 +120,9 @@ ] }, "forms": { - "hash": "sha256-TPyz/cZvFnd35Blzlewgva6WO0PmAEAtI4hNpkACQcc=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.9/forms-v4.3.9.tar.gz", - "version": "4.3.9", + "hash": "sha256-0CqZmvjILDNdDMoI8H9H0uphXOkLavTvXpSsoeBP6fk=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.10/forms-v4.3.10.tar.gz", + "version": "4.3.10", "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": [ @@ -143,7 +143,7 @@ "hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz", "version": "17.0.10", - "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, 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.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -180,9 +180,9 @@ ] }, "integration_paperless": { - "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", - "version": "1.0.5", + "hash": "sha256-Tw0VZk+ByXLmFdNBgJdFnHUiFarDP+YyulzvCmE3ivw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.6/integration_paperless-v1.0.6.tar.gz", + "version": "1.0.6", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-lotR7KnNtZSpoSohgFbocIIan6/NBmAEZuuT+u2Iuv0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.21/mail-v3.7.21.tar.gz", - "version": "3.7.21", + "hash": "sha256-nx9trnOjtl/jd081DB8/5BjtDe6WVwcss0ynxyT/dEU=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.23/mail-v3.7.23.tar.gz", + "version": "3.7.23", "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": [ @@ -230,9 +230,9 @@ ] }, "news": { - "hash": "sha256-OtW42UQtG3fCJdwPW6t6b60Y2WscZw78/2L22kMiFig=", - "url": "https://github.com/nextcloud/news/releases/download/25.2.1/news.tar.gz", - "version": "25.2.1", + "hash": "sha256-CAnDrbpXZVISJ4WjAAl7mhZY2t9ohBgPLdf7tGd3aIY=", + "url": "https://github.com/nextcloud/news/releases/download/25.3.0/news.tar.gz", + "version": "25.3.0", "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": [ @@ -270,9 +270,9 @@ ] }, "polls": { - "hash": "sha256-sN/LzW3uw4NAy14ZtTeZZGz338LU2N+5S7FESqt9HUg=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.3.2/polls-v7.3.2.tar.gz", - "version": "7.3.2", + "hash": "sha256-fnZT4iuwlD66AVwiNPE0yurszO5/9IQsJfA1OB/dEVU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.1/polls-v7.4.1.tar.gz", + "version": "7.4.1", "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": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-JJp0dzFKJttDBuPOavraF7odo/0tVoDAeMPHVkmB78s=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.13/spreed-v19.0.13.tar.gz", - "version": "19.0.13", + "hash": "sha256-Wu228AT3cRcHZs1yk14LK8s/Rhpzhzl/qnZl2ZcL6qU=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.14/spreed-v19.0.14.tar.gz", + "version": "19.0.14", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -400,9 +400,9 @@ ] }, "user_oidc": { - "hash": "sha256-2FeFmqD53eUujA80s6cec53U5XL6CXSh5h3XM0N8Afk=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.3.1/user_oidc-v6.3.1.tar.gz", - "version": "6.3.1", + "hash": "sha256-jhqch6Gup7774P9seExlwhDGbDv0AK9LEzSEtmFW85A=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.0.0/user_oidc-v7.0.0.tar.gz", + "version": "7.0.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ From c9bcddbcd86b42278c51e15f29fb171c3d7a219c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 01:38:03 +0100 Subject: [PATCH 049/123] nextcloud30: 30.0.6 -> 30.0.7 Diff: https://github.com/nextcloud/server/compare/v30.0.6...v30.0.7 Changelog: https://github.com/nextcloud/server/releases/tag/v30.0.7 --- pkgs/servers/nextcloud/default.nix | 4 +- pkgs/servers/nextcloud/packages/30.json | 74 ++++++++++++------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 4deb330546cb..f33bceac7fe6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in }; nextcloud30 = generic { - version = "30.0.6"; - hash = "sha256-rA4JG+aSCWXcDILxSbYy1rWt563uhKezyM/YR0UKjdw="; + version = "30.0.7"; + hash = "sha256-3HIxyDKEBoPLcsPYognaFETVXBNVSoTrn656dfDBJQY="; packages = nextcloud30Packages; }; diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 2c50581fd097..4f1bdf116b96 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-Yn2hBNzZD6cbIqyzl25qd0adXZmLIrV1CZAvOrGVKy8=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.2/calendar-v5.1.2.tar.gz", - "version": "5.1.2", + "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", + "version": "5.1.3", "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": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-hiRIovYvG6idDsvt1eMqHiN5DsXNNyn9aAefT1QdCow=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.1/contacts-v7.0.1.tar.gz", - "version": "7.0.1", + "hash": "sha256-aBrbzXKWb3QzeBLWPR/4rWeM40haBiEQB9gFUNT3q/A=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.4/contacts-v7.0.4.tar.gz", + "version": "7.0.4", "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 @@ ] }, "cookbook": { - "hash": "sha256-upbTdzu17BH6tehgCUcTxBvTVOO31Kri/33vGd4Unyw=", - "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz", - "version": "0.11.2", + "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz", + "version": "0.11.3", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ @@ -120,9 +120,9 @@ ] }, "forms": { - "hash": "sha256-xI1aqRNjEYdzDSu5vTvbR+5Rf8TMlge67wubY8lIaz0=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.0.2/forms-v5.0.2.tar.gz", - "version": "5.0.2", + "hash": "sha256-qAz61bLmCSK2AucSShvCKLj9IsMaE06aTEOmLKBWtdk=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.0.3/forms-v5.0.3.tar.gz", + "version": "5.0.3", "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": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-7zyOITVD/Jd9iQGqQ4RCoJ2JF6QGmmhg7Kuq41x8b0s=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.0/groupfolders-v18.1.0.tar.gz", - "version": "18.1.0", - "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-zWRg9oqEhD0SGL82LB1HxbkLt3CbcQsgrBXlCLy94h8=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.1/groupfolders-v18.1.1.tar.gz", + "version": "18.1.1", + "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.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -170,9 +170,9 @@ ] }, "integration_openai": { - "hash": "sha256-UmsxMsAeZQMR1zu6ZsPY3lcN5un4h/j02Z5xM4mxEvs=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.4.0/integration_openai-v3.4.0.tar.gz", - "version": "3.4.0", + "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz", + "version": "3.5.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:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [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": [ @@ -180,9 +180,9 @@ ] }, "integration_paperless": { - "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", - "version": "1.0.5", + "hash": "sha256-Tw0VZk+ByXLmFdNBgJdFnHUiFarDP+YyulzvCmE3ivw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.6/integration_paperless-v1.0.6.tar.gz", + "version": "1.0.6", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-WcUdf2EjNQNHzSpt2nBu72x+34UE/VDaXUkRdU9Kydc=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.2/mail-stable4.2.tar.gz", - "version": "4.2.2", + "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", + "version": "4.2.6", "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": [ @@ -230,9 +230,9 @@ ] }, "news": { - "hash": "sha256-OtW42UQtG3fCJdwPW6t6b60Y2WscZw78/2L22kMiFig=", - "url": "https://github.com/nextcloud/news/releases/download/25.2.1/news.tar.gz", - "version": "25.2.1", + "hash": "sha256-CAnDrbpXZVISJ4WjAAl7mhZY2t9ohBgPLdf7tGd3aIY=", + "url": "https://github.com/nextcloud/news/releases/download/25.3.0/news.tar.gz", + "version": "25.3.0", "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": [ @@ -270,9 +270,9 @@ ] }, "polls": { - "hash": "sha256-sN/LzW3uw4NAy14ZtTeZZGz338LU2N+5S7FESqt9HUg=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.3.2/polls-v7.3.2.tar.gz", - "version": "7.3.2", + "hash": "sha256-fnZT4iuwlD66AVwiNPE0yurszO5/9IQsJfA1OB/dEVU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.1/polls-v7.4.1.tar.gz", + "version": "7.4.1", "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": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-+MYplCq6Kx1UiEz+Isbit7kQNhe4dncy6W+y7eMzuiA=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.4/spreed-v20.1.4.tar.gz", - "version": "20.1.4", + "hash": "sha256-Ld/1UKhch7QYsfxGHpcjviGPna3moMsLCOMOGi937SI=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.1.5/spreed-v20.1.5.tar.gz", + "version": "20.1.5", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -390,9 +390,9 @@ ] }, "user_oidc": { - "hash": "sha256-2FeFmqD53eUujA80s6cec53U5XL6CXSh5h3XM0N8Afk=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.3.1/user_oidc-v6.3.1.tar.gz", - "version": "6.3.1", + "hash": "sha256-jhqch6Gup7774P9seExlwhDGbDv0AK9LEzSEtmFW85A=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.0.0/user_oidc-v7.0.0.tar.gz", + "version": "7.0.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ From 963d449efd8488e792eea26ebe56d56b39116a69 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 01:39:58 +0100 Subject: [PATCH 050/123] nextcloud31: 31.0.0 -> 31.0.1 Diff: https://github.com/nextcloud/server/compare/v31.0.0...v31.0.1 Changelog: https://github.com/nextcloud/server/releases/tag/v31.0.1 --- pkgs/servers/nextcloud/default.nix | 4 +- pkgs/servers/nextcloud/packages/31.json | 76 ++++++++++++++++--------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index f33bceac7fe6..bbe4069105ca 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in }; nextcloud31 = generic { - version = "31.0.0"; - hash = "sha256-b76weze7nPp8kb8bLfvPAxkFi25gSHweqht3frl2LZE="; + version = "31.0.1"; + hash = "sha256-ufoEWK7JS+e7KHhp+WC7yHBZLZP7w1JxYGwx5Hfk57I="; packages = nextcloud31Packages; }; diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 4600f65a7ed7..2fe69cf9d338 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-Yn2hBNzZD6cbIqyzl25qd0adXZmLIrV1CZAvOrGVKy8=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.2/calendar-v5.1.2.tar.gz", - "version": "5.1.2", + "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", + "version": "5.1.3", "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": [ @@ -40,15 +40,25 @@ ] }, "contacts": { - "hash": "sha256-hiRIovYvG6idDsvt1eMqHiN5DsXNNyn9aAefT1QdCow=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.1/contacts-v7.0.1.tar.gz", - "version": "7.0.1", + "hash": "sha256-aBrbzXKWb3QzeBLWPR/4rWeM40haBiEQB9gFUNT3q/A=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.4/contacts-v7.0.4.tar.gz", + "version": "7.0.4", "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": [ "agpl" ] }, + "cookbook": { + "hash": "sha256-EWLBypv588IkO1wx0vFv26NSk5GKx1pqSWTlAcW2mwE=", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.3/cookbook-0.11.3.tar.gz", + "version": "0.11.3", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "https://github.com/nextcloud/cookbook/", + "licenses": [ + "agpl" + ] + }, "cospend": { "hash": "sha256-rfbmlxiZ0sQxidFZ68/icFzHmLoYxLAmH20Nejj1Hv8=", "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.0.11/cospend-3.0.11.tar.gz", @@ -110,9 +120,9 @@ ] }, "forms": { - "hash": "sha256-xI1aqRNjEYdzDSu5vTvbR+5Rf8TMlge67wubY8lIaz0=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.0.2/forms-v5.0.2.tar.gz", - "version": "5.0.2", + "hash": "sha256-qAz61bLmCSK2AucSShvCKLj9IsMaE06aTEOmLKBWtdk=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.0.3/forms-v5.0.3.tar.gz", + "version": "5.0.3", "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": [ @@ -133,7 +143,7 @@ "hash": "sha256-xotf3sAiP1sQNHfL+2kuE04YsbV4rGfDYDyZUkteGHY=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.3/groupfolders-v19.0.3.tar.gz", "version": "19.0.3", - "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, 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.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -160,9 +170,9 @@ ] }, "integration_openai": { - "hash": "sha256-UmsxMsAeZQMR1zu6ZsPY3lcN5un4h/j02Z5xM4mxEvs=", - "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.4.0/integration_openai-v3.4.0.tar.gz", - "version": "3.4.0", + "hash": "sha256-LUfgHGN2gddCsATRBgWMJO8EsaOqqRYVZXCL4EKc6Vw=", + "url": "https://github.com/nextcloud-releases/integration_openai/releases/download/v3.5.0/integration_openai-v3.5.0.tar.gz", + "version": "3.5.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:\n[IONOS AI Model Hub](https://docs.ionos.com/cloud/ai/ai-model-hub), [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": [ @@ -170,9 +180,9 @@ ] }, "integration_paperless": { - "hash": "sha256-UkpcmCK/LDWg0glKxlk2u4AiZIMJ6Nr/VvI3QBwpwFw=", - "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.5/integration_paperless-v1.0.5.tar.gz", - "version": "1.0.5", + "hash": "sha256-Tw0VZk+ByXLmFdNBgJdFnHUiFarDP+YyulzvCmE3ivw=", + "url": "https://github.com/nextcloud-releases/integration_paperless/releases/download/v1.0.6/integration_paperless-v1.0.6.tar.gz", + "version": "1.0.6", "description": "Integration with the [Paperless](https://docs.paperless-ngx.com) Document Management System.\nIt adds a file action menu item that can be used to upload a file from your Nextcloud Files to Paperless.", "homepage": "", "licenses": [ @@ -180,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-WcUdf2EjNQNHzSpt2nBu72x+34UE/VDaXUkRdU9Kydc=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.2/mail-stable4.2.tar.gz", - "version": "4.2.2", + "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", + "version": "4.2.6", "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": [ @@ -209,6 +219,16 @@ "agpl" ] }, + "news": { + "hash": "sha256-CAnDrbpXZVISJ4WjAAl7mhZY2t9ohBgPLdf7tGd3aIY=", + "url": "https://github.com/nextcloud/news/releases/download/25.3.0/news.tar.gz", + "version": "25.3.0", + "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": [ + "agpl" + ] + }, "notes": { "hash": "sha256-dpMCehjhPQoOA+MVdLeGc370hmqWzmsMczgV08m/cO4=", "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz", @@ -240,9 +260,9 @@ ] }, "polls": { - "hash": "sha256-sN/LzW3uw4NAy14ZtTeZZGz338LU2N+5S7FESqt9HUg=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.3.2/polls-v7.3.2.tar.gz", - "version": "7.3.2", + "hash": "sha256-fnZT4iuwlD66AVwiNPE0yurszO5/9IQsJfA1OB/dEVU=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.4.1/polls-v7.4.1.tar.gz", + "version": "7.4.1", "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": [ @@ -310,9 +330,9 @@ ] }, "spreed": { - "hash": "sha256-fMXrII9PuDyCsE7PJiVzI0nVavw6fuEL1xFF0oAxjAE=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.0.0/spreed-v21.0.0.tar.gz", - "version": "21.0.0", + "hash": "sha256-ztc0u9lYd5rZmzFPt1J4fmSBP3ZINswTaqVr4QZtidQ=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.0.1/spreed-v21.0.1.tar.gz", + "version": "21.0.1", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -350,9 +370,9 @@ ] }, "user_oidc": { - "hash": "sha256-2FeFmqD53eUujA80s6cec53U5XL6CXSh5h3XM0N8Afk=", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.3.1/user_oidc-v6.3.1.tar.gz", - "version": "6.3.1", + "hash": "sha256-jhqch6Gup7774P9seExlwhDGbDv0AK9LEzSEtmFW85A=", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.0.0/user_oidc-v7.0.0.tar.gz", + "version": "7.0.0", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ From edf34366da599b3f9874e94d8a53f9f2905f681e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 04:15:32 +0000 Subject: [PATCH 051/123] saml2aws: 2.36.18 -> 2.36.19 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 4a0d7254a351..6da20e6ba3e3 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.18"; + version = "2.36.19"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-sj+6EnpPPsl/MWMxan6dXIqJO8NePcwnVFrTCcM1SbQ="; + sha256 = "sha256-5g7mbjBkjNl1xvMMJXcITOZTNWXE7m2WhzzvLuULcuo="; }; - vendorHash = "sha256-mi2Jqiy1T1fcuasrIXPkhu8VTmq78WFOK/d3i7CXkhw="; + vendorHash = "sha256-oCYtEMx3+wK1TyS18iYgRwH3NopWY63xsguvanNDSEo="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; From 7628ef7cb24738148119853144c23a56cf96cff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 04:28:28 +0000 Subject: [PATCH 052/123] go-chromecast: 0.3.2 -> 0.3.3 --- pkgs/by-name/go/go-chromecast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 24fffaf2da09..1fa05bc3e503 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; tag = "v${version}"; - hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg="; + hash = "sha256-6I10UZ7imH1R78L2uM/697PskPYjhKSiPHoMM7EFElU="; }; - vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw="; + vendorHash = "sha256-cu8PuZLkWLatU46VieaeoV5oyejyjR0uVUMVzOrheLM="; env.CGO_ENABLED = 0; From a1925e1e439d9e10fe33798cf58052c820ca6a32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 04:49:24 +0000 Subject: [PATCH 053/123] clickhouse-backup: 2.6.5 -> 2.6.6 --- pkgs/by-name/cl/clickhouse-backup/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 51238ea60be2..a75833c79811 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-tRZo2PQYCzryd593MTzrHOzVxM58ONz61A6eekyr1wo="; + hash = "sha256-kWJpySeyeEje7tntnImT7UpOgQMsrfVxIvQ+2/uB6Ko="; }; - vendorHash = "sha256-skL0yF0sVj3yza0LseNLfUn3jxPXuOFS/1FfHg0/H7Q="; + vendorHash = "sha256-HB9BntvoUNrw23m4T+9p65aWUvQNpz3+ff1ydVqNfQM="; ldflags = [ "-X main.version=${version}" From e189588609b829baa799642c70bcf9a628ef90c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 05:43:59 +0000 Subject: [PATCH 054/123] sqlmap: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index b9829fd4c49a..117c2437bf2d 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YWuJkNn6oKKTCZTdmJQA7+Eh1s37QQKSOJacXOHYhnw="; + hash = "sha256-h4zYzhjOYsmbOv9FfIsVc1duC/D76g3YNxCGDOBhwtY="; }; postPatch = '' From 6657e7c0e38e834290c91a361d9be981daac04ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 06:27:06 +0000 Subject: [PATCH 055/123] multiplex: 0.1.6 -> 0.1.7 --- pkgs/by-name/mu/multiplex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix index 6e09a526741d..391f6396a6fb 100644 --- a/pkgs/by-name/mu/multiplex/package.nix +++ b/pkgs/by-name/mu/multiplex/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "multiplex"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "pojntfx"; repo = "multiplex"; rev = "v${version}"; - hash = "sha256-zU4Lnc66wY5lFxy82Mg52WSEGRyoEk9LY6E7LmeuKHs="; + hash = "sha256-+KvFBzoIYmSbuazstJae8lC0xdPtXLhFWawlc+iGGoU="; }; - vendorHash = "sha256-fS5wdBe1vuqaUBPcxLzhCMRztW8eq+MGojMVWlOZO+U="; + vendorHash = "sha256-a99zmJ89QN+bf1WgAin+Eoqaizb7vyesb4uxt5L8qNY="; nativeBuildInputs = [ pkg-config From 9d5f1d9e33dc0c7d983182c74fb8a1477f0e56c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 06:35:29 +0000 Subject: [PATCH 056/123] freshrss: 1.26.0 -> 1.26.1 --- pkgs/servers/web-apps/freshrss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index bd43da2e96fa..a475f68d6074 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-J3YYx2enB8NHxgWUcJHStd5LkGRIB6dx3avbjhyIs3Q="; + hash = "sha256-hgkFNZg+A1cF+xh17d2n4SCvxTZm/Eryj6jP7MvnpTE="; }; postPatch = '' From 618500825383f4de6ac20d3da390d2721f9f5caf Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Fri, 14 Mar 2025 11:39:33 +0300 Subject: [PATCH 057/123] pulumi-bin: 3.155.0 -> 3.156.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 82 ++++++++++++++-------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 31e0a77fee12..b2e69703f5c8 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.155.0"; + version = "3.156.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.155.0-linux-x64.tar.gz"; - sha256 = "1i0sh1y7wdfaf32sil17gyqsm21x81fxcwivxs2lh6fm7l6akf4g"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.156.0-linux-x64.tar.gz"; + sha256 = "1bglydw2avadb9y70ycqf7y2qrx4i4f9phqsqxi3izxi973x50kg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.36.0-linux-amd64.tar.gz"; @@ -73,16 +73,16 @@ sha256 = "191j823pngyicvgvkjfik9n0nsws2zsqqzykzsad74w59i9cr90c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-linux-amd64.tar.gz"; - sha256 = "1sql8napyydhf35vi4i36qf013g9ibmkr8qcd3c0vx1hslwi89hl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.22.0-linux-amd64.tar.gz"; + sha256 = "07mq1ly7kz89m2gixk21npz3sanv0qwcvwp6j10y2b9cxqw4kl98"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-amd64.tar.gz"; sha256 = "0c75qc3n3a2awjbi2fkxm8x2xvy3wv26v4fcpachfp9zr0gqig7q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.8.0-linux-amd64.tar.gz"; - sha256 = "0gc67a2pybnvcafdihaqhpszdrnfa8x3yal43hw5hczkwnhbkapn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.9.0-linux-amd64.tar.gz"; + sha256 = "0pg9h6d54x7l04z3zci15xja9jr3nk0rb5z0yk7l8llf295mx7cn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "0riqjjr2hrki0i9swf0k7njmpqrbwp5c7lpw8dif4g5ni6alwz8y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.1-linux-amd64.tar.gz"; - sha256 = "1zayrlizwvp3x56wqvsv5bwznbyryfzgri4xwxw78mvq8zslxpcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.0-linux-amd64.tar.gz"; + sha256 = "18vphhjrs6s3hc2zjcxydry9g3zx69rwl3739m84zcn42ws9d3xx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.35.0-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "1ikw64y55dzhdc49mq3qy4gq2zfbvv3551295mygrz11zrjrmfzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-linux-amd64.tar.gz"; - sha256 = "0l6s3pf2nqn4kh8px97c8qvycqm3bhgrnx0wzrsm7f1cfnpd0ss1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.113.0-linux-amd64.tar.gz"; + sha256 = "1dbr2w0s8z6lqdx4p56jr7crf97sznr3gxq4j13rpa03bi2kj0q8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.6-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.155.0-darwin-x64.tar.gz"; - sha256 = "1irzl0r3dxv1v09wlpj0pfhs4xzi1ac6fd0v959h5wgxggb0zs9f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.156.0-darwin-x64.tar.gz"; + sha256 = "1jxjdrgg6q7l8ijr2lyx0ckqj2wrmgs8pgzh9khasc6l3sppvnbm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.36.0-darwin-amd64.tar.gz"; @@ -231,16 +231,16 @@ sha256 = "0qqzfdibgwzgnv79as3l6k8hh4nviq2i0xsgzsvjkklzf2szyh8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-darwin-amd64.tar.gz"; - sha256 = "00qmmnwc2i9n7r415bmjzb66wr9ragvkydgs8njjz7hsfz97girg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.22.0-darwin-amd64.tar.gz"; + sha256 = "0fic5bmvk2ba14h3rhvnpmzz2h6r0x73pg71bxpm88jsyqf2s51l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-amd64.tar.gz"; sha256 = "02yi7iwhf07sa84aaysmag91bnp3h1f3fcix7zphr9hr7vn85igk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.8.0-darwin-amd64.tar.gz"; - sha256 = "0qvxg16svbg96ip0w7bvzjpx3qp78wvhphv3j07zl1igmg6d88g1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.9.0-darwin-amd64.tar.gz"; + sha256 = "0n14mmfnqp2y8r00i6rczr16fiqfijppxl9icsg8j01gypl02whi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "1k40h7gihhb4fg2bhnd7qp58kpr5lrkasfw07xcwqvq90y0nxy9i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.1-darwin-amd64.tar.gz"; - sha256 = "11874cc1x1insma8fgw251g73jxxhkfrk4c5ad801vvn986jigip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.0-darwin-amd64.tar.gz"; + sha256 = "11qk1w019kwdm0h2n2kprwlnjmn0cs52h4i57ibby3gwvi5q1h34"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.35.0-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1ahmp1za19qf6gg2nmgqxqr0xg24pavx9q8gf917gmmj4gx4b2ws"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-darwin-amd64.tar.gz"; - sha256 = "1fxgshs66kqiyw50b347bzzx67mzhmmzr3qfn0nj3yfhsnb1bbky"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.113.0-darwin-amd64.tar.gz"; + sha256 = "0rkv66dp3b40waayys6a43wngirkwc1lmib00rp18jvgfivbzhsg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.6-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.155.0-linux-arm64.tar.gz"; - sha256 = "0k7lyc0ajqn4jmcggvviwl6sqviljaqw2nch67qy7cdd9iv72c9q"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.156.0-linux-arm64.tar.gz"; + sha256 = "1anlb0irvcwa7vzyzja9g19g9mjjgix2nyhc1qxm4rrv1212r7wg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.36.0-linux-arm64.tar.gz"; @@ -389,16 +389,16 @@ sha256 = "1dyg5k7giny2d26yw222kahdnbfwmhr8d1nkrn3i1ycqsb1g573j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-linux-arm64.tar.gz"; - sha256 = "1pzzlvh8bd4pillyb0mr6ba458fjqh3ab310wvih559gzg4fz85j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.22.0-linux-arm64.tar.gz"; + sha256 = "14cd8sd3p6q0kl63ldzpkp2xlwaanfq1kq91yaliy4cd80x01wn5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-arm64.tar.gz"; sha256 = "1szmjdrpvayqs5bzmf32gazcsq66q5ys3p3rn54x9302aap13dmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.8.0-linux-arm64.tar.gz"; - sha256 = "0pp7wf9817c8v2sz59vz365xqw6v26pgj79hz9j6h156645g0d2v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.9.0-linux-arm64.tar.gz"; + sha256 = "17fq5bdy3agx2ff88pwffqnz50psgwwj1zh12n90zfqc2jvz2w5z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "1m87drk1jdf9lnavfb6yq2mgai87p212yqx2rxn2dqgc88gn023d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.1-linux-arm64.tar.gz"; - sha256 = "0a2sgn0jn3vfn8i69iaigksvfnmfs2dm44chzgmwpgfyif7wzk9l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.0-linux-arm64.tar.gz"; + sha256 = "1lyd3prgyjqndc2y2b2r92b45v930zvqizc658m6z4nm7rfk2gjq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.35.0-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "1p7aahp9zfk5qhiw2h6wf11is4xnz6j7f1dcm69xli8x0wjib9kc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-linux-arm64.tar.gz"; - sha256 = "081pvgl2sshdjzn3rgal955crcf9pald3qn35bqw6xrzz7a3sv6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.113.0-linux-arm64.tar.gz"; + sha256 = "04vnh940689k7dfd3k0ihwznjnypb5bxjyyfih1g9i0wb3bfrqrn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.6-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.155.0-darwin-arm64.tar.gz"; - sha256 = "02wz9185xszam24vbx1691fvq5v197wnfxsv11fmjmqks9izf41y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.156.0-darwin-arm64.tar.gz"; + sha256 = "0fdd7vxqagk2p28g13a8pb46245j6c035m6wdrvaaw10sk5y6j4b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.36.0-darwin-arm64.tar.gz"; @@ -547,16 +547,16 @@ sha256 = "17cm719jsh6rc7lwd64kg7qdlxlclvwrky9598f85kbvnv6n0xa8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.21.0-darwin-arm64.tar.gz"; - sha256 = "1r3w1vw0d0qn2vnv4a0n81q3dpw4m7cs34gryvfvllp5f7m8zn31"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.22.0-darwin-arm64.tar.gz"; + sha256 = "0ba1hcndfn5ppr0sn5iliqqpspjakd3mqk49pcrg01jlf57106xh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-arm64.tar.gz"; sha256 = "02lff0ij3gv7bi4qplcnpq8r29836ma1rzi0h3ydk44qm8kvl9l7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.8.0-darwin-arm64.tar.gz"; - sha256 = "0c4n852amdznnzrzybazqglsl6dyvifwmqjmidg5iwwzcgs2kd46"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.9.0-darwin-arm64.tar.gz"; + sha256 = "1jccv854pg966krqvwjcbidpn9gp4ss0260lckijl1il7a04wyaj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "1w4h5k72kn91xgcpbv5x4d0jmhzn6siwzbashhsvxyghnvq9c86v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.21.1-darwin-arm64.tar.gz"; - sha256 = "0ssxxb7067ybz2wgvz2s9v67g39f53p7q22n9mcrq4185j9c3a4r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.22.0-darwin-arm64.tar.gz"; + sha256 = "1m48xndn893bx79a3pxbpxr33wkdkzhknpd91bn5jprj6djzbg6d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.35.0-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "1sayvk6h8g2n5g9zb0drsqpibzlsm9k0zp4dvkcgf68iw32fpzxz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.112.0-darwin-arm64.tar.gz"; - sha256 = "0cpi6q4rm2kfvycfva6h3qqj62x3469qlxv034rx4q4jahxnd4zn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.113.0-darwin-arm64.tar.gz"; + sha256 = "0kpbxsb5v6m8qddjhza30vcmvr1w8mm2by2a0rq156vczwk98rl3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.6-darwin-arm64.tar.gz"; From 4089d84cacf71be2ce982185db5406d2773a11bb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 09:41:38 +0100 Subject: [PATCH 058/123] invidious: 2.20241110.0 -> 2.20250314.0 Diff: https://github.com/iv-org/invidious/compare/v2.20241110.0...v2.20250314.0 Changelog: https://github.com/iv-org/invidious/releases/tag/v2.20250314.0 --- pkgs/by-name/in/invidious/package.nix | 10 ---------- pkgs/by-name/in/invidious/versions.json | 10 +++++----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 17ef1504e805..6157e59d01da 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -3,7 +3,6 @@ callPackage, crystal, fetchFromGitHub, - fetchpatch, librsvg, pkg-config, libxml2, @@ -87,15 +86,6 @@ crystal.buildCrystalPackage rec { sqlite ]; - patches = [ - # Fix proxied video streaming: https://github.com/iv-org/invidious/pull/4992 - (fetchpatch { - name = "invidious-fix-video-proxy.patch"; - url = "https://github.com/iv-org/invidious/compare/aa33d9b7ec5a41867c256542653ad8465fe22e7f~1...3ac8978e96069e58a02e91fc29bf52b8fc651d5c.patch"; - hash = "sha256-xENsVRfEE9ACLiniOgGMDfdC0ZtJge1e1Lak2orLJro="; - }) - ]; - format = "crystal"; shardsFile = ./shards.nix; crystalBinaries.invidious = { diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index 42094487b886..dec7874def98 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,11 +1,11 @@ { "invidious": { - "hash": "sha256-O5Uv5Qat7Is/0gk0HVi8Hr2UPMLXQw7AwYnjOFaaTP8=", - "version": "2.20241110.0", - "date": "2024.11.10", - "commit": "5d2dd40b" + "hash": "sha256-OBD1QBzLPWZUz2PrMbwpjaH4bnirTkbm4HlCK4UZUbE=", + "version": "2.20250314.0", + "date": "2025.03.14", + "commit": "e23d0d1" }, "videojs": { - "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" + "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4" } } From 113986566d61dde1f7195784e68c5c39fd7b2e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 10:05:52 +0000 Subject: [PATCH 059/123] gvm-tools: 25.2.0 -> 25.3.0 --- pkgs/development/python-modules/gvm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 761ddcfb2a1e..455bfc0acec1 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "25.2.0"; + version = "25.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; tag = "v${version}"; - hash = "sha256-WWt/wWuni1rf2A3ggzbVF6l2ApDHm5Z5TBk5UWseo74="; + hash = "sha256-DDs08VnyUB32n3JuVNmt9uMTssmbHOb351pla4zdE54="; }; __darwinAllowLocalNetworking = true; From 6176c77db2b1c8f5f6f269f9c22aaa6016e8a8b0 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 14 Mar 2025 19:24:41 +0900 Subject: [PATCH 060/123] pnpm: 10.6.2 -> 10.6.3 https://github.com/pnpm/pnpm/releases/tag/v10.6.3 Signed-off-by: misilelab --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 5807b44c5c5f..6fa26bc1c2c1 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-HBjZi6W/BzT8fij2yPG0OxvNhmd33s3igdFIWTkGA/w="; }; "10" = { - version = "10.6.2"; - hash = "sha256-IAcqH27dF2RuqSNL8yxC1WPa03spc+l6Ld5cF3dKgk0="; + version = "10.6.3"; + hash = "sha256-vB7+ku5NQLGnpkTlyp4YVcXF6vxrFRL5AXsxuSRUGds="; }; }; From 722d3cb4a8a08648c50baa04eae6140e3704809d Mon Sep 17 00:00:00 2001 From: henrispriet Date: Mon, 27 Jan 2025 18:07:32 +0100 Subject: [PATCH 061/123] pdftowrite: init at 2021.05.03 --- .../inkscape-unknown-option-pdf-page.patch | 31 +++++++ pkgs/by-name/pd/pdftowrite/package.nix | 91 +++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 pkgs/by-name/pd/pdftowrite/inkscape-unknown-option-pdf-page.patch create mode 100644 pkgs/by-name/pd/pdftowrite/package.nix diff --git a/pkgs/by-name/pd/pdftowrite/inkscape-unknown-option-pdf-page.patch b/pkgs/by-name/pd/pdftowrite/inkscape-unknown-option-pdf-page.patch new file mode 100644 index 000000000000..e647e8a094b2 --- /dev/null +++ b/pkgs/by-name/pd/pdftowrite/inkscape-unknown-option-pdf-page.patch @@ -0,0 +1,31 @@ +From b3cd46bf1ea7ddc7ce26e9b713bb7fb5faadba40 Mon Sep 17 00:00:00 2001 +From: Ulysses Zhan +Date: Wed, 20 Mar 2024 21:57:47 -0700 +Subject: [PATCH] fix `Unknown option --pdf-page` when calling inkscape + +--- + pdftowrite/pdftowrite.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pdftowrite/pdftowrite.py b/pdftowrite/pdftowrite.py +index 6c12515..4d03fc2 100644 +--- a/pdftowrite/pdftowrite.py ++++ b/pdftowrite/pdftowrite.py +@@ -79,7 +79,7 @@ def process_page(filename: str, page_num: int, output_dir: str, ns: argparse.Nam + opts = ['--pdf-poppler'] if ns.mode is Mode.POPPLER or ns.mode is Mode.MIXED else [] + utils.inkscape_run([ + *opts, +- f'--pdf-page={page_num}', ++ f'--pages={page_num}', + f'--export-dpi={ns.dpi}', + '--export-plain-svg', + '-o', output, +@@ -90,7 +90,7 @@ def process_page(filename: str, page_num: int, output_dir: str, ns: argparse.Nam + if ns.mode is Mode.MIXED: + text_layer_output = str(Path(output_dir) / f'output-{page_num}-text.svg') + utils.inkscape_run([ +- f'--pdf-page={page_num}', ++ f'--pages={page_num}', + f'--export-dpi={ns.dpi}', + '--export-plain-svg', + '-o', text_layer_output, diff --git a/pkgs/by-name/pd/pdftowrite/package.nix b/pkgs/by-name/pd/pdftowrite/package.nix new file mode 100644 index 000000000000..700efbdde5ba --- /dev/null +++ b/pkgs/by-name/pd/pdftowrite/package.nix @@ -0,0 +1,91 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + makeWrapper, + versionCheckHook, + nix-update-script, + + # shared + gzip, + # pdftowrite + poppler-utils, + inkscape, + ghostscript, + imagemagick, + libxml2, + libxslt, + # writetopdf + wkhtmltopdf, + pdftk, + librsvg, +}: +python3Packages.buildPythonApplication rec { + pname = "pdftowrite"; + version = "2021.05.03"; + pyproject = true; + + src = fetchFromGitHub { + owner = "apebl"; + repo = "pdftowrite"; + tag = version; + hash = "sha256-IFX9K74tfGKyMtqlc/RsV00baZEzE3HcPAGfrmTHnDQ="; + }; + + dependencies = [ + python3Packages.shortuuid + python3Packages.picosvg + ]; + + build-system = [ + python3Packages.setuptools + python3Packages.setuptools-scm + makeWrapper + ]; + + patches = [ + # fix inkscape flag (see https://gitlab.com/inkscape/inkscape/-/issues/4536) + ./inkscape-unknown-option-pdf-page.patch + ]; + + postInstall = + let + pdftowritePath = lib.makeBinPath [ + # shared + gzip + # pdftowrite + poppler-utils + inkscape + ghostscript + imagemagick + libxml2 + libxslt + ]; + writetopdfPath = lib.makeBinPath [ + # shared + gzip + # writetopdf + wkhtmltopdf + pdftk + librsvg + ]; + in + # `SELF_CALL=xxx` prevents inkscape shananigans (see https://gitlab.com/inkscape/inkscape/-/issues/4716) + '' + wrapProgram $out/bin/pdftowrite --prefix PATH : ${pdftowritePath} \ + --set SELF_CALL=xxx + wrapProgram $out/bin/writetopdf --prefix PATH : ${writetopdfPath} + ''; + + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/apebl/pdftowrite"; + description = "Utility that converts PDF to Stylus Labs Write documents, and vice versa"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ henrispriet ]; + }; +} From ca92b41abe3df8b11348ee5aa6ff3488f757863f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 11:37:16 +0000 Subject: [PATCH 062/123] httm: 0.46.2 -> 0.46.6 --- pkgs/by-name/ht/httm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 60218c121ac8..c1458d5b16b9 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.46.2"; + version = "0.46.6"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-KihorfQfHBNUhePnNbjrY+X4j0lOLW3C3bHMZSW57N0="; + hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ierJVMenS/VT23Nd0tsfI3TpPOWMsZOkWTN5PvYwsj4="; + cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc="; nativeBuildInputs = [ installShellFiles ]; From 4b3d1d9aa273fb72997b265b9f67e038e61ff9dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 11:37:54 +0000 Subject: [PATCH 063/123] python312Packages.sagemaker: 2.240.0 -> 2.242.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 601aea43b8f1..91fa4b164a93 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.240.0"; + version = "2.242.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; tag = "v${version}"; - hash = "sha256-DgyGWNb4zkJj+Gv0K2Imp+2q9zznCqQ7fnotTEZIoA4="; + hash = "sha256-86FnB/HJ43RxFuezzbNADUVsifV0+HHVR0yfb+aQZ8M="; }; build-system = [ From f5a421b6a7037f182e9d95d81579018deda770f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 12:49:23 +0000 Subject: [PATCH 064/123] elfcat: 0.1.8 -> 0.1.9 --- pkgs/by-name/el/elfcat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index 294814bc31d5..b0c5dc1265e4 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "ruslashev"; repo = "elfcat"; rev = version; - sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; + sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-CwK+xc77QADjQyrCI6NIrZ2A/DgnNfs57p9wdKJQZ4w="; + cargoHash = "sha256-3rqxST7dcp/2+B7DiY92C75P0vQyN2KY3DigBEZ1W1w="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; From 1706f3366fcdcf76b54e375043954837ec145f5b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 14 Mar 2025 21:14:54 +0800 Subject: [PATCH 065/123] turn-rs: 3.3.3 -> 3.3.4 --- pkgs/by-name/tu/turn-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index c7fb7d040085..e499661dd786 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-kNE6FbHAFVWH04uTJBCRkrB0yzIjuXX3rxi2h5WmKWo="; + hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VHfWVEYla7iHOATC4Rv7k560O2VUqAe4ZMo/hLiSOi4="; + cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM="; # By default, no features are enabled # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1 From 87605312c52c09dc53a67a3c3d15f543614db85c Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:16:37 +0100 Subject: [PATCH 066/123] akkoma: provide changelog --- pkgs/servers/akkoma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index fbc2ea15d890..c2d6995049e0 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -77,6 +77,7 @@ beamPackages.mixRelease rec { meta = { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; + changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mvs ]; platforms = lib.platforms.unix; From 631ce565b3797ac3250acdf19a0888a780d503d8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 14 Mar 2025 21:20:21 +0800 Subject: [PATCH 067/123] ecapture: 0.9.4 -> 0.9.5 --- pkgs/by-name/ec/ecapture/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 81df23482d79..7e818893c91a 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-94aZBsQG7xVX3mnE3z3bmTM9NUIG0/huov2OVZJmOe4="; + hash = "sha256-aubGM7kJMtfCRBeFgISuyXS9CkDwBC9hB3d6VA9mG2E="; fetchSubmodules = true; }; From aa7d01a8e00d6cb316c74ac8e93482414882660a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:43:53 +0100 Subject: [PATCH 068/123] akkoma: migrate to pkgs/by-name --- pkgs/{servers => by-name/ak}/akkoma/mime.exs | 0 .../akkoma/default.nix => by-name/ak/akkoma/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers => by-name/ak}/akkoma/mime.exs (100%) rename pkgs/{servers/akkoma/default.nix => by-name/ak/akkoma/package.nix} (100%) diff --git a/pkgs/servers/akkoma/mime.exs b/pkgs/by-name/ak/akkoma/mime.exs similarity index 100% rename from pkgs/servers/akkoma/mime.exs rename to pkgs/by-name/ak/akkoma/mime.exs diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/by-name/ak/akkoma/package.nix similarity index 100% rename from pkgs/servers/akkoma/default.nix rename to pkgs/by-name/ak/akkoma/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7950345c2af..79b47517fb71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -922,7 +922,7 @@ with pkgs; type = "OPN"; }; - akkoma = callPackage ../servers/akkoma { + akkoma = callPackage ../by-name/ak/akkoma/package.nix { beamPackages = beam_nox.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_16; rebar3 = self.rebar3WithPlugins { From 895044846f02a50a31bbe9695d16f196f07a22a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 13:46:25 +0000 Subject: [PATCH 069/123] xdg-desktop-portal-shana: 0.3.13 -> 0.3.14 --- pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix index 7411badfcbd4..0fe1a24e1f09 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "xdg-desktop-portal-shana"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "xdg-desktop-portal-shana"; rev = "v${version}"; - hash = "sha256-myEqJnXHCByc9CMX8vMDaQQkL84pfW/7fKPZpiNQHJA="; + hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { mesonBuildType = "release"; useFetchCargoVendor = true; - cargoHash = "sha256-E573A3njd+IMOEHnKwyKmA4I4bfCt4Kttj7MiFOUw/0="; + cargoHash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY="; meta = with lib; { description = "Filechooser portal backend for any desktop environment"; From 30cbef7dc9d89656a96c48a55442c764b1761dd6 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:48:19 +0100 Subject: [PATCH 070/123] akkoma-fe: migrate to pkgs/by-name --- nixos/modules/services/web-apps/akkoma.nix | 6 +++--- .../default.nix => by-name/ak/akkoma-fe/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{servers/akkoma/akkoma-fe/default.nix => by-name/ak/akkoma-fe/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 1b7cc0fa54c9..13a76542ea09 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -95,7 +95,7 @@ let package = mkOption { type = types.package; description = "Akkoma frontend package."; - example = literalExpression "pkgs.akkoma-frontends.akkoma-fe"; + example = literalExpression "pkgs.akkoma-fe"; }; name = mkOption { @@ -520,7 +520,7 @@ in { type = with types; attrsOf (submodule frontend); default = { primary = { - package = pkgs.akkoma-frontends.akkoma-fe; + package = pkgs.akkoma-fe; name = "akkoma-fe"; ref = "stable"; }; @@ -533,7 +533,7 @@ in { defaultText = literalExpression '' { primary = { - package = pkgs.akkoma-frontends.akkoma-fe; + package = pkgs.akkoma-fe; name = "akkoma-fe"; ref = "stable"; }; diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/by-name/ak/akkoma-fe/package.nix similarity index 100% rename from pkgs/servers/akkoma/akkoma-fe/default.nix rename to pkgs/by-name/ak/akkoma-fe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79b47517fb71..863a3d570770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,7 +931,6 @@ with pkgs; }); }; akkoma-frontends = recurseIntoAttrs { - akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; From 8656962ab79bc142ee21e01ebe6df48bd581766d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 13:53:30 +0000 Subject: [PATCH 071/123] rqlite: 8.36.12 -> 8.36.13 --- pkgs/by-name/rq/rqlite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index f72faad72f46..c75aabefd0ac 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.12"; + version = "8.36.13"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sEdU4BhRlkSCrUvrzcj+LNsSUO7mXCUHnIEqN8ydzc8="; + sha256 = "sha256-1yDz9rbjJCzl0pXvrMoAHdv4O9DAnE9HN6LQm3wp6kI="; }; vendorHash = "sha256-kdBYU0+8G/XspBXWPXTUy3vwbM90irM8xIpQgTMtRrA="; From 1e7066336371038d356afbc08ffc4179c3949b48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 13:54:35 +0000 Subject: [PATCH 072/123] grpc_cli: 1.70.1 -> 1.71.0 --- pkgs/by-name/gr/grpc_cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index 6d0e1a390dd6..b42c9c89e35e 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.70.1"; + version = "1.71.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-/Mg999SA/19iypjacXrEnX1B08hajyq7sC7yab+eTCk="; + hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg="; fetchSubmodules = true; }; nativeBuildInputs = [ From 4c17535c7be6c0e52e3918fce5c714d93bef4f5d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:52:45 +0100 Subject: [PATCH 073/123] akkoma-frontends.admin-fe: rename to akkoma-admin-fe & migrate to pkgs/by-name --- nixos/modules/services/web-apps/akkoma.nix | 4 ++-- .../ak/akkoma-admin-fe/package.nix} | 0 pkgs/top-level/all-packages.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/{servers/akkoma/admin-fe/default.nix => by-name/ak/akkoma-admin-fe/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 13a76542ea09..1529d63dde57 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -525,7 +525,7 @@ in { ref = "stable"; }; admin = { - package = pkgs.akkoma-frontends.admin-fe; + package = pkgs.akkoma-admin-fe; name = "admin-fe"; ref = "stable"; }; @@ -538,7 +538,7 @@ in { ref = "stable"; }; admin = { - package = pkgs.akkoma-frontends.admin-fe; + package = pkgs.akkoma-admin-fe; name = "admin-fe"; ref = "stable"; }; diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix similarity index 100% rename from pkgs/servers/akkoma/admin-fe/default.nix rename to pkgs/by-name/ak/akkoma-admin-fe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 863a3d570770..5c9019ef7e83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -930,13 +930,13 @@ with pkgs; }; }); }; - akkoma-frontends = recurseIntoAttrs { - admin-fe = callPackage ../servers/akkoma/admin-fe { - nodejs = nodejs_18; - yarn = yarn.override { nodejs = nodejs_18; }; - python3 = python311; - }; + + akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix { + nodejs = nodejs_18; + yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; + akkoma-emoji = recurseIntoAttrs { blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; }; From 0c7fe139f1a6e6f6388d6b9a159e97b3fa378655 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:56:32 +0100 Subject: [PATCH 074/123] akkoma-admin-fe: remove unnecessary Node.js version pin --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9019ef7e83..1b2e2f135c14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -932,8 +932,6 @@ with pkgs; }; akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix { - nodejs = nodejs_18; - yarn = yarn.override { nodejs = nodejs_18; }; python3 = python311; }; From c60031fed775e51ad0b0062d08960b44b695cc9a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:03:10 +0100 Subject: [PATCH 075/123] akkoma-admin-fe: change version to conventional format --- pkgs/by-name/ak/akkoma-admin-fe/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix index 7faac39ee53e..9bfbd2295f16 100644 --- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "admin-fe"; - version = "unstable-2024-04-27"; + version = "2.3.0-2-unstable-2024-04-27"; src = fetchFromGitea { domain = "akkoma.dev"; From c199f61f0149c32817ecf4798de53376f88af87c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 14:09:50 +0000 Subject: [PATCH 076/123] obs-studio-plugins.obs-teleport: 0.7.3 -> 0.7.4 --- .../video/obs-studio/plugins/obs-teleport/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index 07c3bb3f2882..ea7204b69463 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "obs-teleport"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-teleport"; rev = version; - sha256 = "sha256-daDP4WElVu2nyqS1zMHpzSunVq6X3d4t/CQg5r6v2+E="; + sha256 = "sha256-mHHPlmUyR9NDdQHqw1YNgThGl/8DH/aiCE9rdZhrIK4="; }; - vendorHash = "sha256-bXBkv/nQv6UYSzPat6PcykU2hRW/UGDvmYrGOwo9I04="; + vendorHash = "sha256-U/5smUMpcVEFWB+xMxLKF9E6N7dyh67QoB+Afq5Ga2Q="; buildInputs = [ libjpeg From 6a55cc63f3abdf4c1e3cebf0842607dcc9a7f177 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:13:10 +0100 Subject: [PATCH 077/123] =?UTF-8?q?akkoma-emoji.blobs=5Fgg:=20move=20to=20?= =?UTF-8?q?top=E2=80=90level=20&=20migrate=20to=20pkgs/by-name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/modules/services/web-apps/akkoma.nix | 2 +- .../emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{servers/akkoma/emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 1529d63dde57..9df89c65a3cf 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -557,7 +557,7 @@ in { default = null; example = literalExpression '' { - "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg; + "emoji/blobs.gg" = pkgs.blobs_gg; "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" ''' … '''; diff --git a/pkgs/servers/akkoma/emoji/blobs_gg.nix b/pkgs/by-name/bl/blobs_gg/package.nix similarity index 100% rename from pkgs/servers/akkoma/emoji/blobs_gg.nix rename to pkgs/by-name/bl/blobs_gg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b2e2f135c14..2d697bdfc630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -935,10 +935,6 @@ with pkgs; python3 = python311; }; - akkoma-emoji = recurseIntoAttrs { - blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; - }; - aegisub = callPackage ../by-name/ae/aegisub/package.nix ({ luajit = luajit.override { enable52Compat = true; }; } // (config.aegisub or {})); From 92b874061cc1ba08bcc84c6c9aacd5b97ac97eb1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Mar 2025 09:02:14 -0500 Subject: [PATCH 078/123] vimPlugins: update on 2025-03-14 --- .../editors/vim/plugins/generated.nix | 462 +++++++++--------- 1 file changed, 231 insertions(+), 231 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9392d9ac1103..a71644fec5a9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -70,12 +70,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-03-08"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "418bf5f9e74d905b582121036b732a753aa8746f"; - sha256 = "1n78hkvaw71fsjywp243jb8f82zb0ya4c0m9in5v1wvanrw248kd"; + rev = "b0893fff5f2d3b22155f3113381a614fd4f65a8a"; + sha256 = "1viqnzcjifpd2w00fmq66bw7mbg9wd9dh35iwacvapf524k6rk3q"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -369,12 +369,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-03-08"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "d6277b3e57b4b8175d2a02e4d5d93b456fe9843d"; - sha256 = "02v1rw56w7bf75afbyw81crnqlm7m1jd7iwhsh17mx1nynw3wgiz"; + rev = "e03b50ce453b1ce9f6b7805239c52db604d740dc"; + sha256 = "17pj6lnl9dwzv5s2a40dnflxd8sx2dq0w1mm9zdx5r93m9wkxxsb"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -709,12 +709,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2025-03-08"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "3611c32d60f7478570d0f705466c307f66ed689a"; - sha256 = "0by2qc6vij8ipf61nff8rx343f69ghcx85q9i2g5fw6mi6ddv3hp"; + rev = "1c91102112ac5addbdbf178268c61a2ead64fb2a"; + sha256 = "06nbwzjr85vxly8xanm96k9fims29ybxydzw4jywqx9awz18cfch"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -1125,12 +1125,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-02-11"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3"; - sha256 = "0jl3isanc1w6lmdd0gjmdn02mf7licz42cm878j5x641kd2q8ma6"; + rev = "79ef41274354a486cf4f100a7adf4a7575802ccf"; + sha256 = "15f1h1pl1jsi86d2k182lbcjaqymixjgv395x7ga0zz09k1alwdm"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1594,12 +1594,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2025-02-17"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "d1cd1b5bd8798cdf24e9fc9d5e9311742049da05"; - sha256 = "0jwslqfawjmmqm0jz62sf7ykgwry0qsfiip9m16jcqbrg5qvmdbd"; + rev = "917d52614062d8b995a94296de19842edb5c70ce"; + sha256 = "121mz69ydqjrwpnf10v7s24wv71d2nhhwfd99bz21vjli7qpk2z4"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; meta.hydraPlatforms = [ ]; @@ -1841,12 +1841,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2025-02-20"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "3d581529d6d19af1e6eb8467aae150def12af742"; - sha256 = "13r39qdwdn0d5az1phhbk8g7yc4jpm7scw0r3ixxlm8lhq47zsl3"; + rev = "257b7290c101cf6fd68e20d72dbb0d4c669738b2"; + sha256 = "0ba7fk8jnm6lkjqcjmqgpvjsrv4bf2c0jqcal9mdxi8dxsw92l84"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.hydraPlatforms = [ ]; @@ -2777,12 +2777,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-03-07"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "373623b1fe26f9f1955d7b307f635b13ec1d7093"; - sha256 = "1i5vsb3p5qdxgv73ck67k1lsg3hyslvm56i5qn10qm2115gqzm3q"; + rev = "385758859b6fe348f9b6c214ec35e1d9b9f46cd2"; + sha256 = "0pg5ya9qcr5iw1l9nm4pyhps1cpq5izbpavqwdni2swym5p8ba5l"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2829,12 +2829,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-03-07"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "3639b11a3806f1c0c39b5b098d641d0f6b66f6ef"; - sha256 = "01s3p2mgbfy162ijkzdhhsj6041fzc2dvp9vgcywrsa2ldm1pklb"; + rev = "4f56b047f03bf5edc0d71bf0ca694243a49b912f"; + sha256 = "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -2842,12 +2842,12 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2025-01-05"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "ebed4f7cc8a18184d8332d421ca10bed5f7d59a1"; - sha256 = "0nnfigqhjzhjyvkn93idbm96z2fj4gkhk9kkdv5b8xw6lr4pbk91"; + rev = "2b10c17c46e43154ebd058f6b3d3842dd8fa7cab"; + sha256 = "0irvjmg6b6sfn9k6xifvr4xpa2kayxxsi7v72sn6ksp7g61v0igi"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; meta.hydraPlatforms = [ ]; @@ -2946,12 +2946,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2025-03-07"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "70fbb99ed57c609fa8adbe0d87c11c23a3edb2a1"; - sha256 = "0j9bb9gj0apzp627dy8dklhlw34wiwmwni9kblqcxamkq3h3h3d5"; + rev = "6033ca8e3c4ed39f8d0ca7cee134b1a4dd4ae7d9"; + sha256 = "0ic4xfhpqvxcyz9qi613hdin6mspb4abh0vfds1ck1g4mx8inwr6"; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.hydraPlatforms = [ ]; @@ -3155,12 +3155,12 @@ final: prev: context_filetype-vim = buildVimPlugin { pname = "context_filetype.vim"; - version = "2024-12-21"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "5c95048793865365a409143d13987f5aac7e98f9"; - sha256 = "13j7qrv2fx07km27ygswc9sif7p3whzp65sjg79vdyivyyq75cxf"; + rev = "ffb1ec4b2b3b34d77dd1a1b3610f2533eb69506c"; + sha256 = "02z341iwj3gih3k3qyi014j5y7jddp4zl2np0671gmw43861bxcd"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; meta.hydraPlatforms = [ ]; @@ -3272,12 +3272,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2025-02-17"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c53ca04de47c5b61f4d2f1f51fc981ad9f5bd408"; - sha256 = "0s2rdss6z06aa3prs1wb86v0m4db1fnd884drwb6gd0qp8n1az6z"; + rev = "e48a17c63029ef9ac72af80a7a3a56577acffb00"; + sha256 = "1g1alqkxf1nh794hwx560mfif9g6i9x3pipc948hnwx2rlcywyx1"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.hydraPlatforms = [ ]; @@ -3324,12 +3324,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-02-28"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "6bf1b4ceb62f205c903590ccc62061aafc17024a"; - sha256 = "1qhxgn865wmf7jf0aw502lq94piigvaqc4z2h7ix8b6jlvnv6fwa"; + rev = "403a0abef0e2aec12749a534dc468d6fd50c6741"; + sha256 = "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3350,12 +3350,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2025-03-05"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "f5c36046fd3e322f76db653f76cd1b59e6109c1f"; - sha256 = "1irfcvk3svk09m8p5zm7yahrd4vkqcfj75n3356p76r0xk7c1b8a"; + rev = "991d2c43afd7c7be77edd27a2ae686f9779382da"; + sha256 = "10jj6x78k34yrarp5ydc7n1ylp2xxgxl7jqh1y4d133mgcygabak"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; meta.hydraPlatforms = [ ]; @@ -3467,12 +3467,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-02-21"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "b02c977aaf0283a0ec7a0184e6a459366325c93b"; - sha256 = "14rnp66smhmc3zx2wvph2sayivmq7zdj0bi5rkk379ancj6nkvc5"; + rev = "094e4eb33e7d078cbf2105604a4246092eb8046e"; + sha256 = "1nh1nxy6wqn0vlk9lpp8v8p24rlrzlcwl7y9lvhbhmlisyr5yrvj"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -3779,12 +3779,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2025-02-14"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "2e8fe21a469bf058849c062a42549e31f23c0956"; - sha256 = "1qdasx8iiqwq747skyynyb3s4rf6m1vvgd7rfp1zm2wdsr086qb3"; + rev = "9c2c97b99b236bc9a0a768e696aea466b959a396"; + sha256 = "092fjbb0aywiffrhf9vdcg9i7s0rs9cf65c2mnj8il5aag180ig0"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; meta.hydraPlatforms = [ ]; @@ -4275,12 +4275,12 @@ final: prev: easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-03-07"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "1c264bb2e72425939f7bc197868b110158787f40"; - sha256 = "045xvsd7sxizw2xbaw5v7whwb082xhb3dwjd5v3xqj9ld1ng0k6a"; + rev = "b27ec1dda7cbb0ebb224e5136005d2a48a8ad442"; + sha256 = "04js572pqwqkjcnpbpygjg3kc0cnci2j44kvij8r6yg30vnxdbab"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4340,12 +4340,12 @@ final: prev: editorconfig-nvim = buildVimPlugin { pname = "editorconfig.nvim"; - version = "2023-01-10"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf"; - sha256 = "1rkkq11qwql4h7f3fa1pj7gmnwgx5wb9j9p1jrw62m6xhjs7n7m5"; + rev = "67758c3e8a2f79019322a60013e4ce0aad09dafa"; + sha256 = "1xd2kvmsqa7rpp6zhdga11ww05m36436bi6lamp1a3371hkm2a6h"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -5267,12 +5267,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-02-27"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "6ad080424f4b96a584cf591721e8e13c102cce4e"; - sha256 = "1z1lln8nv0xh9jprx01hx5k2i7nwndwj9dj7ak2yd05v8v2s7yf9"; + rev = "da15ca55705c57ca10de1fbc1f0b6d6327c13e55"; + sha256 = "1h5lf0ba2bpyn28wiy33gv8f9fkbjmpcz6hdsifarpgqgrfz2rby"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5319,12 +5319,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2025-03-08"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "5b8b9deeaea2da6008246bf5f4a1feb5714d0dad"; - sha256 = "0sa992yp84g0w6bc1q33vrxkw3zbqq1ax4lidwdw27iylsck0abs"; + rev = "cd49bcf6a853512fce46f035fe95469e5b2d26c7"; + sha256 = "1vyblpwy4221rvr573kr20hfyg0pbiwvws9sigilkdp886211bsc"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; meta.hydraPlatforms = [ ]; @@ -5397,12 +5397,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2025-03-08"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "3a370c3a47b579f67a365c16d7bb740fa9d8eb7d"; - sha256 = "1znbhcshs2b2vplr9csa6lpd5p5qv5yyaxhip7kr1q23k3r0jcyd"; + rev = "0ec6c3a9ef63703975e800d7386b6114863e1f9d"; + sha256 = "1kpilvxszp4larhw9xy663wb8sajp729iwi4jclb2sw332cr77b0"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; meta.hydraPlatforms = [ ]; @@ -6468,12 +6468,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-03-01"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "bf74da37518f84097a83593214ad835b908eae8c"; - sha256 = "1vjankdl76808hw9xblym5r2qkmr5cqmhml5253zc0h4n4dma0fv"; + rev = "12f2ce784c31fbba748bf230e048e1764626f3fa"; + sha256 = "1r7b2rzb14zyyd72xbwmk80vh3ilxkfpv2b04kdir31s1466n4wj"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.hydraPlatforms = [ ]; @@ -6598,12 +6598,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-02-28"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "0ca6af0696813d008bad4ecc44ec312ce50b5cd2"; - sha256 = "1ymwiwjhlsfci0xfjx1p5rfcsqyigzb7p0csv8ibcn57r7010s0k"; + rev = "c40bb6bd313b686526744b06f8e87aa71f3a2a26"; + sha256 = "1x2h8vjiv6ppdgg35xxk5qpmk29r58vxkw8k5pc0fvdm70s0jbrx"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6962,12 +6962,12 @@ final: prev: llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-03-02"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "3fb05d367111593e895a64774cb67528b06abf33"; - sha256 = "0m7038fmp2alc5miyp0a9ppdb906z1zqd4dlbw6v1xk73bpq4msy"; + rev = "5bc35980d3b054153eaeb19403853ed576bf4513"; + sha256 = "1p05b26w44vswz0xbq7hkj05x2x3jxs5z8i15vg8kyzj661qiqn8"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; meta.hydraPlatforms = [ ]; @@ -7001,12 +7001,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-08-29"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "47de35b54ec95bb049f52016632394b914d4d9e9"; - sha256 = "1mvdgsbx1qls0iks87k9d7xrz2p06sc1vz8rz8q64s0gvfpc5n67"; + rev = "f336cfd6572bf644d26b5cdec7e5e2c6b8f45135"; + sha256 = "07jmqhprinfi5r4zxsr6ydjvx5lqga468zp8cmwlz65npgmqpvy7"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; meta.hydraPlatforms = [ ]; @@ -7092,12 +7092,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2025-03-06"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "02629e5bc38f6cb1a49bb43ff4a441f23335a933"; - sha256 = "0wqa7yppkq5xbgr71hi5wnhq4r24g77zbmv82r661wl4iy9nfsc6"; + rev = "8b681c86b0bd7f932cd91987983d91497e43d83f"; + sha256 = "1ap077hgl334klfyi2hv81hf6r9mqpkarrz0b3ky99aavz7bmn2j"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.hydraPlatforms = [ ]; @@ -7118,12 +7118,12 @@ final: prev: lspecho-nvim = buildVimPlugin { pname = "lspecho.nvim"; - version = "2025-02-23"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "deathbeam"; repo = "lspecho.nvim"; - rev = "19bea4e33e24d67cb9bdb3509e760005a11c8389"; - sha256 = "0fy8jq27wc2d9crkb7n25xvm7rhiny7iwvg112r9zkfgkcj4afj1"; + rev = "883f6c0a3f5c36047e68c989484565a4a6357ca0"; + sha256 = "1wafx76h90yfgwb2pnmi64j5hacvxlkqpvigg36za5qhw4xb3x1b"; }; meta.homepage = "https://github.com/deathbeam/lspecho.nvim/"; meta.hydraPlatforms = [ ]; @@ -7326,12 +7326,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-03-07"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "b8ad5fc17585030c9a343f991f183d088a7b089b"; - sha256 = "10a4bqa7774xcds1cbswc5i1b77k0d7h3pzzi58c435f4j13lyn7"; + rev = "8c6b0af556a3e58a831384a3b7bcca9ea77882ee"; + sha256 = "1s35qq9hsd3ah6jxmb0lmhnl7ak2vsdn4k7dmris4qsn0ppqh7wk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7678,12 +7678,12 @@ final: prev: mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-03-07"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "b76983f10d6016c3cd35e5d90eb51891159e0796"; - sha256 = "19mykqf38w0ccpar2aby2aps56jc79rfwy83xnrb2gxcff33k477"; + rev = "3b14571c9febed20f386c39c07ca85c7b7a5358f"; + sha256 = "0n0pzbcmsx3qw2p17dy0vl15b6n2fml9rqfaakfqjzrkhjl3q10q"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -7925,12 +7925,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-03-07"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f6fe169821506a59b2407e3c7a3327562600e0e3"; - sha256 = "11p705f9jdvaqhsj9qp87pjjpxh57niwnf6d99g6cwzy7v5x41gw"; + rev = "b21cd5b1b330844e4c4b93d65e99ecb7c79a63c9"; + sha256 = "0h5j0ppfm61iwhyrh2vqsqssw7s2ghryap9cwak9w3cbmaabmqkz"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8380,12 +8380,12 @@ final: prev: ncm2-jedi = buildVimPlugin { pname = "ncm2-jedi"; - version = "2021-01-05"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "f2e9007783b1f543b00d336a94210b4bc76b67e0"; - sha256 = "1vrrz5zp39xk7c35dz737gfbr8j3yhqmmwmdwrxl5nibjwph4c30"; + rev = "ae5d3522ec75d9813226ed09286b495841f67926"; + sha256 = "00m9czssfga2bf68gjq1yj0km62w7rphkm783x4k5w7g03qr1260"; }; meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; meta.hydraPlatforms = [ ]; @@ -8562,12 +8562,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-03-06"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "2a5c86bd61e6c60ab7c2cb029c5cf619e4ee0b3a"; - sha256 = "1gpk6xwvap057b8025mq3vil5llysv72jnj07440qjpjd36r0j6c"; + rev = "8c6349bceb1d8a863964dd25dc7944d588a56aaa"; + sha256 = "03lgpp5vyiyfbzig5w24ph84xbakahbfg1hqv148p0i34qf6mcbn"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8588,12 +8588,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-03-08"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "746fe7006b23dc1aa2399cd8d0962566ee0bda4a"; - sha256 = "1aw07nyg8gx0baqd1rkc2mzblglrpr3kvsqh523qav5ywsy10bcx"; + rev = "5f0689934f788fc5a76a27a3873d660cea5429c9"; + sha256 = "0xkpy5mds8mj0zj3v7035hpjk8lymmav0f39kb4q95b7hparn92y"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8666,12 +8666,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2025-02-25"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "12f78aaabb37b4946254dd5e47cf7b552904937a"; - sha256 = "0gkns098spzn5f92vnv75i9lipzgw04c69m2hjg91icl4wmkfzkg"; + rev = "0b756dd80c82da28fd7ed500eac642710ab21909"; + sha256 = "1d35xr0hm5d8gjdhg1rxqylfqkywjl6qabdgig1xbpx8l7lqfqcc"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -8942,12 +8942,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-03-02"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "2209a643c3f97b0c9f09c5fbe59649e3f5aa7dea"; - sha256 = "05wfz6w9s4gb4fr838s7nigbgq2w0za4wy3rm1rasyysq7fzacr5"; + rev = "b1fec5e156a7403d12cc9d429920e492fecb0755"; + sha256 = "08wnn3z44w0qnqa9bcxj6890lhs9qgb8jx42qgfw5x728drnw781"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -8955,12 +8955,12 @@ final: prev: neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2025-03-07"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "3f814f5c7e38609fc56ec4bd0ab24c6469c65993"; - sha256 = "0wm8p2naw9mkw2zshj041d54bw55k5xgnp8xbwgpi8az62fl0nxk"; + rev = "1404de796b1afbbc20cf84db991c901270b901c9"; + sha256 = "0w0m55939wafipi9pqs4k3ya5qi7rfimgknzy0xwac7g48cbhw91"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -9072,12 +9072,12 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-12-04"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "f8c91edc5dd87ca467a624652f365ac217d7cc1c"; - sha256 = "19ndf4rhpydb42hkl6h6ybzg3cshgkikb5nggqnza612fyas2yz9"; + rev = "281c0ed0e55d623e8028796e1c4dc27b7e421fd0"; + sha256 = "0gbdpplvai8cay0xmhiw1j27rxy5wzsx2b6jfnv3cqwk77chbabp"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; meta.hydraPlatforms = [ ]; @@ -9241,12 +9241,12 @@ final: prev: nerdy-nvim = buildVimPlugin { pname = "nerdy.nvim"; - version = "2025-02-23"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "2KAbhishek"; repo = "nerdy.nvim"; - rev = "319cc93d4038b24497eb34c344b20fb462be6c9a"; - sha256 = "05dnqydmflymc2svijndsrnjv02waliy7si2md35ji9bzpw4cg6k"; + rev = "14bdcd13265dfc80e6ca6cee0598c5880729e24f"; + sha256 = "1xci5viwiyzxj644vxbh8n6y3irkjvqxfmxjiad25adr8qv4qx7x"; }; meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/"; meta.hydraPlatforms = [ ]; @@ -9345,12 +9345,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-03-07"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "caf619ea508afae2137c71807939ded866591d1f"; - sha256 = "1csppzkdfdph0a587yxg0vsdbibaf43zqbigf3gr548byz37r6d2"; + rev = "43cd633951ea75cad622a881953b02094fdd4b46"; + sha256 = "1wn1r7jqz23b43qpyrmfcr4bvzfk5ajnffh9z555ca3m0zvgzsl1"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -9410,12 +9410,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-03-05"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "93d5f5fd0c172db1d2adb6a3e548d5352a898e6e"; - sha256 = "1lp11whpldd1684rkcy41fip2si4yy1bjsbbm8j5xnwgypy45571"; + rev = "a1c208fb30dc8dd0be2badf99fe076fa75284338"; + sha256 = "0digp6bmzg0gls8m5gnwci5czhmszw5m3nd8x7zq7g57dlbx46p8"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9605,12 +9605,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-02-27"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "8fc9f2502bf580f9a9b83f77f7a2e0b8f6f24191"; - sha256 = "04dn3l57wzbxarizw6911p35h0bk7nnp1ss42z7cvkwvsp6wiara"; + rev = "75233833d84b930bc37fecdcd7eb73b5714e92e4"; + sha256 = "02wdpdyjf78wy14ja85ria84mswdwq4fzym88bl00nas36xvli57"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -9839,12 +9839,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-03-04"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "8228cb00ab0850e483f8d58cc39cc580c05738d6"; - sha256 = "17dysd4fhmrkzfnm7f2r4xnpsl5rbj8ja4as0a8fijgh0412vb13"; + rev = "a720d4966f758ab22e8ec28812b6df90a53e0f02"; + sha256 = "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10021,12 +10021,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2025-01-26"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "99ca8b9e6e6bae0899cc2902f4103204572ac8ee"; - sha256 = "0f9w2510y26k2mihhmx6rsmijszsl2haj5848faqqw3nfhsph890"; + rev = "b7b6a2a265d294852f32519a30287e07e34415ed"; + sha256 = "05cwc8dzxfi588zanjdwq2qnaw3129h6bddhm2zwr63qvmhi6xvp"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; meta.hydraPlatforms = [ ]; @@ -10060,12 +10060,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2025-02-16"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "a770df5fbd98abbb0fc1a95d9a3f2bb1e51e3e2c"; - sha256 = "1py2ljbwhdff4vhgwpzm94v0c2vh5xyzk03y87lx43780wzv36b9"; + rev = "af94cd45b0608755d1affa6c36851fc1e73b48bc"; + sha256 = "0v8gmnb80wgad8a24yzk03ly66lx8nj8ww06d00r4kzd5rak7gdg"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; meta.hydraPlatforms = [ ]; @@ -10320,12 +10320,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-03-07"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "fd26f8626c03b424f7140d454031d1dcb8d23513"; - sha256 = "14wkqldhx04qbnn9z6wpawi7cdnx7g0g3xcn9rp7bh4752d5994g"; + rev = "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0"; + sha256 = "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10385,12 +10385,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2025-02-27"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "344b74b2109f3bd3771cb8dee5274dcd9042aab5"; - sha256 = "0ayn8npywhr9j1rlhvq5kij0s3751hh89fd5qqp1iqjqr9mg4ns8"; + rev = "fe6125f633c1b2f68d468a2041e81e2e5e8933d4"; + sha256 = "1xpav9ykwk7kz61c6y33kyjxf0nf47risdj0q9gf5rnl88cln4by"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.hydraPlatforms = [ ]; @@ -10606,12 +10606,12 @@ final: prev: nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-01-12"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "12d9f282b67525bb766c6fe33317caf25a19c86a"; - sha256 = "0r3yy3ricxs6ccaqm3rr6cfsbgm066dpj5da2sj0yl2mxypqq84v"; + rev = "c2457e8c0163fc2d00226f78c95acb2c2bd2a549"; + sha256 = "1f7mayjgair07jia15f1ckm9adlbzrplhbhgcxix0gfa2vmzv775"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -10632,12 +10632,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-03-05"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "4358487cfe016dd57031624c92a803ff730d864c"; - sha256 = "067xc8nwf2687i8928s138r6hkyqi581x79gvncj4ms89swc8x7z"; + rev = "24a1995392f845e8e222c1ffcaca140a9623b2a7"; + sha256 = "0qq9lzrqy0gizzn4s12hijf8f1yjdpwvh5c81f05my5nsad5h090"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.hydraPlatforms = [ ]; @@ -10723,12 +10723,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-01-18"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ae298105122c87bbe0a36b1ad20b06d417c0433e"; - sha256 = "1xrkg4is4spjwkzr6l0qmn3axlrm52d2wm69g2db83jww756pz1h"; + rev = "f70d56275710e202af59148f52100d34b786aecb"; + sha256 = "1a20q9hfv1gh7si2ai68zf4m9jnggvvja4vqxvrimbnzx73vxrrl"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -10788,12 +10788,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-03-08"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ffd284c4706d91c0d94916995f584b22ce89afcb"; - sha256 = "12kc3f5ngl76yfifiqkcvyi2cv2xq5y7s5cngjghfcfz0nxlhvmf"; + rev = "8b79cddc708cb8549562f0101f7f509ad7cebf97"; + sha256 = "1b2sr6250gwfgakjqh48fyydq3nmdd96nfhz1rccrns1f7nqwcdy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -10814,12 +10814,12 @@ final: prev: nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2025-02-09"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "cb718aab7fa66e43187674e875713097492a6618"; - sha256 = "1486v3lann7syr0dp31p576c1sd8zjd752fkjmxi8z1rdz4vy14f"; + rev = "57d52841a966be6ff9a998a6d3dc1ac9cc9d95fc"; + sha256 = "0iapapnmpw9cds94k0k6845hlnxa8x3hzqxp31x5n9qcbhvlqpcz"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; meta.hydraPlatforms = [ ]; @@ -11152,12 +11152,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-03-06"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "8faa8c867d2f5749d6fc826fcb6dfabb85fa7c7c"; - sha256 = "0ma25zfzcnnljiqcpzrsrdj6i59a5dxj0nc5ks3igbzzacl6k3h8"; + rev = "a4cae62fd4370f544cb597df2a767945f78a120a"; + sha256 = "0k5p66z1kb42602mh38j6vyxkawlywisn1wzydaf40zd86p8nlvr"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -11739,12 +11739,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2025-01-14"; + version = "2025-03-08"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "24f2cc51dccecec4cf3de04bfbd14f5b9e79df0b"; - sha256 = "0x7i2cim9jwc90v11wm61qbbq54m5581hsvj5jaash3gb5piacvw"; + rev = "4223fb903cbafc3bd8a87a314dac375bbd1c01ce"; + sha256 = "11ng6p0xmrjky5xr9jdkrrav7is9r090qhs2fsnbg16124bgb0g5"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; meta.hydraPlatforms = [ ]; @@ -12143,12 +12143,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2025-03-05"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "bce639550c4e0f61c90f16e56e681405345e1e30"; - sha256 = "1sz6mim7h98n7bz8j3f9xv3y696dr5gk35iw8y6miqjahyqd2p3l"; + rev = "36bd14ddd7ebf0546c15e6088e8bc93f8a98787d"; + sha256 = "1kvwmkylhgcqh2b02crv0f429m7dhmjfrbjhr3llzr3b005rlmnv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.hydraPlatforms = [ ]; @@ -12221,12 +12221,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-03-07"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "81374ffd26f9a9d5f44274a9e7e60547b5fd106f"; - sha256 = "1i098hjzyf8gppg9is8ac97r992haglkckaxwbkia2k8117yc679"; + rev = "c065031d030955e1d071a7fcdd8c59e0fd2f0343"; + sha256 = "0yjyixvz0d239clbj8f7d09lzpz10lkvyvdwcc1g1d4ygsh6pbjr"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12339,12 +12339,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2025-02-26"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "7718965bdd1526b233f082da17e88b8bde7a7e6e"; - sha256 = "15drkzckp7cmj34pz8dagi1xyavw3z9vw6dxw5m3p1bkhi99h0hi"; + rev = "7d1b5c7dcd274921f0f58e90a8bf935f6a95fbf3"; + sha256 = "0iy9is76bhgb17v0l7mr95mkhd9b4ah917v9shx74jp1xsgc481q"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; meta.hydraPlatforms = [ ]; @@ -12352,12 +12352,12 @@ final: prev: roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-02-20"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "633a61c30801a854cf52f4492ec8702a8c4ec0e9"; - sha256 = "0kwwv1760vldadwn74r71qmg1n3c55vfczkcrsv8vza567qjnz9x"; + rev = "0d298e68efa511df18a0bd4fd9a0c9bf70ebdbf2"; + sha256 = "1j0wc7mh4qqnja07pdz0r9s7zhqw80nnbsiwhrimvicafpbmh0aj"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -12417,12 +12417,12 @@ final: prev: rzls-nvim = buildVimPlugin { pname = "rzls.nvim"; - version = "2025-03-08"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "tris203"; repo = "rzls.nvim"; - rev = "ba4630cebed261dfc5358f8961b0adf63eb47ab6"; - sha256 = "1if71cf29ckh2x6wdglxfvndc8p99s58kdlkb2daxp858p3cxmdj"; + rev = "ebb652a4876c3c6af344333a6fc6bacffd85a27a"; + sha256 = "1pjzvxvmbaj17zx9hh81i98ni2kd1yrr5w83p92a4pdvbwicsck8"; }; meta.homepage = "https://github.com/tris203/rzls.nvim/"; meta.hydraPlatforms = [ ]; @@ -12756,12 +12756,12 @@ final: prev: smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-03-07"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "4f91b437757c3f8648be978602c079e7c718c807"; - sha256 = "1mbcmia1pcicivlvgps27af0axxg1adzx6mjvvi1rkbl4l0082gs"; + rev = "81638007bf7bbe79a78a3bfcbe8c640ec83344c0"; + sha256 = "0sns7qpcz4lfsyxpq2r37pz6hi79wbg5n1k57jrgva3dmnlvl47k"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -12991,12 +12991,12 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2025-01-12"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "b487fcc8937b683942a1f7d9662fcf50ca5acd58"; - sha256 = "0cggcinmn849p8ncr2fp42jn2zfvblw2d5kbafkqxapbdc6adp9b"; + rev = "50092d60feb242602d7578398c6eb53b4a8ffe7b"; + sha256 = "157wz9nka7g66ywyrqrni64g3a45k60v49l18ym6ipk0g3xji8xv"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; meta.hydraPlatforms = [ ]; @@ -13004,12 +13004,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-09-19"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "fa2242a3dd81804468241c0a8ebb32266c33fa60"; - sha256 = "13qq617i6cv0kzr2hsz2qn2r9hvm4hyj7pq0bc5x3nq94g4kzaal"; + rev = "d705764b3945d856c7867b613a4570635b8bfdcf"; + sha256 = "1szf5vi783kmpm58mymdf7swkbha2zhzyjcskhai93cz7c4gjjzc"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -13644,12 +13644,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2025-02-11"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "2a5ceff981501cff8f46871d5402cd3378a8ab6a"; - sha256 = "0n5yaslwmjn2057njyn604wb60zhqgad439zxaafd7qmvyjazlfi"; + rev = "1f08ed60cafc8f6168b72b80be2b2ea149813e55"; + sha256 = "137a05qwbpcrcrfj4az7dwx5a43yyfib4crx1hi8bhjx9j5gqav7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; meta.hydraPlatforms = [ ]; @@ -14140,12 +14140,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-02-28"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "de01d4c9cd032d4dac69bf64d5a184fbe62e1fd1"; - sha256 = "0jsimzzasxs8yw1i2pn2gsjzsi9c3xlr7xiv64z26q2j988kiyx4"; + rev = "5d168a2826fb90691f674e81bd5c1dfa6d931c61"; + sha256 = "02c24gw6g2n377khn0glzmhz987rkmkvq2pi19xf1y7qcd2gyr2r"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -14245,12 +14245,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-12-30"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "e76134e682c1a866e3dfcdaeb691eb7b01068668"; - sha256 = "1jyg3nv54kssz2a4blpwhd718msf95zqz6sr2sqblc7b35gm73g1"; + rev = "9a88eae817ef395952e08650b3283726786fb5fb"; + sha256 = "17plyvajwdhpiadsd80vph75qll8pv9571c2wnw35ngmw9gmnavz"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; meta.hydraPlatforms = [ ]; @@ -14428,12 +14428,12 @@ final: prev: tsc-nvim = buildVimPlugin { pname = "tsc.nvim"; - version = "2025-02-27"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "dmmulroy"; repo = "tsc.nvim"; - rev = "60c9b3e9610e24e147a928e30dd148ed9bb9f247"; - sha256 = "0vi9sljvpbx0s8wf5i2xizln1yxvp2j78254qpwj4mn2v4pnqzd6"; + rev = "5bd25bb5c399b6dc5c00392ade6ac6198534b53a"; + sha256 = "1s47l4m741d7z9diicqn48b5avk1n3sxx64f8xjr6l0rn9518zsz"; }; meta.homepage = "https://github.com/dmmulroy/tsc.nvim/"; meta.hydraPlatforms = [ ]; @@ -14584,12 +14584,12 @@ final: prev: ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2025-01-11"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "35252b3327bf0cb55136399dfe615637093a8291"; - sha256 = "1n5q6ba2vdqvgzp9siz3x74lifcbsfzm4mlayclgaljsvkshwg61"; + rev = "dbc458e110bb49299da76ec53f8b09b4f6dce28a"; + sha256 = "1yqnbqq0zxfq8zlaibq0k4n525a5cjp68gab2jhcf76jyczi53wb"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; meta.hydraPlatforms = [ ]; @@ -14597,12 +14597,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2025-03-07"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "76c4e32d8f1aa493bb68d4a3fcd3c700395c303c"; - sha256 = "0syxqj4fyjlahq8gk73v2jras30nw6rsymydmvf9zxsvfnxpfhsp"; + rev = "b951b87b46c34356d44aa71886aecf9dd7f5788a"; + sha256 = "0vp4wl4kiby7dlchki975fq682sw8c1vr9c6nhcndmxyhx7ghrqw"; }; meta.homepage = "https://github.com/mbbill/undotree/"; meta.hydraPlatforms = [ ]; @@ -16248,12 +16248,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-09-13"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "39cfaec9ea71c22a82c459ecd64860c8850f1215"; - sha256 = "12j1gqkm3dhcfx1axi8cl2zzj20z9a3xf5ggyqlr41f1bzpmprdh"; + rev = "1ec9aab0e0de9c737af97e46ead5d65485ae2f9a"; + sha256 = "0l4yr5m78n4qwkag00rzqmfhb626121naar5mjnlfyxkp4rsvjd6"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; meta.hydraPlatforms = [ ]; @@ -16781,12 +16781,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-12-27"; + version = "2025-03-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "6adc82bfef7f9a4b0db78065ae51b8ebb145c355"; - sha256 = "1jdalz0f9bm0vvi1f5bvr909ai1x7pjrwm25178s7dxnshfvmmq1"; + rev = "1d641b739624199ab9ab745d220f36fe7b655d65"; + sha256 = "02qfql3c6njqkq7pbzrqknca638f3fczkx651v3wwl94339ln6ky"; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.hydraPlatforms = [ ]; @@ -17485,12 +17485,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2025-02-06"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "520f67ab70b6f687ad7e0e20111ea8f7f8cac810"; - sha256 = "18bkz4va049z28gxlfhivjd52gvnrz3zdv7rr37d0zy3s32nj64w"; + rev = "0eeb7b760ca603be517d4f34a9d1c08c73f93f3f"; + sha256 = "0yl8rzjynyn46bk7fx4rpczqzhgjyk16lfl3rpkf018rgkvabcwf"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.hydraPlatforms = [ ]; @@ -18018,12 +18018,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2024-07-17"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "c585c4ff0744315c6c03fd54afa7c8ca23b039c0"; - sha256 = "0cc1c8qqf76w77va0j1lhlvv0kfiaz5b5jri5sy6rcbpjinfg0kk"; + rev = "36843b3c03eb6965eb5e3ed706f357b5c73ce8d4"; + sha256 = "1v3c7abdjypxyb2dkl56fv3s259m9v7p177ap65r6vdznxrw51cs"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; meta.hydraPlatforms = [ ]; @@ -18590,12 +18590,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2025-02-27"; + version = "2025-03-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "9ef7739c81233608af0c1bb103210a83e409a10f"; - sha256 = "02zi39nik8asxmshj2g6wc961kkgx80dm7cywcjbnqm5aiwx9nn7"; + rev = "cdea0244a538a3178bba45e743e691e5bee61b4d"; + sha256 = "0jidxnamh6pb94hdfmrb5r0h1v4hdbz0mmq9jvhbrh1srjrsy4gv"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; meta.hydraPlatforms = [ ]; @@ -19396,12 +19396,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-01-30"; + version = "2025-03-13"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "063628487465be53fd37be04bcf38a6f8a92e05f"; - sha256 = "09xna4n4kq1ihdp74kscr77nixa8icw8wrqdp4m0sdz39gqd0zf8"; + rev = "a2bc578485759f79c38c6b3e573b4f5db7f354bb"; + sha256 = "19lif6z7bgm92n9bdbhvy242jp4px1ikkn4fvn913jih2r6h05gd"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20490,12 +20490,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-03-07"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "cf6b84775624582d7422715ee46b0a63b53cee38"; - sha256 = "18dp7jyrdnmqjdnbd04h4p0b3wanc0xpb0a18dxcw3grb9b39dk3"; + rev = "691ee15e1459e4420d207cfbc4a79b383f32b411"; + sha256 = "0ylyzhdx6fpbkdba0sr7lm7w3z501x1d6x9hxpb00rfyii3cslz4"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -20594,12 +20594,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2025-03-06"; + version = "2025-03-09"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "486c3c9c9fd40975a7b06bc6001ad84ffa704f76"; - sha256 = "01j2vrhkvlhbr8i9s5f35qkqnp4dbys1gqbl32p72gl1g4h1323a"; + rev = "3faeb317dab9db5d2310b2dc6472632399ead88f"; + sha256 = "030jm07h8s2mhicfhpai0n92wy7jl9jp50y0ami12q34fclrnp0w"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; meta.hydraPlatforms = [ ]; @@ -20672,12 +20672,12 @@ final: prev: whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2024-08-18"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "f7d14be0f23a9c1e8021aca70d280aea26649b68"; - sha256 = "0c2im0qjzxw6mflc23w3m00qwnsbyqxlqllmia5d4akhzagjsdy4"; + rev = "8bf60b4a6892aa517a78a6014896078ae0c4c642"; + sha256 = "1b1rpz7ahcy0rzspmls6lfj133qdl8rfmams7ydhwscx3pmmyfzl"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; meta.hydraPlatforms = [ ]; @@ -21063,12 +21063,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2025-02-09"; + version = "2025-03-11"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "d113beebac48bf7ad7ce9fdb7f2ce43c90959677"; - sha256 = "1gcy7gw09vyfd660wn0f7g70q3nk4pr88qs5ip357a30frxl0fhd"; + rev = "01769fb74653588a6185a24ab99419c223bd2a8b"; + sha256 = "052ifipky41fczarzmf99izqd96mwjx5qqg12lznb55rryhgjw6v"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; meta.hydraPlatforms = [ ]; From 9bbd3e639cde2a2341d11cbf0073ce9a43577e3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 14:25:01 +0000 Subject: [PATCH 079/123] pyfa: 2.61.3 -> 2.62.1 --- pkgs/by-name/py/pyfa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 16a5d2ace96d..d4636c5b1b9b 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.61.3"; + version = "2.62.1"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo="; + hash = "sha256-yNMqP4YsfwTrf92wizstBXiTbhxAwIFoml4CUecqjbo="; }; desktopItems = [ From 28228df54de2893793653a680d324bf8e47df05c Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:29:07 +0100 Subject: [PATCH 080/123] akkoma-{emoji,frontends}: provide package aliases --- pkgs/top-level/aliases.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 292a40eb0f2a..e9aab7b7b809 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -148,6 +148,13 @@ mapAliases { afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12 + akkoma-emoji = recurseIntoAttrs { + blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14 + }; + akkoma-frontends = recurseIntoAttrs { + admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14 + akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14 + }; alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 From a5ccbd8b91fce8e3ccf34ab7a608d6caea816a65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 14:56:36 +0000 Subject: [PATCH 081/123] python312Packages.narwhals: 1.28.0 -> 1.30.0 --- pkgs/development/python-modules/narwhals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 45a276a78334..3633431ddc39 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "narwhals"; - version = "1.28.0"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-zI167qTGXMKgjMUSGiEKjGw2tITRQL4//wMqzj3DhVU="; + hash = "sha256-jqrrQRviWllzZQEnlOTZ6oJM3WYQ3YlDvareTTBcNl4="; }; build-system = [ From fb0b4a8b3ef978a3fba2823535737b97220497ce Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Mar 2025 09:35:00 -0500 Subject: [PATCH 082/123] luaPackages: update on 2025-03-14 updated pkgs/development/lua-modules/generated-packages.nix --- .../lua-modules/generated-packages.nix | 115 +++++++++--------- pkgs/development/lua-modules/overrides.nix | 18 +-- 2 files changed, 68 insertions(+), 65 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c8309bfb7b52..70671a35ce94 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -374,8 +374,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "0650e05c656b73f85b2bcd02ac1f27453f65cb17"; - hash = "sha256-pj1Zy5ygg90/6uuNi2jc5xax/vg64aHm1G1e9kAcZv8="; + rev = "00e6088707422dcce78f05d33574e6333b76204b"; + hash = "sha256-AMfLXH/D5dbMAzPi91G1eC6A2D7VpbRXyPb5hDOdPQk="; }; propagatedBuildInputs = [ argparse luafilesystem luasystem tl ]; @@ -579,14 +579,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1768-1"; + version = "0.0.1783-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1768-1.rockspec"; - sha256 = "0jd4xcy4hpmhqrgpqp166rpim36yldhrp76xp92vgq3z8sdpjy7i"; + url = "mirror://luarocks/fzf-lua-0.0.1783-1.rockspec"; + sha256 = "1br2cx5h07hcsyq15fizv8nd0indg194yv5qpsii6n8daw95q7ak"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9b84b53f3297d4912d7eb95b979e9b27e2e61281.zip"; - sha256 = "1p3fb68h7x50b6m6aaxxqcylipa5rdg0yfz6jlrd5i2kmr5gxldq"; + url = "https://github.com/ibhagwan/fzf-lua/archive/15d5cd9a74da7f8739030a5c411c046c70f66a60.zip"; + sha256 = "1i761ndiydma9fcpc8xd4br5cy0g8vx043bs6h0h7563bs6r7ss1"; }; disabled = luaOlder "5.1"; @@ -2309,16 +2309,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.4.5-1"; + version = "0.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.4.5-1.rockspec"; - sha256 = "0769h7mlw8gv3zw0yvnwmg1f0k02a85w4cnxbmpd19k07m6v9izr"; + url = "mirror://luarocks/luasystem-0.5.1-1.rockspec"; + sha256 = "0aiav3a3gw9l3gxxlq6ak6vigqqg0z9iyfq28knfm8rb23bvyi60"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.4.5"; - hash = "sha256-miubEXFrfB3/PzToOOh3sKGXwrRRc3Wd+gWbxj9M5ns="; + rev = "v0.5.1"; + hash = "sha256-+dkXf4F2mZgQSRQRpJnjwo5Swi06Pi2BQjjY5p3PQGc="; }; disabled = luaOlder "5.1"; @@ -2941,8 +2941,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3"; - hash = "sha256-dBAYadxdnl0j5e8VnnyGxx2AE6GgCDyIBxEgmrNawxo="; + rev = "1e1900b0769324a9675ef85b38f99cca29e203b3"; + hash = "sha256-zl/rgbZF3+nsLI7Sd6xzQFlcpa5n/8pyganS+u0jD/s="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -3025,14 +3025,14 @@ buildLuarocksPackage { orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }: buildLuarocksPackage { pname = "orgmode"; - version = "0.4.32-1"; + version = "0.5.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/orgmode-0.4.32-1.rockspec"; - sha256 = "1n3nd975m58f5kr4gl6d5mpgsm7aaz2pmcar0hlkisc91fq5pfyz"; + url = "mirror://luarocks/orgmode-0.5.2-1.rockspec"; + sha256 = "0ljb27lc1w3464l7fnyn051zvi9nzbxzq8qnx83i135r5jl7ls3d"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.32.zip"; - sha256 = "0qwv2pg4s9spmy5wvkvflhcb0a2drlygch6hmjanj3g2kkn3ph5f"; + url = "https://github.com/nvim-orgmode/orgmode/archive/0.5.2.zip"; + sha256 = "0f66nfl8agnk9765p79xr0b2qvyqx8z46rzcf0y349q8fs681kp6"; }; disabled = luaOlder "5.1"; @@ -3045,6 +3045,30 @@ buildLuarocksPackage { }; }) {}; +papis-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nui-nvim, pathlib-nvim, sqlite }: +buildLuarocksPackage { + pname = "papis.nvim"; + version = "0.7.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/papis.nvim-0.7.0-1.rockspec"; + sha256 = "1bza3blszq1kz224zx7k0mn636lnj5rcx5s7q6l3ng8rzddw4isa"; + }).outPath; + src = fetchzip { + url = "https://github.com/jghauser/papis.nvim/archive/16983a7aac24ea787d9b9ac5dce3c35d0077b990.zip"; + sha256 = "0virafyw0d46iwscbs1f1y7ks9jafhq214m17wqdz25srb7hmrxd"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nui-nvim pathlib-nvim sqlite ]; + + meta = { + homepage = "https://github.com/jghauser/papis.nvim"; + description = "Manage your bibliography from within your favourite editor"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license.fullName = "GPL-3.0"; + }; +}) {}; + pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }: buildLuarocksPackage { pname = "pathlib.nvim"; @@ -3068,29 +3092,6 @@ buildLuarocksPackage { }; }) {}; -papis-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nui-nvim, pathlib-nvim, sqlite }: -buildLuarocksPackage { - pname = "papis.nvim"; - version = "0.7.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/papis.nvim-0.7.0-1.rockspec"; - sha256 = "1bza3blszq1kz224zx7k0mn636lnj5rcx5s7q6l3ng8rzddw4isa"; - }).outPath; - src = fetchzip { - url = "https://github.com/jghauser/papis.nvim/archive/16983a7aac24ea787d9b9ac5dce3c35d0077b990.zip"; - sha256 = "0virafyw0d46iwscbs1f1y7ks9jafhq214m17wqdz25srb7hmrxd"; - }; - - disabled = luaOlder "5.1"; - propagatedBuildInputs = [ nui-nvim pathlib-nvim sqlite ]; - - meta = { - homepage = "https://github.com/jghauser/papis.nvim"; - description = "Manage your bibliography from within your favourite editor"; - license.fullName = "GPL-3.0"; - }; -}) {}; - penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "penlight"; @@ -3259,14 +3260,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.5.2-1"; + version = "2.5.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.5.2-1.rockspec"; - sha256 = "1c7rmn735d0axk92mk1hpiyqrv9hw4a2naai9naq57g6fy7wh0cc"; + url = "mirror://luarocks/rocks-git.nvim-2.5.3-1.rockspec"; + sha256 = "0p69zdlh552r8grpbhx2h78hhc6d6cihc5dyanlxqfxr6kxw221m"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.2.zip"; - sha256 = "1bhaa40j2dz1660q5fqdbjxvbscd6wk6l3psqm7mmh60zyvibnf2"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.3.zip"; + sha256 = "0nm4yf3z2wmb7g10ij706vkwg9ss83ndp5wps3gfjr4zqdf85ayy"; }; disabled = luaOlder "5.1"; @@ -3283,14 +3284,14 @@ buildLuarocksPackage { rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.43.1-1"; + version = "2.44.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.43.1-1.rockspec"; - sha256 = "0d9k3ya358spl2bcj4m1fwjrqf48byhnc5n40076l2lndwc806n0"; + url = "mirror://luarocks/rocks.nvim-2.44.0-1.rockspec"; + sha256 = "1jrln4s5zdp9mv8w9r156nk80sdmigy9l6pb4jbhyms16fa1d7q6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.43.1.zip"; - sha256 = "097f3zm7r1qwgd66gq8y31yzkn1p567kgn2p4pbxwkyn070gr787"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.44.0.zip"; + sha256 = "1g02704jld32lxv414pwdwsc5yzdcyj11qyhyqkhymrk5hi3pxr3"; }; disabled = luaOlder "5.1"; @@ -3688,14 +3689,14 @@ buildLuarocksPackage { tree-sitter-orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }: buildLuarocksPackage { pname = "tree-sitter-orgmode"; - version = "1.3.4-1"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tree-sitter-orgmode-1.3.4-1.rockspec"; - sha256 = "00p8abqdnjwshi6nqkhjaxdvqilfppvlv2bk98cmspgjhb3sd2bh"; + url = "mirror://luarocks/tree-sitter-orgmode-2.0.0-1.rockspec"; + sha256 = "1vgn8nxb3xjns30agbk0zz29ixf31ipvyl3q12lb5girhrwx43y0"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/1.3.4.zip"; - sha256 = "08lmcvvklr2nyx8v8gacaip8n8cfmywj3fnkhwa0p9yzpza86b4r"; + url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/2.0.0.zip"; + sha256 = "1yw4f4gd80dg9cc5m1d7abl22psgkssbxa2nrb7v5ay4zc0b3s7r"; }; nativeBuildInputs = [ luarocks-build-treesitter-parser ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 7bb5b83e93e5..71f0ab2593ec 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -188,11 +188,13 @@ in "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \ "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })" - # TODO: Figure out why 2 files extra for `fd` - substituteInPlace tests/file/ui_spec.lua \ - --replace-fail \ - "T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"fd\" }, { \"rg\" }, { \"find|dir\" } } }, {" \ - "T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"rg\" }, { \"find|dir\" } } }, {" + # TODO: Figure out why 2 files extra + substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---executable---1-+-args-{-\'fd\'-} \ + --replace-fail "111" "113" + + # TODO: Figure out why 2 files extra + substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---preview-should-work-after-chdir-#1864 \ + --replace-fail "110" "112" make test @@ -1114,13 +1116,13 @@ in orgmode = prev.orgmode.overrideAttrs (oa: { # Patch in tree-sitter-orgmode dependency postPatch = '' - substituteInPlace lua/orgmode/utils/treesitter/install.lua lua/orgmode/health.lua \ + substituteInPlace lua/orgmode/utils/treesitter/install.lua \ --replace-fail \ - "pcall(vim.treesitter.language.add, 'org')" \ + "vim.treesitter.language.add('org')" \ "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" substituteInPlace lua/orgmode/utils/treesitter/install.lua \ - --replace-fail "if M.outdated() then" "if false then" + --replace-fail "if version_info.outdated then" "if false then" ''; }); From f66022a3bdc0466a5f3c0cbd7e5bbf14ca25fa36 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Mar 2025 09:02:15 -0500 Subject: [PATCH 083/123] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 160 ++++++++++-------- 1 file changed, 91 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 66b2933c3314..71d53fb3ab93 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -61,12 +61,12 @@ }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=5bb5b03"; + version = "0.0.0+rev=04962e1"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e"; - hash = "sha256-JUJm83iqjjIT1eoribBO9D29ETanR/MIkLjDrXjuvEQ="; + rev = "04962e15f6b464cf1d75eada59506dc25090e186"; + hash = "sha256-a/wbmJQFddf+19E2uHmObQ5XfUkF5iaCSI1Y8avntGw="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; @@ -169,6 +169,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; + blade = buildGrammar { + language = "blade"; + version = "0.0.0+rev=bcdc4b0"; + src = fetchFromGitHub { + owner = "EmranMR"; + repo = "tree-sitter-blade"; + rev = "bcdc4b01827cac21205f7453e9be02f906943128"; + hash = "sha256-Svco/cweC311fUlKi34sh0AWfP/VYRWJMXyAuUVRhAw="; + }; + meta.homepage = "https://github.com/EmranMR/tree-sitter-blade"; + }; blueprint = buildGrammar { language = "blueprint"; version = "0.0.0+rev=60ba737"; @@ -270,12 +281,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=cd00bbc"; + version = "0.0.0+rev=fe48221"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "cd00bbcb77fe31283ca79b0038387ec7411759ae"; - hash = "sha256-Lz2K+/GvmNsQAm1g4TCDdHs+Vebu8fERzTvlVAsA40U="; + rev = "fe48221d4d9842d916d66b5e71ab3c6307ec28b3"; + hash = "sha256-lU6EU+ikUJ1Q/SzJ2/PzziRLO8PSS3oQ8hCANO4n8Tw="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -658,12 +669,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=370cea6"; + version = "0.0.0+rev=364e323"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "370cea629eb62a8686504b9fb3252a5e1ae55313"; - hash = "sha256-BBm5lK9dqMr4ghM7Ii+qy4Nncr2eZq8nuk1WmyUILgY="; + rev = "364e323b32d098ad0e7b29e7adb4005c2bb5cf34"; + hash = "sha256-mMaJCF+xLIN3x+4PWspdJdKWDRbnSWSKH5v0jJ/fs50="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -890,12 +901,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=db0e0c4"; + version = "0.0.0+rev=a716678"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "db0e0c4fb9095fdc42a7af34019c0616c071e9eb"; - hash = "sha256-rMLYEU4WdCInfNNAOuESCceavgWTy9NS8kgkTRaK1OE="; + rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d"; + hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -1331,12 +1342,12 @@ }; ini = buildGrammar { language = "ini"; - version = "0.0.0+rev=962568c"; + version = "0.0.0+rev=32b3186"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; - rev = "962568c9efa71d25720ab42c5d36e222626ef3a6"; - hash = "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU="; + rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31"; + hash = "sha256-kWCaOIC81GP5EHCqzPZP9EUgYy39CZ6/8TVS6soB6Wo="; }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; @@ -1408,24 +1419,24 @@ }; jinja = buildGrammar { language = "jinja"; - version = "0.0.0+rev=07a62ad"; + version = "0.0.0+rev=9af6ce9"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4"; - hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k="; + rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471"; + hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs="; }; location = "tree-sitter-jinja"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; }; jinja_inline = buildGrammar { language = "jinja_inline"; - version = "0.0.0+rev=07a62ad"; + version = "0.0.0+rev=9af6ce9"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4"; - hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k="; + rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471"; + hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs="; }; location = "tree-sitter-jinja_inline"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; @@ -1642,12 +1653,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=6e03a05"; + version = "0.0.0+rev=d269f4d"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "6e03a054a71cd419d9702725243137641e97ba51"; - hash = "sha256-KDbI8jmSeXm1T3WGoZ60IFWK8xaJwmU2Ofnr/khKz+U="; + rev = "d269f4d52cd08f6cbc6636ee23cc30a9f6c32e42"; + hash = "sha256-vOQirMsR+UqUyC7yJfuFynXEorkkUYjAB4C08Wf+zE4="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1798,12 +1809,12 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=742a21e"; + version = "0.0.0+rev=03fd221"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "742a21e11e914096e0172dad2f0b85e7554c95ff"; - hash = "sha256-XwGCwwLM6sdLLNAVK8TGc6XMJ3eXFq6Ayk4dj0FmJmQ="; + rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e"; + hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; @@ -1898,12 +1909,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=48057cf"; + version = "0.0.0+rev=cfc53fd"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "48057cf966641e7a49b09700550751195c34bcb5"; - hash = "sha256-VZGTHZdTZSKhjycFALHxYmelez6FR2BMqhIVSOv+kLU="; + rev = "cfc53fd287d23ab7281440a8526c73542984669b"; + hash = "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1931,12 +1942,12 @@ }; nu = buildGrammar { language = "nu"; - version = "0.0.0+rev=b99dc3b"; + version = "0.0.0+rev=c10340b"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "b99dc3b7b26337d84f95c0de4dda81077b03e5c7"; - hash = "sha256-w1zG976wp0PE3SpbZnh0GKS/WiRyXEif7jNjKMwfcvY="; + rev = "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1"; + hash = "sha256-EyaFrO9NE2Ivo8YTXZ6nmC31PB7WFbFdz7AMRw0ooHo="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -1964,24 +1975,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=6921a83"; + version = "0.0.0+rev=91708de"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd"; - hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw="; + rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a"; + hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=6921a83"; + version = "0.0.0+rev=91708de"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd"; - hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw="; + rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a"; + hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -2522,12 +2533,12 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=de0839d"; + version = "0.0.0+rev=32e20cb"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "de0839d6c7db2405e827435cf3ac62d22f4bd5e9"; - hash = "sha256-jB0oljkzNfxvKdDP8zMmD3q/843qANVGHSrzCGIeS2E="; + rev = "32e20cb1133a5a189f986c3b5df47ac730fbee3d"; + hash = "sha256-kBuVTL2elBM398Il6t8WuzUu4MrL9md+NEtVy7EGkdE="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2845,12 +2856,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=15ff939"; + version = "0.0.0+rev=91d9284"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "15ff939100f9d52342445407973f3ce125a8437e"; - hash = "sha256-fM+zhRvEwjMIq9RtgbMBF9GlybIWdO53ln6qZv+xHJs="; + rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db"; + hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2890,12 +2901,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=42ad8f6"; + version = "0.0.0+rev=02db52e"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "42ad8f6b4dc9b46285893cc37b460323b54932d4"; - hash = "sha256-nxKOyyDXrQAxb/ZmuMKSqesm6SUSbCq+cI+lU0hZwuU="; + rev = "02db52e14bc303322d22019fff7823d72904dfe5"; + hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2946,12 +2957,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=83e2649"; + version = "0.0.0+rev=a19be2d"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "83e264928fa194b7283428527259e88e54205264"; - hash = "sha256-gSLVUjn8MBRDQhZoEsPGao2lZI1gcxJsg6d8suA4D50="; + rev = "a19be2d4c1956e12facfc717e28f13a6ad0860e0"; + hash = "sha256-TBleyQmrHbKQJKftg2VcLstYIteuPbKuCct4ImmMtcU="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2989,6 +3000,17 @@ }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; + tera = buildGrammar { + language = "tera"; + version = "0.0.0+rev=482b475"; + src = fetchFromGitHub { + owner = "uncenter"; + repo = "tree-sitter-tera"; + rev = "482b475b32e6bae67f9d57abc60545399fd9b0a3"; + hash = "sha256-ndauBItrpUTIVjt5Sm0+jUjQtuAcHwLVdmw6IwcNXII="; + }; + meta.homepage = "https://github.com/uncenter/tree-sitter-tera"; + }; terraform = buildGrammar { language = "terraform"; version = "0.0.0+rev=9e3ec98"; @@ -3025,12 +3047,12 @@ }; tiger = buildGrammar { language = "tiger"; - version = "0.0.0+rev=a7f11d9"; + version = "0.0.0+rev=4a77b2d"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "a7f11d946b44244f71df41d2a78af0665d618dae"; - hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA="; + rev = "4a77b2d7a004587646bddc4e854779044b6db459"; + hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; @@ -3149,12 +3171,12 @@ }; typoscript = buildGrammar { language = "typoscript"; - version = "0.0.0+rev=43b221c"; + version = "0.0.0+rev=5d8fde8"; src = fetchFromGitHub { owner = "Teddytrombone"; repo = "tree-sitter-typoscript"; - rev = "43b221c0b76e77244efdaa9963e402a17c930fbc"; - hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc="; + rev = "5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f"; + hash = "sha256-GysGb879dk5e1U6OO26q1gVAhkWxc/GRpkNN785ZoQw="; }; meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; }; @@ -3227,12 +3249,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=532bebd"; + version = "0.0.0+rev=26c2c4c"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "532bebd50742ef15949bdd67c36d46697c847628"; - hash = "sha256-lBrX5n4hYdDq+2m7j9JXyeGGS3yl4oBu8jK7VV+OE7I="; + rev = "26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956"; + hash = "sha256-sKD4CoClychNS5B6JmnGCPLiNxWbOLt0t2PV30mvjoI="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3272,12 +3294,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=db1d744"; + version = "0.0.0+rev=35ed277"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "db1d7446bd07d811981734cd501fe1994cbad99d"; - hash = "sha256-0lNyEc6MS+k+vJvegQDI6/nlsx47xwLSro2ZGcaoADM="; + rev = "35ed277d3e98836796bc764010dc3fb800d14ee4"; + hash = "sha256-BuPqRNzsPKaUwXNp10KoZwnW5+/rFQ/11TcY0DpNUuk="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3471,24 +3493,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=af41bdb"; + version = "0.0.0+rev=00958fa"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"; - hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs="; + rev = "00958faeaeb97d9b7beb76f128a5401441182204"; + hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=af41bdb"; + version = "0.0.0+rev=00958fa"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"; - hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs="; + rev = "00958faeaeb97d9b7beb76f128a5401441182204"; + hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; From 7e4e2a9cb412188d5f054b55d2b9e7da709bf062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 15:16:57 +0000 Subject: [PATCH 084/123] terraform-providers.google-beta: 6.23.0 -> 6.25.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dd53375c1b7c..8910b419f121 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -516,13 +516,13 @@ "vendorHash": "sha256-UzoyVVBSrpxQnTfTJvGHIGR0wSFx8cSVVuTpo9tio2A=" }, "google-beta": { - "hash": "sha256-bxL3ufwXuioA73my5G89YSbvhHSz/DjzNbN3CfxarF8=", + "hash": "sha256-1lrov28rU1K4QEiTuRqzaTLMzL+sZVsOLfgj3KNNJsw=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.23.0", + "rev": "v6.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lPjjaFKYLI4JoYGzhw9GcXl0z/zb22nzqIP+tMeAGOc=" + "vendorHash": "sha256-Vr6nFT+MDC8MNZU7zqH0aeQUCUIR338QYGGKPb1GSW0=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From c282ca98de8089eca3af0299e70b95c5d44612d2 Mon Sep 17 00:00:00 2001 From: amuckstot30 <157274630+amuckstot30@users.noreply.github.com> Date: Fri, 14 Mar 2025 16:51:19 +0100 Subject: [PATCH 085/123] postmoogle: 0.9.25 -> 0.9.26 --- pkgs/by-name/po/postmoogle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix index cb983f7325f3..0f079334385e 100644 --- a/pkgs/by-name/po/postmoogle/package.nix +++ b/pkgs/by-name/po/postmoogle/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "postmoogle"; - version = "0.9.25"; + version = "0.9.26"; src = fetchFromGitHub { owner = "etkecc"; repo = "postmoogle"; tag = "v${version}"; - hash = "sha256-Pn+IHqHvKo1936Pw8WI2IhporIy/sIvh8PAUt0y5niU="; + hash = "sha256-nbkPwHMQTadflHE8q525cB4cgVNxldOMBi4Kwrp52rE="; }; tags = [ From debf62c4f1de7a71d383914ae6aaaa6fff632903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 16:11:40 +0000 Subject: [PATCH 086/123] tun2proxy: 0.7.4 -> 0.7.6 --- pkgs/by-name/tu/tun2proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index 8cf8dd8224cc..34bfb7c2ef52 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tun2proxy"; - version = "0.7.4"; + version = "0.7.6"; src = fetchCrate { pname = "tun2proxy"; inherit version; - hash = "sha256-ccFaFeTqgkDYuMssxOaWHW2oWgbdacyj6k8qF42OzM8="; + hash = "sha256-hAZZ9pSoIgAb4JYhi9mGHMD4CIjnxVJU00PDsQe6OLY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XqiSVndG6Ep8wifgkAILBbKnljeZNehSL8UTf5I9vEU="; + cargoHash = "sha256-A/hBV/koIR7gLIZVCoaRk5DI11NZ5HI+xn6qkU+fxaI="; meta = { homepage = "https://github.com/tun2proxy/tun2proxy"; From cebb4d9522a0abd36fc7e8138fd31ed9c59ccf39 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 25 Feb 2025 14:48:49 +0100 Subject: [PATCH 087/123] docker-vackup: init at 0-unstable-2024-11-01 --- pkgs/by-name/do/docker-vackup/package.nix | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/do/docker-vackup/package.nix diff --git a/pkgs/by-name/do/docker-vackup/package.nix b/pkgs/by-name/do/docker-vackup/package.nix new file mode 100644 index 000000000000..c3f8cbde0c99 --- /dev/null +++ b/pkgs/by-name/do/docker-vackup/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + bash, + docker, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "docker-vackup"; + version = "0-unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "BretFisher"; + repo = "docker-vackup"; + rev = "2a8a73136302af0bebeb7f210fc14be868ab2958"; + hash = "sha256-/iMQNnkRNTMiw+E6Wv/WatRB0DnapOVWqqszluUFed4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace vackup --replace-fail "/bin/bash" "${lib.getExe bash}" + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 vackup "$out/bin/vackup" + + wrapProgram "$out/bin/vackup" \ + --suffix PATH : ${lib.makeBinPath [ docker ]} + + runHook postInstall + ''; + + meta = { + description = "Shell script to backup and restore Docker volumes"; + homepage = "https://github.com/BretFisher/docker-vackup"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "vackup"; + }; +}) From d1b07b4644c57351d1688c7d2b85414bbafcf99e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 10 Mar 2025 00:37:49 +0100 Subject: [PATCH 088/123] xbattbar: refactor --- pkgs/by-name/xb/xbattbar/package.nix | 37 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/xb/xbattbar/package.nix b/pkgs/by-name/xb/xbattbar/package.nix index f9e2fc3a1362..5d4b7b618eff 100644 --- a/pkgs/by-name/xb/xbattbar/package.nix +++ b/pkgs/by-name/xb/xbattbar/package.nix @@ -4,10 +4,9 @@ fetchgit, libX11, perl, - ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xbattbar"; version = "1.4.9"; @@ -15,22 +14,20 @@ stdenv.mkDerivation rec { # repository. src = fetchgit { url = "https://salsa.debian.org/debian/xbattbar.git"; - rev = "upstream/${version}"; - sha256 = "10w7gs0l4hzhdn38yqyr3az7n4ncmfnd6hhhly6lk5dg7k441ck6"; + tag = "upstream/${finalAttrs.version}"; + hash = "sha256-ZrJAyDyvlUmNpxBC06yrzBJ7vhrZY4+GbfBDQoF+h4M="; }; buildInputs = [ libX11 ]; - # The following patches are applied: - # - sys-by-default: remove the APM checker binary, make the sys checker - # script the default. Rationale: checking battery status by /proc/apm is - # extremely oldschool and does not work on NixOS, while the sysfs script - # does. + # remove the APM checker binary, make the sys checker + # script the default. Rationale: checking battery status by /proc/apm is + # extremely oldschool and does not work on NixOS, while the sysfs script + # does. + patches = [ ./sys-by-default.patch ]; # - perl shebang patches for acpi/sys scripts # - unhardcode path to checker scripts # - add missing return type in main function - patches = [ ./sys-by-default.patch ]; - postPatch = '' substituteInPlace xbattbar.c \ --replace-fail "main(int argc" "int main(int argc" @@ -41,19 +38,23 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/libexec + runHook preInstall + + mkdir -p $out/{bin,libexec} + install -m 0755 xbattbar $out/bin/ install -m 0755 xbattbar-check-acpi $out/libexec/ install -m 0755 xbattbar-check-sys $out/libexec/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Display battery status in X11"; homepage = "https://salsa.debian.org/debian/xbattbar"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.q3k ]; + license = with lib; licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ q3k ]; mainProgram = "xbattbar"; }; -} +}) From 91707f7cd09615d86cf70ee99b608ad39734f894 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Mar 2025 12:28:04 -0500 Subject: [PATCH 089/123] luaPackages.orgmode: tweak tree-sitter patch Co-authored-by: linsui <36977733+linsui@users.noreply.github.com> --- pkgs/development/lua-modules/overrides.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 71f0ab2593ec..68ca4ed97f85 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1116,13 +1116,13 @@ in orgmode = prev.orgmode.overrideAttrs (oa: { # Patch in tree-sitter-orgmode dependency postPatch = '' - substituteInPlace lua/orgmode/utils/treesitter/install.lua \ + substituteInPlace lua/orgmode/config/init.lua \ --replace-fail \ - "vim.treesitter.language.add('org')" \ - "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" - - substituteInPlace lua/orgmode/utils/treesitter/install.lua \ - --replace-fail "if version_info.outdated then" "if false then" + "require('orgmode.utils.treesitter.install').install()" \ + "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" \ + --replace-fail \ + "require('orgmode.utils.treesitter.install').reinstall()" \ + "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" ''; }); From 95a92d59ddb99dc714d0f8a51f8d45a298ebc01c Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 2 Feb 2025 11:26:58 +0100 Subject: [PATCH 090/123] python312Packages.ndindex: fix Hypothesis test timeouts --- .../python-modules/ndindex/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index ad222111112d..2c8fec5e26d3 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + python, # build-system cython, @@ -36,15 +37,28 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ - --replace "--flakes" "" + --replace-fail "--flakes" "" ''; optional-dependencies.arrays = [ numpy ]; pythonImportsCheck = [ "ndindex" ]; + # fix Hypothesis timeouts preCheck = '' cd $out + + echo > ${python.sitePackages}/ndindex/tests/conftest.py < Date: Fri, 14 Mar 2025 19:34:03 +0100 Subject: [PATCH 091/123] bacon: 3.11.0 -> 3.12.0 Diff: https://github.com/Canop/bacon/compare/refs/tags/v3.11.0...v3.12.0 Changelog: https://github.com/Canop/bacon/blob/v3.12.0/CHANGELOG.md --- pkgs/by-name/ba/bacon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 5eee447e708f..b74de3029be5 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-yFU4U1TWoumg61Vs6F5Gqz22VuI2Qs0IRz/TPGBYX4E="; + hash = "sha256-M/9QzLRY0QhMSSadjxZArLhcM3S6yjLPdP6R9p/1cL4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g8DWFhgguxPked7kCCsmUPXzRqu5DaPopoxORBl4/1o="; + cargoHash = "sha256-799hpVUj4RfF2ei19bE/+qOixk5/v7PPuxmmDC0Zkqw="; buildFeatures = lib.optionals withSound [ "sound" From c7c0df278b86d191dac8bf5e618065c94b67f429 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 19:42:59 +0100 Subject: [PATCH 092/123] python312Packages.torchmetrics: 1.6.2 -> 1.6.3 Diff: https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.6.2...v1.6.3 Changelog: https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.6.3 --- pkgs/development/python-modules/torchmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 58b33ac79e89..d3595bd90b7f 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-IPhBgGciB/3IFYVX+miID4oQ+5CpcjvAHiufxKiHzFw="; + hash = "sha256-zBsqotwL6KUpcNV7SyEGnuW9Vl3oxaVy5wMHgGD7U/M="; }; dependencies = [ From 631bed6ed93e8bf638299b570fb0c1ed902ee255 Mon Sep 17 00:00:00 2001 From: Florent Charpentier Date: Fri, 14 Mar 2025 14:18:15 +0100 Subject: [PATCH 093/123] nixos/systemd-repart: add support for repeating settings fix https://github.com/NixOS/nixpkgs/issues/389478 --- nixos/modules/image/repart.nix | 4 ++-- nixos/modules/system/boot/systemd/repart.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index c2963c816533..d6120da6524a 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -48,7 +48,7 @@ let }; repartConfig = lib.mkOption { - type = with lib.types; attrsOf (oneOf [ str int bool ]); + type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]); example = { Type = "home"; SizeMinBytes = "512M"; @@ -311,7 +311,7 @@ in (lib.mapAttrsToList (_n: v: v.repartConfig.Format or null) cfg.partitions); - format = pkgs.formats.ini { }; + format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; definitionsDirectory = utils.systemdUtils.lib.definitions "repart.d" diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index 869172ceca6e..a8dc4745c26b 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -10,7 +10,7 @@ let cfg = config.systemd.repart; initrdCfg = config.boot.initrd.systemd.repart; - format = pkgs.formats.ini { }; + format = pkgs.formats.ini { listsAsDuplicateKeys = true; }; definitionsDirectory = utils.systemdUtils.lib.definitions "repart.d" format ( lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions @@ -93,6 +93,7 @@ in str int bool + (listOf str) ]) ); default = { }; From 3ea13fa0ee936b398071ab9285dcd467488bc1a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 19:48:26 +0100 Subject: [PATCH 094/123] python313Packages.publicsuffixlist: 1.0.2.20250312 -> 1.0.2.20250314 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250314-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 f5da024dea30..70b8b5fff1d1 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.20250312"; + version = "1.0.2.20250314"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xa8ZlThHFuw97SLVVxWS2YUFUD9mQ1V+vyfVPYYZ6Pk="; + hash = "sha256-ssjLDBvX8TU7BEeA5k9VcE1TDaW7aY8A64rqdo8cxzw="; }; build-system = [ setuptools ]; From 342c4f300b6f44fd495aefcfb5f84dec4293b32b Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 14 Mar 2025 18:40:00 +0100 Subject: [PATCH 095/123] nixos/{renovate, libvirtd}: fix typo --- nixos/modules/services/misc/renovate.nix | 2 +- nixos/modules/virtualisation/libvirtd.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 5d968dc41a68..503aed8fdb91 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -69,7 +69,7 @@ in validateSettings = mkOption { type = types.bool; default = true; - description = "Weither to run renovate's config validator on the built configuration."; + description = "Whether to run renovate's config validator on the built configuration."; }; settings = mkOption { type = json.type; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 0852111437b4..a7ceecb452c0 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -363,7 +363,7 @@ in type = types.bool; default = true; description = '' - Weither to configure OpenSSH to use the [SSH Proxy](https://libvirt.org/ssh-proxy.html). + Whether to configure OpenSSH to use the [SSH Proxy](https://libvirt.org/ssh-proxy.html). ''; }; }; From 1abd5bef0f642940052a3692712c99143ca0ccb9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 19:53:30 +0100 Subject: [PATCH 096/123] fish: skip failing test on aarch64-linux --- pkgs/by-name/fi/fish/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 96386d8c2a0b..ce1c37ff021b 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -321,6 +321,12 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' export TERMINFO="${ncurses}/share/terminfo" ''; + checkFlags = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # thread 'tests::string_escape::test_escape_random_url' panicked at src/tests/string_escape.rs:122:9: + # assertion `left == right` failed: Escaped and then unescaped string ... but got back a different string ... + # https://github.com/fish-shell/fish-shell/issues/11254 + "--skip=tests::string_escape::test_escape_random_url" + ]; nativeInstallCheckInputs = [ versionCheckHook From e3c72248bb6b99f917b8bdc85d4bf5feb5735981 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Mar 2025 19:56:41 +0100 Subject: [PATCH 097/123] fish: cleanup --- pkgs/by-name/fi/fish/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index ce1c37ff021b..c26c23de32ff 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -267,11 +267,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ - "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish" - "-DRust_CARGO_TARGET=${stdenv.hostPlatform.rust.rustcTarget}" + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "${placeholder "doc"}/share/doc/fish") + (lib.cmakeFeature "Rust_CARGO_TARGET" stdenv.hostPlatform.rust.rustcTarget) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DMAC_CODESIGN_ID=OFF" + (lib.cmakeBool "MAC_CODESIGN_ID" false) ]; # Fish’s test suite needs to be able to look up process information and send signals. @@ -381,13 +381,13 @@ stdenv.mkDerivation (finalAttrs: { tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; - meta = with lib; { + meta = { description = "Smart and user-friendly command line shell"; homepage = "https://fishshell.com/"; - changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ + changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ adamcstephens cole-h winter From 9405862c1fab13cbe2c67488065d5be8feb2fa57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 19:03:11 +0000 Subject: [PATCH 098/123] qucsator-rf: 1.0.4 -> 1.0.5 --- pkgs/by-name/qu/qucsator-rf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix index 2dd4f6055028..2549a5694f84 100644 --- a/pkgs/by-name/qu/qucsator-rf/package.nix +++ b/pkgs/by-name/qu/qucsator-rf/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qucsator-rf"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucsator_rf"; rev = version; - hash = "sha256-01GQmakwLzaNnPZvtYYtt5WJmYF3EytlAA0Xy1/AAsU="; + hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg="; }; # Upstream forces NO_DEFAULT_PATH on APPLE From f6f073aa26dc4da07a867750994555a849b1c095 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 16:39:05 +0000 Subject: [PATCH 099/123] brave: 1.76.73 -> 1.76.74 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index ca0c614e436b..66f570cb1672 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.76.73"; + version = "1.76.74"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-9rpH7A63AJRlHRohSa9Pp6Hdq57LwUCfM9KkvewzXKQ="; + hash = "sha256-O8hXKkuw86TeKH4lsyqGdKslrCRbw7mzXfHULCGpgxk="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-HkQkIvUdkV4pMdAaO7Oa7pR22UXFtTiH2BAsp2/gLQg="; + hash = "sha256-tGf3tjZyzgyojDkgFb/SUvZxdVnYFlx6bPTLeFuTtRI="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-sgdmvQ7Po5JygHoxCOs2aufL8meHP27lyW8omyl5BY8="; + hash = "sha256-l9Ufg9w5P0TIl4gXMJ+JK83x+5QZL0i9+k9X05Llwr4="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-auGpQicHJLJpEeVS0tIkvqjbzAfrn6h7vDgeERqT5kk="; + hash = "sha256-MH/WT/eUWaJXWln4uiXN1BD+K0jVoX7xqsKZGXQ/BmI="; }; }; From 6a145a5f052008334d09d2399c2561e9cafb0056 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 03:46:50 +0000 Subject: [PATCH 100/123] akkoma: 3.15.1 -> 3.15.2 --- pkgs/by-name/ak/akkoma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix index c2d6995049e0..2068c115f014 100644 --- a/pkgs/by-name/ak/akkoma/package.nix +++ b/pkgs/by-name/ak/akkoma/package.nix @@ -10,14 +10,14 @@ beamPackages.mixRelease rec { pname = "akkoma"; - version = "3.15.1"; + version = "3.15.2"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; tag = "v${version}"; - hash = "sha256-6qsqTguEVu9t6dW8c+VAE5Z7D3FbQ0S2ZfAN5qy7Xak="; + hash = "sha256-GW86OyO/XPIrCS+cPKQ8LG8PdhhfA2rNH1FXFiuL6vM="; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ beamPackages.mixRelease rec { mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-nWtY5eohP9pv/vS9FuCh2nlPxLJ2Y4IRmve5in328DU="; + hash = "sha256-ygRj0s9J2/nBXR5s9CE7eMRBxsRhKlV/IZrkwPpco14="; postInstall = '' substituteInPlace "$out/http_signatures/mix.exs" \ From 5c4803c56ea118ba52353635e0826b88d03b501e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 7 Mar 2025 23:06:27 +0100 Subject: [PATCH 101/123] electron{,-bin}: add direct support for the NIXOS_OZONE_WL env var --- pkgs/development/tools/electron/binary/generic.nix | 3 ++- pkgs/development/tools/electron/wrapper.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index fc3c38e5b73a..60deec1bfd32 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -155,7 +155,8 @@ let preFixup = '' makeWrapper "$out/libexec/electron/electron" $out/bin/electron \ - "''${gappsWrapperArgs[@]}" + "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; postFixup = '' diff --git a/pkgs/development/tools/electron/wrapper.nix b/pkgs/development/tools/electron/wrapper.nix index 412596a0629b..93fb9301eea4 100644 --- a/pkgs/development/tools/electron/wrapper.nix +++ b/pkgs/development/tools/electron/wrapper.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation { buildCommand = '' gappsWrapperArgsHook mkdir -p $out/bin - makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ + makeShellWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set CHROME_DEVEL_SANDBOX $out/libexec/electron/chrome-sandbox ln -s ${electron-unwrapped}/libexec $out/libexec From 5f8d5640527037577955ea27f64cc3bfea2ef97f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 8 Mar 2025 00:07:20 +0100 Subject: [PATCH 102/123] treewide: remove duplicated logic for NIXOS_OZONE_WL --- pkgs/applications/audio/youtube-music/default.nix | 1 - pkgs/applications/editors/vscode/generic.nix | 1 - pkgs/applications/graphics/drawio/default.nix | 1 - pkgs/applications/misc/whalebird/default.nix | 3 +-- pkgs/applications/science/math/geogebra/geogebra6.nix | 3 +-- pkgs/by-name/af/affine-bin/package.nix | 1 - pkgs/by-name/af/affine/package.nix | 1 - pkgs/by-name/an/anytype/package.nix | 1 - pkgs/by-name/ap/appium-inspector/package.nix | 1 - pkgs/by-name/bi/bitwarden-desktop/package.nix | 1 - pkgs/by-name/bl/blockbench/package.nix | 1 - pkgs/by-name/br/bruno/package.nix | 1 - pkgs/by-name/bs/bs-manager/package.nix | 1 - pkgs/by-name/ca/caprine/package.nix | 1 - pkgs/by-name/ch/cherry-studio/package.nix | 1 - pkgs/by-name/dd/ddm/package.nix | 1 - pkgs/by-name/de/deltachat-desktop/package.nix | 1 - pkgs/by-name/el/element-desktop/package.nix | 1 - pkgs/by-name/en/ente-desktop/package.nix | 3 +-- pkgs/by-name/eq/equibop/package.nix | 3 +-- pkgs/by-name/fe/feishin/package.nix | 1 - pkgs/by-name/fo/follow/package.nix | 3 +-- pkgs/by-name/fr/freetube/package.nix | 3 +-- pkgs/by-name/gd/gdlauncher-carbon/package.nix | 1 - pkgs/by-name/gf/gfn-electron/package.nix | 3 +-- pkgs/by-name/gi/gitify/package.nix | 1 - pkgs/by-name/ht/httptoolkit/package.nix | 1 - pkgs/by-name/it/itch/package.nix | 1 - pkgs/by-name/ji/jitsi-meet-electron/package.nix | 1 - pkgs/by-name/ka/kando/package.nix | 1 - pkgs/by-name/ko/koodo-reader/package.nix | 1 - pkgs/by-name/ku/kuro/package.nix | 1 - pkgs/by-name/le/legcord/package.nix | 1 - pkgs/by-name/lx/lx-music-desktop/package.nix | 1 - pkgs/by-name/ma/marktext/package.nix | 3 +-- pkgs/by-name/ma/mattermost-desktop/package.nix | 3 +-- pkgs/by-name/mq/mqtt-explorer/package.nix | 1 - pkgs/by-name/ne/netron/package.nix | 1 - pkgs/by-name/ob/obsidian/package.nix | 1 - pkgs/by-name/pe/penpot-desktop/package.nix | 1 - pkgs/by-name/po/podman-desktop/package.nix | 1 - pkgs/by-name/pr/proton-pass/package.nix | 1 - pkgs/by-name/pr/protonmail-desktop/package.nix | 1 - pkgs/by-name/r2/r2modman/package.nix | 3 +-- pkgs/by-name/re/redisinsight/package.nix | 1 - pkgs/by-name/re/revolt-desktop/package.nix | 3 +-- pkgs/by-name/ri/ride/package.nix | 1 - pkgs/by-name/si/siyuan/package.nix | 1 - pkgs/by-name/su/super-productivity/package.nix | 1 - pkgs/by-name/te/teams-for-linux/package.nix | 3 +-- pkgs/by-name/te/tetrio-desktop/package.nix | 1 - pkgs/by-name/ti/tidal-hifi/package.nix | 1 - pkgs/by-name/uh/uhk-agent/package.nix | 1 - pkgs/by-name/ve/vesktop/package.nix | 3 +-- pkgs/by-name/vo/voicevox/package.nix | 1 - pkgs/by-name/we/webcord/package.nix | 1 - pkgs/by-name/wi/wire-desktop/package.nix | 4 ---- pkgs/by-name/yt/ytmdesktop/package.nix | 1 - pkgs/by-name/za/zap-chip/package.nix | 1 - pkgs/by-name/ze/zepp-simulator/package.nix | 1 - pkgs/by-name/zu/zulip/package.nix | 1 - pkgs/games/heroic/default.nix | 3 +-- pkgs/tools/security/bitwarden-directory-connector/default.nix | 1 - 63 files changed, 14 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index ef035a500226..721ecb384b20 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -77,7 +77,6 @@ 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 --enable-wayland-ime=true}}" \ --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 8e2cc8d521ee..6e11cae84384 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -278,7 +278,6 @@ stdenv.mkDerivation ( } # 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 --enable-wayland-ime=true}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3a81df70ff46..768c1355c81b 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -103,7 +103,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index aab1423a81dd..d93fb6e12e4b 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -96,8 +96,7 @@ stdenv.mkDerivation rec { "$out/share/icons/hicolor/64x64/apps/whalebird.png" 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 --enable-wayland-ime=true}}" + --add-flags "$out/opt/Whalebird/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 3f9b349401b1..f39134f5d21b 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -62,8 +62,7 @@ let mkdir -p $out/libexec/geogebra/ $out/bin 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 --enable-wayland-ime=true}}" + --add-flags "$out/resources/app" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index b576208ee505..eba073e34720 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -115,7 +115,6 @@ stdenvNoCC.mkDerivation ( makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ --inherit-argv0 \ --add-flags $out/lib/${binName}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 31cf1a03df2a..3f3106377817 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -189,7 +189,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${lib.getExe electron}" $out/bin/${binName} \ --inherit-argv0 \ --add-flags $out/lib/${binName}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index a2d4afef8054..69c73ce2ad76 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -89,7 +89,6 @@ buildNpmPackage { makeWrapper '${lib.getExe electron}' $out/bin/anytype \ --set-default ELECTRON_IS_DEV 0 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/anytype/ \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index ac17e91e8eb6..f04611010444 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -53,7 +53,6 @@ buildNpmPackage { makeWrapper '${electron}/bin/electron' "$out/bin/appium-inspector" \ --add-flags "$out/share/appium-inspector/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set NODE_ENV production install -m 444 -D 'app/common/renderer/assets/images/icon.png' \ diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 44f33663d5cd..fccc5ce3fec1 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -184,7 +184,6 @@ 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 --enable-wayland-ime=true}}" \ --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 d5236efdea77..3e569d227818 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -71,7 +71,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index cec8d5f38c60..cfecf8d11248 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -153,7 +153,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix index 207934fe86c9..a250cea77397 100644 --- a/pkgs/by-name/bs/bs-manager/package.nix +++ b/pkgs/by-name/bs/bs-manager/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/bs-manager \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --add-flags $out/opt/BSManager/resources \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 17d78ba28d9b..d3844f95e20e 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -49,7 +49,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 212986c344eb..f0566d36a659 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${lib.getExe electron}" $out/bin/cherry-studio \ --inherit-argv0 \ --add-flags $out/lib/cherry-studio/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index ca3cc7af51ec..8452247c9743 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png makeWrapper ${lib.getExe electron} $out/bin/ddm \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "$out/share/ddm" # Install externally-downloaded campaign packs & cube lists diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 90e01174ddc2..f08e7d01f230 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -110,7 +110,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 8efe960d6b4f..212ee9836801 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation ( 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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix index 94d99835dd02..929a0481ffa9 100644 --- a/pkgs/by-name/en/ente-desktop/package.nix +++ b/pkgs/by-name/en/ente-desktop/package.nix @@ -109,8 +109,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ --set ELECTRON_IS_DEV 0 \ - --add-flags "$out/share/ente-desktop/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "$out/share/ente-desktop/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 54e006c2c2ff..ce627e22b297 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -110,8 +110,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/equibop \ --add-flags $out/opt/Equibop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} ''; desktopItems = makeDesktopItem { diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 4b7f91f5b05f..e895bf9ae7d5 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -115,7 +115,6 @@ 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 --enable-wayland-ime=true}}" \ --set ELECTRON_FORCE_IS_PACKAGED=1 \ --inherit-argv0 diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index fed49a03069b..fc66d86fe20c 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -91,8 +91,7 @@ stdenv.mkDerivation rec { makeWrapper "${electron}/bin/electron" "$out/bin/follow" \ --inherit-argv0 \ --add-flags --disable-gpu-compositing \ - --add-flags $out/share/follow \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags $out/share/follow install -m 444 -D "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index b4002ae64ce1..d1caa7b19b3d 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -69,8 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube makeWrapper ${lib.getExe electron} $out/bin/freetube \ - --add-flags "$out/share/freetube/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "$out/share/freetube/resources/app.asar" install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index 2bf6074c25fb..5b46766bcbcb 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { --set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${libPath} \ --suffix PATH : "${binPath}" \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/share/gdlauncher-carbon/resources/app.asar ''; diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index 37eb0397f94f..40936a407102 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -59,8 +59,7 @@ buildNpmPackage { postFixup = '' makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \ - --add-flags "--no-sandbox --disable-gpu-sandbox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "--no-sandbox --disable-gpu-sandbox" substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \ --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \ diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 815a1d598669..da1f697a2ba9 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -80,7 +80,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' } diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index 6f954c2281fc..b2b95badedec 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -62,7 +62,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index 5ce46f34f1d8..b9b03f9f8a91 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -87,7 +87,6 @@ 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 --enable-wayland-ime=true}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}/bin/:${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 55edb988668d..cad99faf87a7 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -102,7 +102,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 5becb3694d3c..719c290a4c0d 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -106,7 +106,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index 7f78429568ae..347540d03c6a 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -81,7 +81,6 @@ 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 --enable-wayland-ime=true}}" \ --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 5fb26933e51e..2df692ecce09 100644 --- a/pkgs/by-name/ku/kuro/package.nix +++ b/pkgs/by-name/ku/kuro/package.nix @@ -61,7 +61,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index dc5f54495fdd..f6b26dff3d62 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { makeShellWrapper "${lib.getExe electron_34}" "$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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 138564e76548..b26cb8524581 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation { makeWrapper ${electron_32}/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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ ''; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 1a095a3520eb..43d982f6d2ff 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -149,8 +149,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r build/*-unpacked/{locales,resources{,.pak}} $out/opt/marktext makeWrapper ${lib.getExe electron} $out/bin/marktext \ - --add-flags $out/opt/marktext/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags $out/opt/marktext/resources/app.asar runHook postInstall ''; diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index ad141c593e89..fd3f392cb0c4 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -74,8 +74,7 @@ buildNpmPackage rec { 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 --enable-wayland-ime=true}}" + --add-flags $out/share/${pname}/app.asar runHook postInstall ''; diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 0d8e05f9b4b0..f0356ec33dfd 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -122,7 +122,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index ad432a9a1682..b64226701c45 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -69,7 +69,6 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/netron" \ --add-flags $out/opt/netron/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index beae1bf30a37..f1fd34920e93 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -79,7 +79,6 @@ 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 --enable-wayland-ime=true}}" \ --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/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index 302e63e0a1da..a866cbff0b85 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -76,7 +76,6 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/penpot-desktop" \ --add-flags $out/opt/Penpot/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 63c80a576e32..fd3c51de25a1 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -83,7 +83,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index ccbfc7aa56cd..00e565a10458 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -46,7 +46,6 @@ 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 --enable-wayland-ime=true}}" \ --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 d05c31a45e54..a10de8ca6470 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation { preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/proton-mail/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --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 76c14bd473a1..e7542b45d0f0 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -86,8 +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 --enable-wayland-ime=true}}" + --add-flags "$out/share/r2modman" runHook postInstall ''; diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 2c2f4bd345b6..392be3107c8a 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -138,7 +138,6 @@ 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 --enable-wayland-ime=true}}" \ --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 0f7d07d0893b..c53ef333997d 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -73,8 +73,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 --enable-wayland-ime=true}}" + --add-flags $out/share/revolt-desktop/resources/app.asar ''; } else diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 8035a87ce183..b9dcadfe178b 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -108,7 +108,6 @@ 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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 101f6dbcd688..989f9b0d53b6 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out/share/siyuan/resources \ --add-flags $out/share/siyuan/resources/app \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 181805919b57..1e6aa5a0e0ef 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -91,7 +91,6 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \ --add-flags "$out/share/super-productivity/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 '' diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index ac33529a0d4a..c538e81d6ad7 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -79,8 +79,7 @@ buildNpmPackage rec { which ] } \ - --add-flags "$out/share/teams-for-linux/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "$out/share/teams-for-linux/app.asar" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index ad945a5bddcf..ad140ca5c062 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/share/TETR.IO/app.asar ''; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 7165e3249c93..453408eb1a11 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -106,7 +106,6 @@ 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 --enable-wayland-ime=true}}" \ "''${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 6546024e41e0..7b2d5bc08b64 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -61,7 +61,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 9ceee9d8fff6..d5f8e53828f0 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -140,8 +140,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index 509b246de35b..b6a978cbe446 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/voicevox \ --add-flags $out/share/voicevox/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index f7cf9d28ac9f..83cb955725e5 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -57,7 +57,6 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 0f89a5bb4881..7c40dab173d6 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -140,10 +140,6 @@ let libdbusmenu ]; - preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}") - ''; - postFixup = '' makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index e9642c764146..22667407b0e7 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -82,7 +82,6 @@ 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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook preFixup diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index 882f72805bb1..8abb2320000c 100644 --- a/pkgs/by-name/za/zap-chip/package.nix +++ b/pkgs/by-name/za/zap-chip/package.nix @@ -76,7 +76,6 @@ buildNpmPackage rec { rm $out/bin/zap makeWrapper '${lib.getExe electron}' "$out/bin/zap" \ --add-flags $out/opt/zap-chip/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 ''; diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index f8d4503660f9..21c6498e01e0 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -133,7 +133,6 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe electron} $out/bin/simulator \ --add-flags "--no-sandbox" \ --add-flags $out/opt/simulator/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default NODE_ENV production \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 27f9b0a4cc2a..89ac29865e47 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -50,7 +50,6 @@ buildNpmPackage rec { makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \ --add-flags "$out/share/lib/zulip/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 7f2ce5c9b8e4..10deb2322a37 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -89,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ --add-flags --disable-gpu-compositing \ - --add-flags $out/opt/heroic/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags $out/opt/heroic/resources/app.asar install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop" install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg" diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 1fc1579f3327..3e96d483e0b2 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -85,7 +85,6 @@ 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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 From 13d510ea228c16b12b02e9f86ef29c6ab3fb6b9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:26:14 +0100 Subject: [PATCH 103/123] python313Packages.circuitbreaker: 2.0.0 -> 2.1.0 Diff: https://github.com/fabfuel/circuitbreaker/compare/refs/tags/2.0.0...2.1.0 --- pkgs/development/python-modules/circuitbreaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix index 3210a741c85c..65f30b2d363c 100644 --- a/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/pkgs/development/python-modules/circuitbreaker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "circuitbreaker"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fabfuel"; repo = pname; tag = version; - hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0="; + hash = "sha256-lwLy/bWvXhmQbRJ6Qii7e0SrEL3iDPGs6k7Bqamvg50="; }; nativeCheckInputs = [ From 0839458f0a1133bd5ab66624b9c0b75afe7f526e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:26:59 +0100 Subject: [PATCH 104/123] python313Packages.cyclopts: 3.9.2 -> 3.9.3 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.9.2...v3.9.3 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.9.3 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index eee8bc094e7d..4a55f9e97948 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.9.2"; + version = "3.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-Juu9OeSygHzhny9leS250YhsP+/3/0Dor9SXFP+wMPA="; + hash = "sha256-BJkpQhQuKm/yI3p8zspojYzUcpgMz1LAQwTx4Ppf06U="; }; build-system = [ From 29e21f4879f11e9969430e05209b982eb3175aae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:28:24 +0100 Subject: [PATCH 105/123] python313Packages.extract-msg: 0.53.1 -> 0.53.2 Diff: https://github.com/TeamMsgExtractor/msg-extractor/compare/refs/tags/v0.53.1...v0.53.2 Changelog: https://github.com/TeamMsgExtractor/msg-extractor/blob/0.53.2/CHANGELOG.md --- pkgs/development/python-modules/extract-msg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index 97365a843faf..623dfc9947cf 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "extract-msg"; - version = "0.53.1"; + version = "0.53.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TeamMsgExtractor"; repo = "msg-extractor"; tag = "v${version}"; - hash = "sha256-vkWINRUQh/zfKzSJifJMn0EVnBdPODLFdS/jMdGI36I="; + hash = "sha256-aPYTkJn1v5JW0Q2zCOKinlVpkRyPilaiClCwhFXJ4GI="; }; pythonRelaxDeps = [ From 0b388627f3fb56af7f48ada1ef30cf9c6bb5d012 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:33:41 +0100 Subject: [PATCH 106/123] python313Packages.gardena-bluetooth: 1.5.0 -> 1.6.0 Diff: https://github.com/elupus/gardena-bluetooth/compare/refs/tags/1.5.0...1.6.0 Changelog: https://github.com/elupus/gardena-bluetooth/releases/tag/1.6.0 --- pkgs/development/python-modules/gardena-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 20da572ce8b0..c2265d3cf9dc 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; tag = version; - hash = "sha256-U/Spy9Jc86BJ4AokqdWFRlZ4nOHIFTQ8aphK/xhofWg="; + hash = "sha256-L726A0o9TIxFjHOxx0e42RIj4XMOdeZTJE2gWo6OhG4="; }; build-system = [ poetry-core ]; From f6d394dc5bb83804f230a8f07ae6a2cb0a776dd7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:40:27 +0100 Subject: [PATCH 107/123] python313Packages.tencentcloud-sdk-python: 3.0.1338 -> 3.0.1339 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1338...3.0.1339 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1339/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 d171198f1e9d..d413930bcc0b 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.1338"; + version = "3.0.1339"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-xp+5hJP6WIK+ROj0+ZRLSNVhuDmOfRBrfufZhUTnJ2Q="; + hash = "sha256-SyrN+EiDlKzP0nc/dYib8TQmyO3CoUT7BydXl116SEE="; }; build-system = [ setuptools ]; From dd0f429ded0005ac25c793ea624b85959d25556b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 19:46:09 +0000 Subject: [PATCH 108/123] hellwal: 1.0.2 -> 1.0.3 --- pkgs/by-name/he/hellwal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/hellwal/package.nix b/pkgs/by-name/he/hellwal/package.nix index 6a35ba738126..605eba124c21 100644 --- a/pkgs/by-name/he/hellwal/package.nix +++ b/pkgs/by-name/he/hellwal/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hellwal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "danihek"; repo = "hellwal"; tag = "v${finalAttrs.version}"; - hash = "sha256-TrqXInoz6OEtS12YmXUILV41IkZW0B4XAAESiU2yMMU="; + hash = "sha256-ei612uqAdEDwodsVDkmI4CGASMzCC/q0+CuNS54B53U="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 58d137e50694b4168cb581d3342eea7887ca095c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 19:52:03 +0000 Subject: [PATCH 109/123] hck: 0.11.1 -> 0.11.4 --- pkgs/by-name/hc/hck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index cec9f134c2df..906370d04b4b 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.11.1"; + version = "0.11.4"; src = fetchFromGitHub { owner = "sstadick"; repo = "hck"; rev = "v${version}"; - hash = "sha256-QodwSirWCMQqimzUEcpH7lnCc2k4WIZiqww+kqI1zoU="; + hash = "sha256-XnkLKslZY2nvjO5ZeTIBJ0Y47/JPhfIS/F5KKqm5iwI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TxYLfTw/CpU+bFfXYCpRfSk7b/aSNkcUvNaA1EGIFGc="; + cargoHash = "sha256-NKyBC/kD2tq61su7tUsSPQ2Rr4YBYUsotL55aCoFNGw="; nativeBuildInputs = [ cmake ]; From bfd29dc5885763c64c32a18b1c7edb596a99c900 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:52:04 +0100 Subject: [PATCH 110/123] python313Packages.stupidartnet: 1.5.0 -> 1.6.0 Diff: https://github.com/cpvalente/stupidArtnet/compare/refs/tags/1.5.0...1.6.0 Changelog: https://github.com/cpvalente/stupidArtnet/releases/tag/1.6.0 --- pkgs/development/python-modules/stupidartnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stupidartnet/default.nix b/pkgs/development/python-modules/stupidartnet/default.nix index 281601164f7b..94681cb10810 100644 --- a/pkgs/development/python-modules/stupidartnet/default.nix +++ b/pkgs/development/python-modules/stupidartnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "stupidartnet"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cpvalente"; repo = "stupidArtnet"; tag = version; - hash = "sha256-6vEzInt1ofVVjTZAOH0Zw3BdwpX//1ZWwJqWPP5fIC8="; + hash = "sha256-prLIQn1vFp0Q8FR2WBaU1tr6eKJpEY1ul4ldd4c35ls="; }; nativeBuildInputs = [ setuptools ]; From d9988f788513ed14c25841493c8ef8b73a60dbb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Mar 2025 20:53:20 +0100 Subject: [PATCH 111/123] python313Packages.stupidartnet: refactor --- pkgs/development/python-modules/stupidartnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stupidartnet/default.nix b/pkgs/development/python-modules/stupidartnet/default.nix index 94681cb10810..2d0b71d72b60 100644 --- a/pkgs/development/python-modules/stupidartnet/default.nix +++ b/pkgs/development/python-modules/stupidartnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "cpvalente"; @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-prLIQn1vFp0Q8FR2WBaU1tr6eKJpEY1ul4ldd4c35ls="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From e6f237292ec7ea0be08311c093f2563a951f4e21 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Fri, 14 Mar 2025 14:02:28 +0100 Subject: [PATCH 112/123] gitlab-container-registry: fix s3 test --- pkgs/by-name/gi/gitlab-container-registry/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 03649736a719..9ffb6816c675 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -20,12 +20,11 @@ buildGoModule rec { vendorHash = "sha256-oNQoKn8GPJxmUzkUHGzax2/KWyI3VXLRtAvWe9B64Ds="; - postPatch = '' - substituteInPlace health/checks/checks_test.go \ - --replace-fail \ - 'func TestHTTPChecker(t *testing.T) {' \ - 'func TestHTTPChecker(t *testing.T) { t.Skip("Test requires network connection")' - ''; + checkFlags = [ + # TestHTTPChecker requires internet + # TestS3DriverPathStyle requires s3 credentials/urls + "-skip TestHTTPChecker|TestS3DriverPathStyle" + ]; meta = with lib; { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; From c384a1a10ab0c368de1d8a7b2e62209d1eab44bc Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 10:41:14 +0100 Subject: [PATCH 113/123] electron_33-bin: 33.4.3 -> 33.4.5 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index c37e344c5c06..5a731a890670 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,14 +12,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "9ccd393f8e7d817fb4595fd082b1e791ff0a794b34c50d71bd0c8ac37b8ced45", - "aarch64-linux": "10c2abca8baa52f5fac1ddf48450135ea321e8e2d177598798232ad8ea268f77", - "armv7l-linux": "e485d0e0d5a7e923e9060e34a0473b561a7e1f58d878e856cd86562a30d9fb9e", - "headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3", - "x86_64-darwin": "b072f47e5140b7f0bb9be8aa30e57a863056d4da260daec7228b4452369e9b85", - "x86_64-linux": "3d14f1447654542bafd40736a131478fa2496955533043f21e306b06c923cf65" + "aarch64-darwin": "01cdfb1537bd56691bd65a855c5680f43336b402d3c44bf2e3fde2c9522ad39f", + "aarch64-linux": "1b91071b2da78c8a2e35113ae4f0705b60e4dbf74626cc1962af68fc1583ce11", + "armv7l-linux": "94dfc24c44900795609ce0cb02598a5f40ca9ef10fd685f8939f9142e8aca4ed", + "headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1", + "x86_64-darwin": "5d84d441d7e3ee4c4a3088426c1da39369cf7bdf96ed709f1f15db5e1d1624df", + "x86_64-linux": "1fcc119c2b35d7d6e347bca6c4280111ac87f138d5f53817e8cba10027ef0d88" }, - "version": "33.4.3" + "version": "33.4.5" }, "34": { "hashes": { From 79246b80432a79ecf838eec0446253614e576abe Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 10:41:19 +0100 Subject: [PATCH 114/123] electron-chromedriver_33: 33.4.3 -> 33.4.5 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 193256bbcd82..42b6d7f4cceb 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,14 +12,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "df4c6a7748c216487400c69672c01e79528e2bc3f0b3e2b0d9e211c0e9a6d112", - "aarch64-linux": "1e02eb6c463069ab6a6e835c12f9258caee5fcfca959f14a676a03d0df650fa9", - "armv7l-linux": "258df5b303f49c9c5b5e70947eb4530bf1a59ce1b8578c2ad137aa1dfb85b645", - "headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3", - "x86_64-darwin": "b1bc51d58977d14b22040e87dc31114e0be37f3395e98e52548d974a86df7f71", - "x86_64-linux": "9fd0d0c010de003d68ae4bbce57241f6d8a9d852d98c708412a3490fd48bca51" + "aarch64-darwin": "3cb2951e2591648e0d55f52b14d0743cca22dbdff5b832a5616434a68f24f3c2", + "aarch64-linux": "dbb5dccda630f37e52d6dd09be9f26cacbead7981b2bf4ab7fd0cb8793e1ef2c", + "armv7l-linux": "aaf4c2e562a0c9bbcaf72cd652531376d31cbe9745a4e811b904e32448a3bd8b", + "headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1", + "x86_64-darwin": "c9721607e7c6e86986d05bf9bf3ea9674b1409516aa1a6956d0c8537a4995fa2", + "x86_64-linux": "6377a8be4424a1469f54ecc68d64b757d16b55c9f942eae97149610e1347588f" }, - "version": "33.4.3" + "version": "33.4.5" }, "34": { "hashes": { From a4575e70640cd8bd85ca2be8ad769a3ef9936dcd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 11:11:21 +0100 Subject: [PATCH 115/123] electron-source.electron_33: 33.4.3 -> 33.4.5 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5 --- pkgs/development/tools/electron/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0f2d243135b2..74264d69f115 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -17,7 +17,7 @@ "src": { "fetcher": "fetchFromGitiles", "hash": "sha256-hJZWDT7D2YP75CQJwYNqnMTvLyMIF3wS2yJaRuUiOhY=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -rf $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", "rev": "130.0.6723.191", "url": "https://chromium.googlesource.com/chromium/src.git" }, @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-/tGxWvyqwb0TWli2JkFDiyrqAm6DF5JHD7NfC1XTa8I=", + "hash": "sha256-jumOmlCUiRRR0ubLuVRGl5E2lwbID5C0JYJ2+gJUrA8=", "owner": "electron", "repo": "electron", - "rev": "v33.4.3" + "rev": "v33.4.5" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -950,7 +950,7 @@ "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8", "modules": "130", "node": "20.18.3", - "version": "33.4.3" + "version": "33.4.5" }, "34": { "chrome": "132.0.6834.210", From 30b8a3e7804fc725b412c84b09db6d046398e223 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 12:46:22 +0100 Subject: [PATCH 116/123] electron_34-bin: 34.3.2 -> 34.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 5a731a890670..dac8811379d7 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,13 +23,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe", - "aarch64-linux": "774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2", - "armv7l-linux": "73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb", - "headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61", - "x86_64-darwin": "23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c", - "x86_64-linux": "7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e" + "aarch64-darwin": "dab1531dc858b2f8b888182bc62272b4d7d40dc53cee97454779f37e1803acb3", + "aarch64-linux": "26c5509e785b4e3117f9430e6b52ad1cb8c7dc83a3b7c7ad4b593c724fc334f2", + "armv7l-linux": "26f50b1ef9bfb572fea3af20cdebae01112aaff69cf0933602d2c33de1a5e71a", + "headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl", + "x86_64-darwin": "c515f2b65af0f2c0fd08c478e26801061a14d17decdb5dd40ed7a36fd03e0ff4", + "x86_64-linux": "7ddd7e64846d72f90f62c4af29ce7930859b7d2ffac256c156e5bfa36f9e9b39" }, - "version": "34.3.2" + "version": "34.3.3" } } From 59f009abe079eac8cddbcc6bac48aabc50692d2d Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 12:46:25 +0100 Subject: [PATCH 117/123] electron-chromedriver_34: 34.3.2 -> 34.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 42b6d7f4cceb..944a0cd05b8f 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,13 +23,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b", - "aarch64-linux": "1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35", - "armv7l-linux": "4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b", - "headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61", - "x86_64-darwin": "d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c", - "x86_64-linux": "3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea" + "aarch64-darwin": "aa80917205c7bf0c3fa01c4c9246415d1668836ba8244509e495d67fa197f383", + "aarch64-linux": "6c99a95b2c9fc98636678c44477f11c39e2603d93211f41e788442445a210020", + "armv7l-linux": "b1c0ebc724e8e833201b23348477f348086cfd102879d6c1cc8269f72e177d72", + "headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl", + "x86_64-darwin": "7ba6b42a5fba86391c3f496db885fd240b22e8fa80790747a11697dab80ef099", + "x86_64-linux": "999fb44c5877b34da0ee6e24eb0ce74e521ed47e84db107b6037488ec51d45f1" }, - "version": "34.3.2" + "version": "34.3.3" } } From e8d42eb913133c376b6035b67275c69a59010ee6 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 14 Mar 2025 12:46:45 +0100 Subject: [PATCH 118/123] electron-source.electron_34: 34.3.2 -> 34.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 74264d69f115..de8859c8fe3f 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1000,10 +1000,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-HQ2RHDTG0DaZ54j6Il9Ajez8dBIg1zwG71/yOQg7o0s=", + "hash": "sha256-mOrKKuUkfTDjLxNvjlvHS5NP4NjdgaIdS4xgWKJBET8=", "owner": "electron", "repo": "electron", - "rev": "v34.3.2" + "rev": "v34.3.3" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1915,6 +1915,6 @@ "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y", "modules": "132", "node": "20.18.3", - "version": "34.3.2" + "version": "34.3.3" } } From 528eeaaabf2afc064468ab97e8edcb925002959c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Mar 2025 22:00:26 +0100 Subject: [PATCH 119/123] vimPlugins.papercolor-theme-slim: init at 2025-03-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9392d9ac1103..f5e114112514 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11515,6 +11515,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + papercolor-theme-slim = buildVimPlugin { + pname = "papercolor-theme-slim"; + version = "2025-03-09"; + src = fetchFromGitHub { + owner = "pappasam"; + repo = "papercolor-theme-slim"; + rev = "ccfb47869077ef0a7880e6fe73f5dfae44298f68"; + sha256 = "1yvhrfj2i8b3mrglcqhsk02x4p5bqaqynd84kr9dl0xrzl0bjzcz"; + }; + meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/"; + meta.hydraPlatforms = [ ]; + }; + parpar-nvim = buildVimPlugin { pname = "parpar.nvim"; version = "2023-09-12"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5455210e7657..d3b32a942f4a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -883,6 +883,7 @@ https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/JoosepAlviste/palenightfall.nvim/,, https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, +https://github.com/pappasam/papercolor-theme-slim/,HEAD, https://github.com/dundalek/parpar.nvim/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, From 00c1e4a18675a620cc582dc81c744766e3badb6e Mon Sep 17 00:00:00 2001 From: Toma <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 14 Mar 2025 22:09:33 +0100 Subject: [PATCH 120/123] Revert "treewide: remove duplicated logic for NIXOS_OZONE_WL" This reverts commit 5f8d5640527037577955ea27f64cc3bfea2ef97f. --- pkgs/applications/audio/youtube-music/default.nix | 1 + pkgs/applications/editors/vscode/generic.nix | 1 + pkgs/applications/graphics/drawio/default.nix | 1 + pkgs/applications/misc/whalebird/default.nix | 3 ++- pkgs/applications/science/math/geogebra/geogebra6.nix | 3 ++- pkgs/by-name/af/affine-bin/package.nix | 1 + pkgs/by-name/af/affine/package.nix | 1 + pkgs/by-name/an/anytype/package.nix | 1 + pkgs/by-name/ap/appium-inspector/package.nix | 1 + pkgs/by-name/bi/bitwarden-desktop/package.nix | 1 + pkgs/by-name/bl/blockbench/package.nix | 1 + pkgs/by-name/br/bruno/package.nix | 1 + pkgs/by-name/bs/bs-manager/package.nix | 1 + pkgs/by-name/ca/caprine/package.nix | 1 + pkgs/by-name/ch/cherry-studio/package.nix | 1 + pkgs/by-name/dd/ddm/package.nix | 1 + pkgs/by-name/de/deltachat-desktop/package.nix | 1 + pkgs/by-name/el/element-desktop/package.nix | 1 + pkgs/by-name/en/ente-desktop/package.nix | 3 ++- pkgs/by-name/eq/equibop/package.nix | 3 ++- pkgs/by-name/fe/feishin/package.nix | 1 + pkgs/by-name/fo/follow/package.nix | 3 ++- pkgs/by-name/fr/freetube/package.nix | 3 ++- pkgs/by-name/gd/gdlauncher-carbon/package.nix | 1 + pkgs/by-name/gf/gfn-electron/package.nix | 3 ++- pkgs/by-name/gi/gitify/package.nix | 1 + pkgs/by-name/ht/httptoolkit/package.nix | 1 + pkgs/by-name/it/itch/package.nix | 1 + pkgs/by-name/ji/jitsi-meet-electron/package.nix | 1 + pkgs/by-name/ka/kando/package.nix | 1 + pkgs/by-name/ko/koodo-reader/package.nix | 1 + pkgs/by-name/ku/kuro/package.nix | 1 + pkgs/by-name/le/legcord/package.nix | 1 + pkgs/by-name/lx/lx-music-desktop/package.nix | 1 + pkgs/by-name/ma/marktext/package.nix | 3 ++- pkgs/by-name/ma/mattermost-desktop/package.nix | 3 ++- pkgs/by-name/mq/mqtt-explorer/package.nix | 1 + pkgs/by-name/ne/netron/package.nix | 1 + pkgs/by-name/ob/obsidian/package.nix | 1 + pkgs/by-name/pe/penpot-desktop/package.nix | 1 + pkgs/by-name/po/podman-desktop/package.nix | 1 + pkgs/by-name/pr/proton-pass/package.nix | 1 + pkgs/by-name/pr/protonmail-desktop/package.nix | 1 + pkgs/by-name/r2/r2modman/package.nix | 3 ++- pkgs/by-name/re/redisinsight/package.nix | 1 + pkgs/by-name/re/revolt-desktop/package.nix | 3 ++- pkgs/by-name/ri/ride/package.nix | 1 + pkgs/by-name/si/siyuan/package.nix | 1 + pkgs/by-name/su/super-productivity/package.nix | 1 + pkgs/by-name/te/teams-for-linux/package.nix | 3 ++- pkgs/by-name/te/tetrio-desktop/package.nix | 1 + pkgs/by-name/ti/tidal-hifi/package.nix | 1 + pkgs/by-name/uh/uhk-agent/package.nix | 1 + pkgs/by-name/ve/vesktop/package.nix | 3 ++- pkgs/by-name/vo/voicevox/package.nix | 1 + pkgs/by-name/we/webcord/package.nix | 1 + pkgs/by-name/wi/wire-desktop/package.nix | 4 ++++ pkgs/by-name/yt/ytmdesktop/package.nix | 1 + pkgs/by-name/za/zap-chip/package.nix | 1 + pkgs/by-name/ze/zepp-simulator/package.nix | 1 + pkgs/by-name/zu/zulip/package.nix | 1 + pkgs/games/heroic/default.nix | 3 ++- pkgs/tools/security/bitwarden-directory-connector/default.nix | 1 + 63 files changed, 80 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 721ecb384b20..ef035a500226 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -77,6 +77,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 --enable-wayland-ime=true}}" \ --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 6e11cae84384..8e2cc8d521ee 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -278,6 +278,7 @@ stdenv.mkDerivation ( } # 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 --enable-wayland-ime=true}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 768c1355c81b..3a81df70ff46 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -103,6 +103,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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index d93fb6e12e4b..aab1423a81dd 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -96,7 +96,8 @@ stdenv.mkDerivation rec { "$out/share/icons/hicolor/64x64/apps/whalebird.png" makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \ - --add-flags "$out/opt/Whalebird/resources/app.asar" + --add-flags "$out/opt/Whalebird/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index f39134f5d21b..3f9b349401b1 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -62,7 +62,8 @@ let mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ - --add-flags "$out/resources/app" + --add-flags "$out/resources/app" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index eba073e34720..b576208ee505 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -115,6 +115,7 @@ stdenvNoCC.mkDerivation ( makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ --inherit-argv0 \ --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 3f3106377817..31cf1a03df2a 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -189,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${lib.getExe electron}" $out/bin/${binName} \ --inherit-argv0 \ --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 69c73ce2ad76..a2d4afef8054 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -89,6 +89,7 @@ buildNpmPackage { makeWrapper '${lib.getExe electron}' $out/bin/anytype \ --set-default ELECTRON_IS_DEV 0 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/anytype/ \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index f04611010444..ac17e91e8eb6 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -53,6 +53,7 @@ buildNpmPackage { makeWrapper '${electron}/bin/electron' "$out/bin/appium-inspector" \ --add-flags "$out/share/appium-inspector/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set NODE_ENV production install -m 444 -D 'app/common/renderer/assets/images/icon.png' \ diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index fccc5ce3fec1..44f33663d5cd 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -184,6 +184,7 @@ 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 --enable-wayland-ime=true}}" \ --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 3e569d227818..d5236efdea77 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -71,6 +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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index cfecf8d11248..cec8d5f38c60 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -153,6 +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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix index a250cea77397..207934fe86c9 100644 --- a/pkgs/by-name/bs/bs-manager/package.nix +++ b/pkgs/by-name/bs/bs-manager/package.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/bs-manager \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --add-flags $out/opt/BSManager/resources \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index d3844f95e20e..17d78ba28d9b 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -49,6 +49,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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index f0566d36a659..212986c344eb 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${lib.getExe electron}" $out/bin/cherry-studio \ --inherit-argv0 \ --add-flags $out/lib/cherry-studio/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index 8452247c9743..ca3cc7af51ec 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -43,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png makeWrapper ${lib.getExe electron} $out/bin/ddm \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "$out/share/ddm" # Install externally-downloaded campaign packs & cube lists diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index f08e7d01f230..90e01174ddc2 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -110,6 +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 --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 212ee9836801..8efe960d6b4f 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation ( 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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix index 929a0481ffa9..94d99835dd02 100644 --- a/pkgs/by-name/en/ente-desktop/package.nix +++ b/pkgs/by-name/en/ente-desktop/package.nix @@ -109,7 +109,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ --set ELECTRON_IS_DEV 0 \ - --add-flags "$out/share/ente-desktop/resources/app.asar" + --add-flags "$out/share/ente-desktop/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index ce627e22b297..54e006c2c2ff 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -110,7 +110,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/equibop \ --add-flags $out/opt/Equibop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; desktopItems = makeDesktopItem { diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index e895bf9ae7d5..4b7f91f5b05f 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -115,6 +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 --enable-wayland-ime=true}}" \ --set ELECTRON_FORCE_IS_PACKAGED=1 \ --inherit-argv0 diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index fc66d86fe20c..fed49a03069b 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -91,7 +91,8 @@ stdenv.mkDerivation rec { makeWrapper "${electron}/bin/electron" "$out/bin/follow" \ --inherit-argv0 \ --add-flags --disable-gpu-compositing \ - --add-flags $out/share/follow + --add-flags $out/share/follow \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index d1caa7b19b3d..b4002ae64ce1 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -69,7 +69,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube makeWrapper ${lib.getExe electron} $out/bin/freetube \ - --add-flags "$out/share/freetube/resources/app.asar" + --add-flags "$out/share/freetube/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index 5b46766bcbcb..2bf6074c25fb 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { --set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${libPath} \ --suffix PATH : "${binPath}" \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/share/gdlauncher-carbon/resources/app.asar ''; diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index 40936a407102..37eb0397f94f 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -59,7 +59,8 @@ buildNpmPackage { postFixup = '' makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \ - --add-flags "--no-sandbox --disable-gpu-sandbox" + --add-flags "--no-sandbox --disable-gpu-sandbox" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \ --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \ diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index da1f697a2ba9..815a1d598669 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -80,6 +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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' } diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index b2b95badedec..6f954c2281fc 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -62,6 +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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index b9b03f9f8a91..5ce46f34f1d8 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -87,6 +87,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 --enable-wayland-ime=true}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}/bin/:${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 cad99faf87a7..55edb988668d 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -102,6 +102,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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 719c290a4c0d..5becb3694d3c 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -106,6 +106,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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index 347540d03c6a..7f78429568ae 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -81,6 +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 --enable-wayland-ime=true}}" \ --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 2df692ecce09..5fb26933e51e 100644 --- a/pkgs/by-name/ku/kuro/package.nix +++ b/pkgs/by-name/ku/kuro/package.nix @@ -61,6 +61,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 --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index f6b26dff3d62..dc5f54495fdd 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { makeShellWrapper "${lib.getExe electron_34}" "$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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index b26cb8524581..138564e76548 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation { makeWrapper ${electron_32}/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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ ''; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 43d982f6d2ff..1a095a3520eb 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -149,7 +149,8 @@ stdenv.mkDerivation (finalAttrs: { cp -r build/*-unpacked/{locales,resources{,.pak}} $out/opt/marktext makeWrapper ${lib.getExe electron} $out/bin/marktext \ - --add-flags $out/opt/marktext/resources/app.asar + --add-flags $out/opt/marktext/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" runHook postInstall ''; diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index fd3f392cb0c4..ad141c593e89 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -74,7 +74,8 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ - --add-flags $out/share/${pname}/app.asar + --add-flags $out/share/${pname}/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index f0356ec33dfd..0d8e05f9b4b0 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -122,6 +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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index b64226701c45..ad432a9a1682 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -69,6 +69,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/netron" \ --add-flags $out/opt/netron/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index f1fd34920e93..beae1bf30a37 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -79,6 +79,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 --enable-wayland-ime=true}}" \ --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/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index a866cbff0b85..302e63e0a1da 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -76,6 +76,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/penpot-desktop" \ --add-flags $out/opt/Penpot/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index fd3c51de25a1..63c80a576e32 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -83,6 +83,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 --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 00e565a10458..ccbfc7aa56cd 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -46,6 +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 --enable-wayland-ime=true}}" \ --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 a10de8ca6470..d05c31a45e54 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/proton-mail/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --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 e7542b45d0f0..76c14bd473a1 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -86,7 +86,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \ --inherit-argv0 \ - --add-flags "$out/share/r2modman" + --add-flags "$out/share/r2modman" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 392be3107c8a..2c2f4bd345b6 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -138,6 +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 --enable-wayland-ime=true}}" \ --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 c53ef333997d..0f7d07d0893b 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -73,7 +73,8 @@ postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \ - --add-flags $out/share/revolt-desktop/resources/app.asar + --add-flags $out/share/revolt-desktop/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; } else diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index b9dcadfe178b..8035a87ce183 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -108,6 +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 --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 989f9b0d53b6..101f6dbcd688 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out/share/siyuan/resources \ --add-flags $out/share/siyuan/resources/app \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 1e6aa5a0e0ef..181805919b57 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -91,6 +91,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \ --add-flags "$out/share/super-productivity/app/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 '' diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index c538e81d6ad7..ac33529a0d4a 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -79,7 +79,8 @@ buildNpmPackage rec { which ] } \ - --add-flags "$out/share/teams-for-linux/app.asar" + --add-flags "$out/share/teams-for-linux/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index ad140ca5c062..ad945a5bddcf 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/share/TETR.IO/app.asar ''; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 453408eb1a11..7165e3249c93 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -106,6 +106,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 --enable-wayland-ime=true}}" \ "''${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 7b2d5bc08b64..6546024e41e0 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -61,6 +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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index d5f8e53828f0..9ceee9d8fff6 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -140,7 +140,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index b6a978cbe446..509b246de35b 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/voicevox \ --add-flags $out/share/voicevox/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 83cb955725e5..f7cf9d28ac9f 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -57,6 +57,7 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 7c40dab173d6..0f89a5bb4881 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -140,6 +140,10 @@ let libdbusmenu ]; + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}") + ''; + postFixup = '' makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index 22667407b0e7..e9642c764146 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -82,6 +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 --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook preFixup diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index 8abb2320000c..882f72805bb1 100644 --- a/pkgs/by-name/za/zap-chip/package.nix +++ b/pkgs/by-name/za/zap-chip/package.nix @@ -76,6 +76,7 @@ buildNpmPackage rec { rm $out/bin/zap makeWrapper '${lib.getExe electron}' "$out/bin/zap" \ --add-flags $out/opt/zap-chip/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 ''; diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index 21c6498e01e0..f8d4503660f9 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -133,6 +133,7 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe electron} $out/bin/simulator \ --add-flags "--no-sandbox" \ --add-flags $out/opt/simulator/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default NODE_ENV production \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 89ac29865e47..27f9b0a4cc2a 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -50,6 +50,7 @@ buildNpmPackage rec { makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \ --add-flags "$out/share/lib/zulip/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 10deb2322a37..7f2ce5c9b8e4 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -89,7 +89,8 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ --add-flags --disable-gpu-compositing \ - --add-flags $out/opt/heroic/resources/app.asar + --add-flags $out/opt/heroic/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop" install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg" diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 3e96d483e0b2..1fc1579f3327 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -85,6 +85,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 --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 From d23ea9bacd051420378a3de780ac89b6afac7c3e Mon Sep 17 00:00:00 2001 From: Toma <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 14 Mar 2025 22:09:33 +0100 Subject: [PATCH 121/123] Revert "electron{,-bin}: add direct support for the NIXOS_OZONE_WL env var" This reverts commit 5c4803c56ea118ba52353635e0826b88d03b501e. --- pkgs/development/tools/electron/binary/generic.nix | 3 +-- pkgs/development/tools/electron/wrapper.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 60deec1bfd32..fc3c38e5b73a 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -155,8 +155,7 @@ let preFixup = '' makeWrapper "$out/libexec/electron/electron" $out/bin/electron \ - "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + "''${gappsWrapperArgs[@]}" ''; postFixup = '' diff --git a/pkgs/development/tools/electron/wrapper.nix b/pkgs/development/tools/electron/wrapper.nix index 93fb9301eea4..412596a0629b 100644 --- a/pkgs/development/tools/electron/wrapper.nix +++ b/pkgs/development/tools/electron/wrapper.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation { buildCommand = '' gappsWrapperArgsHook mkdir -p $out/bin - makeShellWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ + makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set CHROME_DEVEL_SANDBOX $out/libexec/electron/chrome-sandbox ln -s ${electron-unwrapped}/libexec $out/libexec From 2bd8862b577dd9e78db4bc63bd7f1712192f2189 Mon Sep 17 00:00:00 2001 From: Willi Carlsen Date: Fri, 14 Mar 2025 23:05:36 +0100 Subject: [PATCH 122/123] fluxcd: 2.4.0 -> 2.5.0 (#384742) Update fluxcd from 2.4.0 -> 2.5.0 Signed-off-by: Willi Carlsen --- pkgs/by-name/fl/fluxcd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 89786cf45ea8..6b88e3dd929c 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -8,10 +8,10 @@ }: let - version = "2.4.0"; - srcHash = "sha256-b4mu/iijfALBm+7OIdKgZs55fR6xWfPgL6OMOgIOi3w="; - vendorHash = "sha256-rVyirt6+D1qedbTvPZjLog16sMAq+zyFUmbjnJIieRg="; - manifestsHash = "sha256-85Ykc6B+DP9PVqwGbvqsQCUHpx/IzIP9TgOt3id7P5g="; + version = "2.5.0"; + srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI="; + vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk="; + manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; From 73afc1903c02734fcf2ec7372a4be9ea0cdde57d Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 14 Mar 2025 23:35:01 +0100 Subject: [PATCH 123/123] linuxPackages.nvidiaPackages.vulkan_beta: 570.123.01 -> 570.123.06 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8dd7958784e0..baecce29f371 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -102,11 +102,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "570.123.01"; + version = "570.123.06"; persistencedVersion = "550.142"; settingsVersion = "550.142"; - sha256_64bit = "sha256-DDNqQJ0pgOa048frnfpt1WYZVnokUdPwc1hv0LIxHNQ="; - openSha256 = "sha256-MHmAv2nm6yGEgWgvvmB+Eq8506PX0HhHNVA9MUpsfZY="; + sha256_64bit = "sha256-3FwT5B51P+ktNM2UZw6nQDuS7EMpbfV0qkuRtohhNnk="; + openSha256 = "sha256-a1l2+dRJRU46sn9w1vFT3pLSLDOxAlYB0B1aXM5J6rE="; settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY="; persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";