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

Conflicts: - pkgs/development/python-modules/types-setuptools/default.nix
2026-10-03 13:30:36 +00:00 · 2024-01-10 16:09:42 +01:00
parent 3c4b68b54d fb8c64e6a1
commit 10b01dcc89
30 changed files with 448 additions and 174 deletions
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -147,7 +147,7 @@ in {
      ln -sf $out/nim/bin/nim $out/bin/nim
      ln -sf $out/nim/lib $out/lib
      ./install.sh $out
-      cp -a tools $out/nim/
+      cp -a tools dist $out/nim/
      runHook postInstall
    '';