staging-next-24.11 iteration 2 - 2024-12-31

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 =

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 =

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 = [

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"
+              ]
             )
           )
         );

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

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.

pkgs/applications/networking/browsers/firefox/common.nix

@@ -254,6 +254,12 @@ buildStdenv.mkDerivation {
       hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
     })
   ]
+  ++ [
+    # Python 3.12.8 compat
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+    # https://phabricator.services.mozilla.com/D231480
+    ./mozbz-1935621-attachment-9442305.patch
+  ]
   ++ extraPatches;
 
   postPatch = ''

pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch

@@ -0,0 +1,119 @@
+diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
+--- a/python/mach/mach/site.py
++++ b/python/mach/mach/site.py
+@@ -15,10 +15,11 @@
+ import site
+ import subprocess
+ import sys
+ import sysconfig
+ import tempfile
++import warnings
+ from contextlib import contextmanager
+ from pathlib import Path
+ from typing import Callable, Optional
+
+ from mach.requirements import (
+@@ -817,37 +818,79 @@
+
+ class PythonVirtualenv:
+     """Calculates paths of interest for general python virtual environments"""
+
+     def __init__(self, prefix):
+-        if _is_windows:
+-            self.bin_path = os.path.join(prefix, "Scripts")
+-            self.python_path = os.path.join(self.bin_path, "python.exe")
+-        else:
+-            self.bin_path = os.path.join(prefix, "bin")
+-            self.python_path = os.path.join(self.bin_path, "python")
+         self.prefix = os.path.realpath(prefix)
++        self.paths = self._get_sysconfig_paths(self.prefix)
+
+-    @functools.lru_cache(maxsize=None)
+-    def resolve_sysconfig_packages_path(self, sysconfig_path):
+-        # macOS uses a different default sysconfig scheme based on whether it's using the
+-        # system Python or running in a virtualenv.
+-        # Manually define the scheme (following the implementation in
+-        # "sysconfig._get_default_scheme()") so that we're always following the
+-        # code path for a virtualenv directory structure.
+-        if os.name == "posix":
+-            scheme = "posix_prefix"
+-        else:
+-            scheme = os.name
++        # Name of the Python executable to use in virtual environments.
++        # An executable with the same name as sys.executable might not exist in
++        # virtual environments. An executable with 'python' as the steam —
++        # without version numbers or ABI flags — will always be present in
++        # virtual environments, so we use that.
++        python_exe_name = "python" + sysconfig.get_config_var("EXE")
++
++        self.bin_path = self.paths["scripts"]
++        self.python_path = os.path.join(self.bin_path, python_exe_name)
+
+-        sysconfig_paths = sysconfig.get_paths(scheme)
+-        data_path = Path(sysconfig_paths["data"])
+-        path = Path(sysconfig_paths[sysconfig_path])
+-        relative_path = path.relative_to(data_path)
++    @staticmethod
++    def _get_sysconfig_paths(prefix):
++        """Calculate the sysconfig paths of a virtual environment in the given prefix.
+
+-        # Path to virtualenv's "site-packages" directory for provided sysconfig path
+-        return os.path.normpath(os.path.normcase(Path(self.prefix) / relative_path))
++        The virtual environment MUST be using the same Python distribution as us.
++        """
++        # Determine the sysconfig scheme used in virtual environments
++        if "venv" in sysconfig.get_scheme_names():
++            # A 'venv' scheme was added in Python 3.11 to allow users to
++            # calculate the paths for a virtual environment, since the default
++            # scheme may not always be the same as used on virtual environments.
++            # Some common examples are the system Python distributed by macOS,
++            # Debian, and Fedora.
++            # For more information, see https://github.com/python/cpython/issues/89576
++            venv_scheme = "venv"
++        elif os.name == "nt":
++            # We know that before the 'venv' scheme was added, on Windows,
++            # the 'nt' scheme was used in virtual environments.
++            venv_scheme = "nt"
++        elif os.name == "posix":
++            # We know that before the 'venv' scheme was added, on POSIX,
++            # the 'posix_prefix' scheme was used in virtual environments.
++            venv_scheme = "posix_prefix"
++        else:
++            # This should never happen with upstream Python, as the 'venv'
++            # scheme should always be available on >=3.11, and no other
++            # platforms are supported by the upstream on older Python versions.
++            #
++            # Since the 'venv' scheme isn't available, and we have no knowledge
++            # of this platform/distribution, fallback to the default scheme.
++            #
++            # Hitting this will likely be the result of running a custom Python
++            # distribution targetting a platform that is not supported by the
++            # upstream.
++            # In this case, unless the Python vendor patched the Python
++            # distribution in such a way as the default scheme may not always be
++            # the same scheme, using the default scheme should be correct.
++            # If the vendor did patch Python as such, to work around this issue,
++            # I would recommend them to define a 'venv' scheme that matches
++            # the layout used on virtual environments in their Python distribution.
++            # (rec. signed Filipe Laíns — upstream sysconfig maintainer)
++            venv_scheme = sysconfig.get_default_scheme()
++            warnings.warn(
++                f"Unknown platform '{os.name}', using the default install scheme '{venv_scheme}'. "
++                "If this is incorrect, please ask your Python vendor to add a 'venv' sysconfig scheme "
++                "(see https://github.com/python/cpython/issues/89576, or check the code comment).",
++                stacklevel=2,
++            )
++        # Build the sysconfig config_vars dictionary for the virtual environment.
++        venv_vars = sysconfig.get_config_vars().copy()
++        venv_vars["base"] = venv_vars["platbase"] = prefix
++        # Get sysconfig paths for the virtual environment.
++        return sysconfig.get_paths(venv_scheme, vars=venv_vars)
++
++    def resolve_sysconfig_packages_path(self, sysconfig_path):
++        return self.paths[sysconfig_path]
+
+     def site_packages_dirs(self):
+         dirs = []
+         if sys.platform.startswith("win"):
+             dirs.append(os.path.normpath(os.path.normcase(self.prefix)))
+

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";