From cc4bb3d6728d249f4450e3587644c8203465685a Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 4 Sep 2023 15:10:41 -0400 Subject: [PATCH 01/34] prismlauncher: add withWaylandGLFW override --- pkgs/games/prismlauncher/wrapper.nix | 41 +++++++++++++++++++++------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 4b0aa418fb6a..761f86fa1cb5 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -1,9 +1,12 @@ { lib , stdenv , symlinkJoin -, prismlauncher-unwrapped +, makeWrapper , wrapQtAppsHook , addOpenGLRunpath + +, prismlauncher-unwrapped + , qtbase # needed for wrapQtAppsHook , qtsvg , qtwayland @@ -11,6 +14,7 @@ , libpulseaudio , libGL , glfw +, glfw-wayland-minecraft , openal , jdk8 , jdk17 @@ -24,10 +28,17 @@ , gamemodeSupport ? stdenv.isLinux , textToSpeechSupport ? stdenv.isLinux , controllerSupport ? stdenv.isLinux +, withWaylandGLFW ? false +, shellWrapper ? withWaylandGLFW + , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] , additionalPrograms ? [ ] }: + +assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux"; +assert lib.assertMsg (withWaylandGLFW -> shellWrapper) "withWaylandGLFW requires shellWrapper"; + let prismlauncherFinal = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; @@ -40,7 +51,8 @@ symlinkJoin { nativeBuildInputs = [ wrapQtAppsHook - ]; + ] + ++ lib.optional shellWrapper makeWrapper; buildInputs = [ qtbase @@ -48,20 +60,29 @@ symlinkJoin { ] ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; + waylandPreExec = '' + if [ -n "$WAYLAND_DISPLAY" ]; then + export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH" + fi + ''; + postBuild = '' + ${lib.optionalString withWaylandGLFW '' + qtWrapperArgs+=(--run "$waylandPreExec") + ''} + wrapQtAppsHook ''; qtWrapperArgs = let - runtimeLibs = (with xorg; [ - libX11 - libXext - libXcursor - libXrandr - libXxf86vm - ]) - ++ [ + runtimeLibs = [ + xorg.libX11 + xorg.libXext + xorg.libXcursor + xorg.libXrandr + xorg.libXxf86vm + # lwjgl libpulseaudio libGL From 915431fb2d5680e5d66083a83ffb8da353626594 Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Mon, 11 Sep 2023 14:57:05 -0700 Subject: [PATCH 02/34] prismlauncher: add comments explaining new args --- pkgs/games/prismlauncher/wrapper.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 761f86fa1cb5..26edf7972a94 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -28,7 +28,18 @@ , gamemodeSupport ? stdenv.isLinux , textToSpeechSupport ? stdenv.isLinux , controllerSupport ? stdenv.isLinux + +# The flag `withWaylandGLFW` enables runtime-checking of `WAYLAND_DISPLAY`; +# if the option is enabled, a patched version of GLFW will be added to +# `LD_LIBRARY_PATH` so that the launcher can use the correct one +# depending on the desktop environment used. , withWaylandGLFW ? false +# By default, this package uses a binary wrapper for `wrapQtAppsHook`. +# Enabling `shellWrapper` will add `makeWrapper` to `nativeBuildInputs`, +# causing `wrapQtAppsHook` to output a shell wrapper instead. +# This is needed for checking environment variables at runtime +# and modifying others if necessary (see above option for example). +# Warning: This can make the program start slower, by about four milliseconds. , shellWrapper ? withWaylandGLFW , jdks ? [ jdk17 jdk8 ] From 823474f53ec0e56c3a3eafef649294dc04d2ecc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Oct 2023 02:33:42 +0000 Subject: [PATCH 03/34] psqlodbc: 13.02.0000 -> 16.00.0000 --- pkgs/development/libraries/psqlodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index f503f3f844d4..d8c2b3dec1a4 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "psqlodbc"; - version = "13.02.0000"; + version = "16.00.0000"; src = fetchurl { url = "https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-${version}.tar.gz"; - hash = "sha256-s5t+XEH9ZHXFUREvpyS/V8SkRhdexBiKkOKETMFhJYU="; + hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; }; buildInputs = [ libiodbc postgresql openssl ]; From 8be05482df410454a2e59d456ddc643f4a3bd261 Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Wed, 4 Oct 2023 22:31:48 -0700 Subject: [PATCH 04/34] prismlauncher: move shellWrapper to let block --- pkgs/games/prismlauncher/wrapper.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 26edf7972a94..b2fd4f656f87 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -34,13 +34,6 @@ # `LD_LIBRARY_PATH` so that the launcher can use the correct one # depending on the desktop environment used. , withWaylandGLFW ? false -# By default, this package uses a binary wrapper for `wrapQtAppsHook`. -# Enabling `shellWrapper` will add `makeWrapper` to `nativeBuildInputs`, -# causing `wrapQtAppsHook` to output a shell wrapper instead. -# This is needed for checking environment variables at runtime -# and modifying others if necessary (see above option for example). -# Warning: This can make the program start slower, by about four milliseconds. -, shellWrapper ? withWaylandGLFW , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] @@ -48,13 +41,21 @@ }: assert lib.assertMsg (withWaylandGLFW -> stdenv.isLinux) "withWaylandGLFW is only available on Linux"; -assert lib.assertMsg (withWaylandGLFW -> shellWrapper) "withWaylandGLFW requires shellWrapper"; let + # By default, this package uses a binary wrapper for `wrapQtAppsHook`. + # Enabling `shellWrapper` will add `makeWrapper` to `nativeBuildInputs`, + # causing `wrapQtAppsHook` to output a shell wrapper instead. + # This is needed for checking environment variables at runtime + # and modifying others if necessary (see above option for example). + # Warning: This can make the program start slower, by about four milliseconds. + shellWrapper = withWaylandGLFW; + prismlauncherFinal = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; }; in + symlinkJoin { name = "prismlauncher-${prismlauncherFinal.version}"; From 9175b939c1d382685ed6f04dda0a66c6d1e6810f Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Wed, 4 Oct 2023 22:34:20 -0700 Subject: [PATCH 05/34] prismlauncher: give interm. package accurate name --- pkgs/games/prismlauncher/wrapper.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index b2fd4f656f87..12ba774b06c7 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -51,15 +51,15 @@ let # Warning: This can make the program start slower, by about four milliseconds. shellWrapper = withWaylandGLFW; - prismlauncherFinal = prismlauncher-unwrapped.override { + prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; }; in symlinkJoin { - name = "prismlauncher-${prismlauncherFinal.version}"; + name = "prismlauncher-${prismlauncher'.version}"; - paths = [ prismlauncherFinal ]; + paths = [ prismlauncher' ]; nativeBuildInputs = [ wrapQtAppsHook @@ -124,5 +124,5 @@ symlinkJoin { "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; - inherit (prismlauncherFinal) meta; + inherit (prismlauncher') meta; } From a514d8c148e78d0d222689bdae55d242e0ff454e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 3 Dec 2023 14:14:32 -0500 Subject: [PATCH 06/34] systemd-stage-1: allow non-existent /lib/firmware Since 1557027, makeModulesClosure doesn't create a lib/firmware directory if there is no firmware in the initramfs. If this happens, systemd-stage-1 fails to build. /lib only contains /lib/modules and /lib/firmware, both of while are from modulesClosure. Therefore, we can just add the entirety of ${modulesClosure}/lib to the initramfs to allow for the possibility that lib/firmware doesn't exist. This also brings systemd-stage-1 in line with the traditional stage-1. --- nixos/modules/system/boot/systemd/initrd.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 0e7d59b32075..7e67eb424448 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -398,8 +398,7 @@ in { ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)} ''; - "/lib/modules".source = "${modulesClosure}/lib/modules"; - "/lib/firmware".source = "${modulesClosure}/lib/firmware"; + "/lib".source = "${modulesClosure}/lib"; "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules; From a8464accca62c00b3dc6ea69e6a206577c98b78f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 03:57:00 +0000 Subject: [PATCH 07/34] darktable: 4.4.2 -> 4.6.0 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index bdf12444b216..538bb8b04e05 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -57,12 +57,12 @@ }: stdenv.mkDerivation rec { - version = "4.4.2"; + version = "4.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "c11d28434fdf2e9ce572b9b1f9bc4e64dcebf6148e25080b4c32eb51916cfa98"; + sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI="; }; nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ] From 013b3f32abd78bac9e3eaefc0233b75ffe396bca Mon Sep 17 00:00:00 2001 From: Schweber <64630479+Schweber@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:47:11 +0000 Subject: [PATCH 08/34] hdrop: 0.2.4 -> 0.3.0 --- pkgs/by-name/hd/hdrop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 940cdf8f66b3..a16d7ac6af9d 100755 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-VsM1wPl8edAnZUvYw3IeOHw/XQ2pvbLt0v3G0B8+iSA="; + hash = "sha256-IVLc1USBkkIBEll1jRIAAszyGCmpw5Sy74Zyalv3W+w="; }; nativeBuildInputs = [ From 0a1d1907a5b0767fae667177cd2850cb7039029f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Jan 2024 22:32:22 +0100 Subject: [PATCH 09/34] nixos/oomd: use mkRenamedOptionModule like mentioned in the changelog --- nixos/modules/system/boot/systemd/oomd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 2774edc42917..2697b3207ee2 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -4,7 +4,7 @@ in { imports = [ - (lib.mkRemovedOptionModule [ "systemd" "oomd" "enableUserServices" ] "Use systemd.oomd.enableUserSlices instead.") + (lib.mkRenamedOptionModule [ "systemd" "oomd" "enableUserServices" ] [ "systemd" "oomd" "enableUserSlices" ]) ]; options.systemd.oomd = { From d90fb0a946bf1ef93e6277e67785e2d0709cf8fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 10:09:53 +0100 Subject: [PATCH 10/34] python311Packages.bleak-retry-connector: 3.3.0 -> 3.4.0 Diff: https://github.com/Bluetooth-Devices/bleak-retry-connector/compare/refs/tags/v3.3.0...v3.4.0 Changelog: https://github.com/bluetooth-devices/bleak-retry-connector/blob/v3.4.0/CHANGELOG.md --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 041fd9d84cff..112d92a24bb9 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w="; + hash = "sha256-hhoYPpNJ8myW2KMe7o7gvbjnmpY4OYudaDA/vV8BkN8="; }; postPatch = '' From 1ef18820d485d6fb5c9c5a58aa9677b5093c34a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 13:51:23 +0100 Subject: [PATCH 11/34] python311Packages.yalexs-ble: 2.3.2 -> 2.4.0 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.3.2...v2.4.0 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.4.0/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 29ac9d1c68d7..18f4fbfead6b 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uHkJEtaohuTRs1RXDPbe4dohbjBnYi9MFguP9CTwM5w="; + hash = "sha256-kdEeLd+83Pdno1ZzirZUrRk/7q0WFc/XfqvuKvVQ8/s="; }; nativeBuildInputs = [ From 1871e4ccb6e0e462023b344a7b383e65767263a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 13:52:07 +0100 Subject: [PATCH 12/34] python311Packages.pyswitchbot: 0.42.0 -> 0.43.0 Diff: https://github.com/Danielhiversen/pySwitchbot/compare/refs/tags/0.42.0...0.43.0 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.43.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index b2cda67a8aba..52986393a385 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.42.0"; + version = "0.43.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-oJUdQex+kjL4Yuuz02ASjFDjyfWA/Hsopy+ujGbDkLs="; + hash = "sha256-+YolfvzyJVZ+EkEmPrmAXUbttxYzCFl5DT3nUaUCnuc="; }; propagatedBuildInputs = [ From 2c88b88c1b3b8c5410779da26917876c3ea2a2e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 13:54:17 +0100 Subject: [PATCH 13/34] python311Packages.pyswitchbot: refactor --- pkgs/development/python-modules/pyswitchbot/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 52986393a385..527d4ab0167f 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,5 +1,4 @@ { lib -, async-timeout , bleak , bleak-retry-connector , boto3 @@ -10,12 +9,13 @@ , pythonOlder , pytestCheckHook , requests +, setuptools }: buildPythonPackage rec { pname = "pyswitchbot"; version = "0.43.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,8 +26,11 @@ buildPythonPackage rec { hash = "sha256-+YolfvzyJVZ+EkEmPrmAXUbttxYzCFl5DT3nUaUCnuc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - async-timeout bleak bleak-retry-connector boto3 From d258efb05502aeb5fa316adace5591ad1bc5f21d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 14:01:17 +0100 Subject: [PATCH 14/34] python311Packages.boschshcpy: 0.2.84 -> 0.2.88 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.84...0.2.88 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index c6eaaab35a78..634395deff54 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.84"; + version = "0.2.88"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-aSFnDLzJCZjHX6m/iZKC5F5kY7JXRZp0//jY8kkjC3I="; + hash = "sha256-tyx7VJGsU9YYNJQy1mly0AgwKULZ1BWeRzz1BDgXrUU="; }; propagatedBuildInputs = [ From 2c764ccdaf76df54c42432a02d706a72c96a1c84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Jan 2024 14:05:16 +0100 Subject: [PATCH 15/34] python311Packages.boschshcpy: refactor --- .../python-modules/boschshcpy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 634395deff54..38a1338ab65b 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -5,23 +5,28 @@ , getmac , pythonOlder , requests +, setuptools , zeroconf }: buildPythonPackage rec { pname = "boschshcpy"; version = "0.2.88"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "tschamm"; - repo = pname; - rev = version; + repo = "boschshcpy"; + rev = "refs/tags/${version}"; hash = "sha256-tyx7VJGsU9YYNJQy1mly0AgwKULZ1BWeRzz1BDgXrUU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography getmac From 684fa47648890ae0ca1803959aaa648bb6f76d90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 21:14:40 +0000 Subject: [PATCH 16/34] tintin: 2.02.31 -> 2.02.40 --- pkgs/games/tintin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 7a3996abdcf9..d2c1c0b4168c 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.31"; + version = "2.02.40"; src = fetchFromGitHub { owner = "scandum"; repo = "tintin"; rev = version; - hash = "sha256-emCxA5+YB4S7QXxRqkDKN1xeWttR857VfGzFQ1cGbYg="; + hash = "sha256-nJTxAAM5HOStYFjEopLA47ruM9uoVway+aH97AdXo/w="; }; buildInputs = [ zlib pcre gnutls ] From 4f56bd894c190f51c4b06bdfa51d5127e4fe88de Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 2 Jan 2024 22:20:08 +0100 Subject: [PATCH 17/34] nickel: add meta.mainProgram --- pkgs/by-name/ni/nickel/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 3d82fc275c85..78dd24eb028b 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -69,5 +69,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ]; + mainProgram = "nickel"; }; } From 19ea7859afd41c7f2eee0d18c12b59bc0f1cc158 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 2 Jan 2024 22:20:19 +0100 Subject: [PATCH 18/34] swift-format: add meta.mainProgram --- pkgs/development/compilers/swift/swift-format/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index 188208ebf492..d68801aac6e2 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + mainProgram = "swift-format"; }; } From 2a751800fd4824158ccd61ab718ff5197bbde17b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 2 Jan 2024 22:20:30 +0100 Subject: [PATCH 19/34] zig: add meta.mainProgram --- pkgs/development/compilers/zig/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index a0dbea04869e..220f3240f285 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + mainProgram = "zig"; platforms = lib.platforms.unix; }; } // removeAttrs args [ "hash" ]) From db6d3755199ad43a5a9395744c741bf84b05e8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jan 2024 22:49:35 +0100 Subject: [PATCH 20/34] nix-direnv: 3.0.3 -> 3.0.4 --- pkgs/by-name/ni/nix-direnv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index f718b1e9d692..74fc9d9c6336 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -4,13 +4,13 @@ # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - hash = "sha256-dwSICqFshBI9/4u40fkEqOuhTndnAx/w88zsnIzEcBk="; + hash = "sha256-3Fkat0HWU/hdQKwJYx5KWVzX8sVbGtFTon6G6/F9zFk="; }; # skip min version checks which are redundant when built with nix From ddc8bd3f51c73d03c1795b9d11621f6246af48e7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jan 2024 17:10:56 -0500 Subject: [PATCH 21/34] qt6.qtbase: add patch for CVE-2023-51714 --- pkgs/development/libraries/qt-6/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 6c71f4b42a55..2610c8463b2e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -66,6 +66,16 @@ let revert = true; hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; }) + # CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation + # https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation + (fetchpatch2 { + url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff"; + hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I="; + }) + (fetchpatch2 { + url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff"; + hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60="; + }) ]; }; env = callPackage ./qt-env.nix { }; From 2671ed836785a264710891243b28ecef3d9002b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 23:36:17 +0000 Subject: [PATCH 22/34] python310Packages.crc: 6.0.0 -> 6.1.0 --- pkgs/development/python-modules/crc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 1d6667b9e8b0..6caabb97b6e5 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "6.0.0"; + version = "6.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bQa+hkWRXRlyvX3/RL3DAjh9V/kTNg8C7/6viLLKtpk="; + hash = "sha256-NfJGiVxvFPlecDB72/Dfe0yafBH9dghGQh/TAnbPzOA="; }; nativeBuildInputs = [ From 9270b0b4e0afe5a996bf815b2e81353ac215d751 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 3 Jan 2024 02:45:00 +0100 Subject: [PATCH 23/34] darktable: migrate to llvm 16 --- pkgs/applications/graphics/darktable/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 538bb8b04e05..8983b14cb446 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -10,7 +10,6 @@ , ninja , curl , perl -, llvmPackages_13 , desktop-file-utils , exiv2 , glib @@ -65,9 +64,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI="; }; - nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ] - # LLVM Clang C compiler version 11.1.0 is too old and is unsupported. Version 12+ is required. - ++ lib.optionals stdenv.isDarwin [ llvmPackages_13.clang ]; + nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo From 27468aae960881071e431e734fbba10fb800a574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Jan 2024 02:45:38 +0100 Subject: [PATCH 24/34] nixos/oomd: add missing section to use slice --- nixos/modules/system/boot/systemd/oomd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 2697b3207ee2..000b18c01609 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -61,6 +61,7 @@ in { }; systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices { text = '' + [Slice] ManagedOOMMemoryPressure=kill ManagedOOMMemoryPressureLimit=80% ''; From 69567f5ed8d93a8f648b817dac800578cc7fd4ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 02:00:19 +0000 Subject: [PATCH 25/34] python310Packages.dnslib: 0.9.23 -> 0.9.24 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 26be9f9301ea..64bbe8c0a1ce 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.23"; + version = "0.9.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQGW0+OM4gUbYe670vHQj8yTT6M2DyIDGGTRbv6Lync="; + hash = "sha256-7xZ4aKMNTOfJC5ISedfs+5hr6OvFMPPmBQouy2hwfHY="; }; checkPhase = '' From c798e582e06fcb6bd2e1069b6c81e9df8b9b5a43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 02:39:47 +0000 Subject: [PATCH 26/34] python310Packages.dvc-data: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index ea4d12b9921d..78f3ffd51a9c 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-vLSb+RIaebF+ili+6bvU8wplcpycPVRadUkhkLHdqi8="; + hash = "sha256-It7l74R1cD9r6SmQfxCZ1VvuO0BLqjP2DEGHCKy99n8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d351f1747d81f1880949ad613ba9872538ba93d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 05:42:34 +0000 Subject: [PATCH 27/34] python310Packages.hcloud: 1.33.0 -> 1.33.2 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index bc8de7d67972..86f3537a732e 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.33.0"; + version = "1.33.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xkANXrFG6Tm/fz9Hnutga1q4uw43xaAT1rlmUbTag/g="; + hash = "sha256-GCiw+HbN/0na2fiAS16On72nj09VR0Naw6wwCIQ4zl8="; }; propagatedBuildInputs = [ From 75fea3727a8209a06372fbec002df449abbdc342 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 05:53:55 +0000 Subject: [PATCH 28/34] python310Packages.holidays: 0.39 -> 0.40 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 309a08ad90e9..8e3918fe02a4 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.39"; + version = "0.40"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-PsrdR4voEAiEhgoeR03Xp/tacqtcEt1FhO4kfMYkSos="; + hash = "sha256-rFitLHUgXSWNd59VzG01ggaTHfVzI50OAi7Gxr6pMug="; }; nativeBuildInputs = [ From fb09dec748950565760a84e0effdd5196ba15177 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 06:15:57 +0000 Subject: [PATCH 29/34] libsForQt5.qtutilities: 6.13.3 -> 6.13.4 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index aa0611aaef20..cbbd79eb504f 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.3"; + version = "6.13.4"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-/3PEbUMphblB3HgLkDb4l7GykuXL/ZOsKBrs8h72uwE="; + hash = "sha256-AlDPu2mD2OrjBq3tUxQBAoqD32L9MiSjcUNGWzpj/xc="; }; nativeBuildInputs = [ From a2c048af7bfa24dce7b9e3a94abc190d0d59cf75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 06:53:42 +0000 Subject: [PATCH 30/34] syncthingtray: 1.4.11 -> 1.4.12 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index f3c69be653f4..204cdd9eaee4 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -34,14 +34,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.11"; + version = "1.4.12"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wzIIiVo6EmfQAyaIVsVsT4lfm0ThhGBgETV0036Pgvo="; + sha256 = "sha256-KfJ/MEgQdvzAM+rnKGMsjnRrbFeFu6F8Or+rgFNLgFI="; }; buildInputs = [ From 2c60b86fbdcffeecadc1f681863a6f6d11d1d663 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 07:04:21 +0000 Subject: [PATCH 31/34] flarectl: 0.84.0 -> 0.85.0 --- pkgs/by-name/fl/flarectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index eaf6e0b6d78b..098f9e036fc8 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.84.0"; + version = "0.85.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-RHt5Hu3N7gJIg7daylBSr9p7Hb9eQQUK2CfC6q/pblM="; + hash = "sha256-mXbWiHU28MlcYbS+RLHToJZpVMWsQ7qY6dAyY+ulwjw="; }; - vendorHash = "sha256-XziR/ZB0kva/sl2Tj+m0pdK5HxLW6osBXD00+m/y0cQ="; + vendorHash = "sha256-v6xhhufqxfFvY3BpcM6Qvpljf/vE8ZwPG47zhx+ilb0="; subPackages = [ "cmd/flarectl" ]; From 1cc14471712acb2a1866a12991ab944c28ddf984 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 07:38:19 +0000 Subject: [PATCH 32/34] cnquery: 9.12.1 -> 9.12.3 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 925195bb1353..58ea4633ef8d 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cnquery"; - version = "9.12.1"; + version = "9.12.3"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "v${version}"; - hash = "sha256-ezk9HgNf4FBW/PEaNUhsb3/l1ChTC42F3slXXa8ZJp4="; + hash = "sha256-DMJuQkxU6VNaPgcdvKY5p/124t02QvAo8lDT9B50Ze0="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-iycKyidVpdWeccK4RxENUxEFUmQKkIyyW1c3JFZ3gx4="; + vendorHash = "sha256-AHVmvmTn2MlL+aVBUQs4PA3k8w9/QQRD57DvSpSq09I="; meta = with lib; { description = "cloud-native, graph-based asset inventory"; From dac09b5c9aa3396bb1fcb503ae930ab73d1f4a67 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 25 Dec 2023 11:09:22 +0100 Subject: [PATCH 33/34] qmake2cmake: 1.0.5 -> 1.0.6 --- pkgs/tools/misc/qmake2cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix index ea70325cee8e..b3c3468973b8 100644 --- a/pkgs/tools/misc/qmake2cmake/default.nix +++ b/pkgs/tools/misc/qmake2cmake/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qmake2cmake"; - version = "1.0.5"; + version = "1.0.6"; src = fetchgit { url = "https://codereview.qt-project.org/qt/qmake2cmake"; rev = "v${version}"; - hash = "sha256-6a1CIzHj9kmNgWN6QPNNUbiugkyfSrrIb7Fbz0ocr6o="; + hash = "sha256-M5XVQ8MXo2Yxg5eZCho2YAGFtB0h++mEAg8NcQVuP/w="; }; patches = [ From 1198a09c44e043407d114feaf609a22d73387f7a Mon Sep 17 00:00:00 2001 From: sohalt Date: Wed, 3 Jan 2024 10:19:38 +0100 Subject: [PATCH 34/34] babashka: fix shell completions --- pkgs/development/interpreters/babashka/wrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/babashka/wrapped.nix b/pkgs/development/interpreters/babashka/wrapped.nix index 29468265eb9c..04be9bfd477a 100644 --- a/pkgs/development/interpreters/babashka/wrapped.nix +++ b/pkgs/development/interpreters/babashka/wrapped.nix @@ -39,8 +39,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { --set-default JAVA_HOME ${jdkBabashka} installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash - installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish - installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish '' + lib.optionalString withRlwrap '' substituteInPlace $out/bin/bb \