NixOS · vcunat · Mar 22, 2025 · Mar 3, 2025 · Mar 3, 2025 · Mar 3, 2025
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -231,6 +231,9 @@
 
 - `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`.
 
+- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default.
+  Environment variables have to be passed via the `env` attribute.
+
 - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases.
 
   Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`.

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
@@ -102,10 +102,10 @@ with lib;
         stdenv
         stdenvNoCC # for runCommand
         busybox
-        jq # for closureInfo
         # For boot.initrd.systemd
         makeInitrdNGTool
-      ];
+      ]
+      ++ jq.all; # for closureInfo
 
     boot.swraid.enable = true;
     # remove warning about unset mail

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   updateAutotoolsGnuConfigScriptsHook,
   autoreconfHook,
+  freebsd,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
       })
     ]
     ++ [
-      # Has to come after darwin patches
+      # Has to come after darwin patches and before freebsd patches
       ./fix_private_keyword.patch
       # Order does not matter
       ./configure.patch
@@ -62,13 +63,98 @@ stdenv.mkDerivation rec {
         hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo=";
       })
     ]
-    ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch;
+    ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch
+    ++ [
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h";
+        hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scan__devices.c";
+        hash = "sha256-UD7SXeypF3bAqT7Y24UOrGZNaD8ZmpS2V7XQU+3VKXk=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<private\>/private_data/g' $out
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cdda__interface.h";
+        hash = "sha256-JL4qe4LwmNp2jQFqTvyRjc6bixGqYr6BZmqsYIY9xhw=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_common__interface.c";
+        hash = "sha256-vw0oFM6w15YBaAK01FwVcSN+oztSfo5jL6OlGy0iWBg=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cooked__interface.c";
+        hash = "sha256-g39dhxb8+K9BIb2/5cmkQ9GYjg4gDjj6sv+dXx93kQ4=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_interface.c";
+        hash = "sha256-LMWfbqLjbQM3L4H3orAxyyAHf1hVtFwfmZY8NmBLKzs=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<private\>/private_data/g' $out
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scsi__interface.c";
+        hash = "sha256-dx6YCWW8J0e455phaYDUMiOCvp4DsfINjSEiEfnHaNI=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<private\>/private_data/g' $out
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-Makefile.in";
+        hash = "sha256-Wje2d58xrSWHJNktQRHcNSbh5yh6vMtpgc/3G4D1vrI=";
+        extraPrefix = "";
+        postFetch = ''
+          sed -E -i -e 's/\<Linux\>/__linux__/g' $out
+        '';
+      })
+    ];
 
   nativeBuildInputs = [
     updateAutotoolsGnuConfigScriptsHook
     autoreconfHook
   ];
 
+  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [
+    # cdparanoia shipped headers have #include <libcam.h>
+    # (it is part of the freebsd base system so this is reasonable
+    # but we want to keep the default freebsd libs, freebsd.libc, small)
+    freebsd.libcam
+  ];
+
+  env =
+    lib.optionalAttrs stdenv.hostPlatform.isFreeBSD {
+      NIX_LDFLAGS = "-lcam";
+    }
+    // {
+      BSD_INSTALL_PROGRAM = "install";
+      BSD_INSTALL_LIB = "install";
+    };
+
   # Build system reuses the same object file names for shared and static
   # library. Occasionally fails in the middle:
   #    gcc -O2 -fsigned-char -g -O2 -c scan_devices.c

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -61,6 +61,7 @@ lib.extendMkDerivation {
       propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs;
 
       strictDeps = args.strictDeps or true;
+      __structuredAttrs = args.__structuredAttrs or true;
 
       inherit turnCompilationWarningToError ignoreCompilationError;
 

diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix
@@ -31,7 +31,6 @@ buildPythonApplication rec {
   ];
 
   format = "setuptools";
-  dontUseSetuptoolsCheck = true;
 
   installPhase = ''
     install -D -m 0755 SL1_to_Photon.py $out/bin/${pname}

diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
@@ -83,7 +83,6 @@ buildPythonPackage rec {
 
   PKGVER = version;
 
-  dontUseSetuptoolsCheck = true;
   pythonImportsCheck = [ "srht" ];
 
   meta = with lib; {

diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -37,8 +37,6 @@ buildPythonPackage rec {
     export PKGVER=${version}
   '';
 
-  dontUseSetuptoolsCheck = true;
-
   pythonImportsCheck = [ "scmsrht" ];
 
   meta = with lib; {

diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -72,8 +72,6 @@ buildPythonPackage rec {
     pytest
     factory-boy
   ];
-
-  dontUseSetuptoolsCheck = true;
   pythonImportsCheck = [ "todosrht" ];
 
   meta = with lib; {

diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
@@ -1,15 +1,35 @@
 needsTarget=true
+targetValue=""
+
+declare -i n=0
+nParams=${#params[@]}
+while (("$n" < "$nParams")); do
+    p=${params[n]}
+    v=${params[n + 1]:-} # handle `p` being last one
+    n+=1
 
-for p in "${params[@]}"; do
     case "$p" in
-    -target | --target=*)
+    -target)
+        if [ -z "$v" ]; then
+            echo "Error: -target requires an argument" >&2
+            exit 1
+        fi
         needsTarget=false
-
-        echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2
+        targetValue=$v
+        # skip parsing the value of -target
+        n+=1
+        ;;
+    --target=*)
+        needsTarget=false
+        targetValue="${p#*=}"
         ;;
     esac
 done
 
+if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then
+    echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2
+fi
+
 if $needsTarget && [[ $0 != *cpp ]]; then
     extraBefore+=(-target @defaultTarget@ @machineFlags@)
 fi
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
@@ -20,7 +20,6 @@ let
 in
 {
   stdenvNoCC,
-  perl,
   cpio,
   ubootTools,
   lib,
@@ -101,7 +100,6 @@ stdenvNoCC.mkDerivation (
     builder = ./make-initrd.sh;
 
     nativeBuildInputs = [
-      perl
       cpio
     ] ++ lib.optional makeUInitrd ubootTools;
 
@@ -121,14 +119,7 @@ stdenvNoCC.mkDerivation (
     symlinks = map (x: x.symlink) contents;
     suffices = map (x: if x ? suffix then x.suffix else "none") contents;
 
-    # For obtaining the closure of `contents'.
-    # Note: we don't use closureInfo yet, as that won't build with nix-1.x.
-    # See #36268.
-    exportReferencesGraph = lib.zipListsWith (x: i: [
-      ("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}")
-      x.object
-    ]) contents (lib.range 0 (lib.length contents - 1));
-    pathsFromGraph = ./paths-from-graph.pl;
+    closureInfo = "${pkgsBuildHost.closureInfo { rootPaths = objects; }}";
   }
   // lib.optionalAttrs makeUInitrd {
     uInitrdCompression = uInitrdCompression;

diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh
@@ -24,7 +24,7 @@ done
 
 
 # Get the paths in the closure of `object'.
-storePaths=$(perl $pathsFromGraph closure-*)
+storePaths="$(cat $closureInfo/store-paths)"
 
 
 # Paths in cpio archives *must* be relative, otherwise the kernel

diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -38,7 +38,7 @@ cargoBuildHook() {
     concatTo flagsArray cargoBuildFlags
 
     echoCmd 'cargoBuildHook flags' "${flagsArray[@]}"
-    cargo build "${flagsArray[@]}"
+    @setEnv@ cargo build "${flagsArray[@]}"
 
     if [ -n "${buildAndTestSubdir-}" ]; then
         popd

diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -37,7 +37,7 @@ cargoCheckHook() {
     concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray
 
     echoCmd 'cargoCheckHook flags' "${flagsArray[@]}"
-    cargo test "${flagsArray[@]}"
+    @setEnv@ cargo test "${flagsArray[@]}"
 
     if [[ -n "${buildAndTestSubdir-}" ]]; then
         popd

diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
@@ -27,6 +27,8 @@
       name = "cargo-build-hook.sh";
       substitutions = {
         inherit (stdenv.targetPlatform.rust) rustcTarget;
+        inherit (rust.envVars) setEnv;
+
       };
       passthru.tests =
         {
@@ -44,6 +46,7 @@
       name = "cargo-check-hook.sh";
       substitutions = {
         inherit (stdenv.targetPlatform.rust) rustcTarget;
+        inherit (rust.envVars) setEnv;
       };
       passthru.tests =
         {
@@ -136,6 +139,8 @@
       ];
       substitutions = {
         inherit (stdenv.targetPlatform.rust) rustcTarget;
+        inherit (rust.envVars) setEnv;
+
       };
     } ./maturin-build-hook.sh
   ) { };

diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh
@@ -31,7 +31,7 @@ maturinBuildHook() {
     concatTo flagsArray maturinBuildFlags
 
     echoCmd 'maturinBuildHook flags' "${flagsArray[@]}"
-    maturin build "${flagsArray[@]}"
+    @setEnv@ maturin build "${flagsArray[@]}"
 
     if [ -n "${buildAndTestSubdir-}" ]; then
         popd