Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/development/python-modules/diffusers/default.nix
2025-01-31 14:01:37 +01:00
parent 4a66c00fcb 79187e681c
commit 2f165766d1
58 changed files with 909 additions and 6124 deletions
--- a/pkgs/build-support/setup-hooks/add-bin-to-path.sh
+++ b/pkgs/build-support/setup-hooks/add-bin-to-path.sh
@@ -5,10 +5,8 @@ export PATH

 addBinToPath () {
    # shellcheck disable=SC2154
-    if [ -d "$out/bin" ]; then
-        PATH="$out/bin:$PATH"
-        export PATH
-    fi
+    PATH="$out/bin:$PATH"
+    export PATH
 }

 # shellcheck disable=SC2154