staging-next-24.11 iteration 2 - 2024-12-31 (#369690)

NixOS · Jan 8, 2025 · aedc34a · aedc34a
2 parents 6e85840 + f0f757c
commit aedc34a
Show file tree

Hide file tree

Showing 142 changed files with 1,096 additions and 9,297 deletions.
diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix
@@ -225,7 +225,7 @@ in
     };
   };
 
-  # distributedBuilds does *not* inhibit /etc/machines generation; caller may
+  # distributedBuilds does *not* inhibit /etc/nix/machines generation; caller may
   # override that nix option.
   config = mkIf cfg.enable {
     assertions =

diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
@@ -60,6 +60,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
         users.users.jenkins.extraGroups = [ "users" ];
 
         systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min";
+
+        # Increase disk space to prevent this issue:
+        #
+        # WARNING h.n.DiskSpaceMonitorDescriptor#markNodeOfflineOrOnline: Making Built-In Node offline temporarily due to the lack of disk space
+        virtualisation.diskSize = 2 * 1024;
       };
 
     slave =

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
@@ -23,11 +23,11 @@ assert withConplay -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${lib.optionalString libOnly "lib"}mpg123";
-  version = "1.32.8";
+  version = "1.32.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
-    hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c=";
+    hash = "sha256-A7YeQATpYLrPKs2toD7ZTTduaqsnpgFEe9SQjYQHspE=";
   };
 
   outputs = [

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -13,6 +13,7 @@
   Xaw3d,
   acl,
   alsa-lib,
+  apple-sdk,
   autoreconfHook,
   cairo,
   dbus,
@@ -193,6 +194,10 @@ mkDerivation (finalAttrs: {
                 "${lib.getBin stdenv.cc.bintools}/bin"
                 "${lib.getBin stdenv.cc.bintools.bintools}/bin"
               ]
+              ++ lib.optionals stdenv.hostPlatform.isDarwin [
+                # The linker needs to know where to find libSystem on Darwin.
+                "${apple-sdk.sdkroot}/usr/lib"
+              ]
             )
           )
         );

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -90,10 +90,20 @@ stdenv.mkDerivation (finalAttrs: {
     rev = "version_${finalAttrs.version}";
   };
 
+  # required for GCC 14
+  # (not applicable to super-slicer fork)
+  postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") ''
+    substituteInPlace src/libslic3r/Arrange/Core/DataStoreTraits.hpp \
+      --replace-fail \
+      "WritableDataStoreTraits<ArrItem>::template set" \
+      "WritableDataStoreTraits<ArrItem>::set"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
     wrapGAppsHook3
+    wxGTK-override'
   ];
 
   buildInputs = [
@@ -132,6 +142,8 @@ stdenv.mkDerivation (finalAttrs: {
     darwin.apple_sdk_11_0.frameworks.CoreWLAN
   ];
 
+  strictDeps = true;
+
   separateDebugInfo = true;
 
   # The build system uses custom logic - defined in

diff --git a/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch b/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -24,7 +24,6 @@ let
       ];
       hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c=";
     })
-    ./meshboolean-const.patch
     # Drop if this fix gets merged upstream
     (fetchpatch {
       url = "https://github.com/supermerill/SuperSlicer/commit/fa7c545efa5d1880cf24af32083094fc872d3692.patch";
@@ -69,15 +68,20 @@ let
 
       # - wxScintilla is not used on macOS
       # - Partially applied upstream changes cause a bug when trying to link against a nonexistent libexpat
-      prePatch =
-        super.prePatch
+      postPatch =
+        super.postPatch
         + ''
           substituteInPlace src/CMakeLists.txt \
             --replace "scintilla" "" \
             --replace "list(APPEND wxWidgets_LIBRARIES libexpat)" "list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)"
 
           substituteInPlace src/libslic3r/CMakeLists.txt \
             --replace "libexpat" "EXPAT::EXPAT"
+
+          # fixes GCC 14 error
+          substituteInPlace src/libslic3r/MeshBoolean.cpp \
+            --replace-fail 'auto &face' 'auto face' \
+            --replace-fail 'auto &vi' 'auto vi'
         '';
 
       # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
@@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.47.0";
+  version = "2.47.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-HOEU2ohwQnG0PgJ8UeBNk5n4yI6e91Qtrnrrrn2HvE4=";
+    hash = "sha256-89j5uyOuOSN06RzZ05WXDavFucXucvOYhGE82Epu0xA=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";

diff --git a/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch b/pkgs/by-name/cu/curlMinimal/fix-netrc-regression-2.patch