Unverified Commit 3fcae17e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

staging-next 2025-03-13 (#389579)

parents 8338df11 7233659e

nixos/doc/manual/release-notes/rl-2505.section.md

+3 −0
Original line number Diff line number Diff line
@@ -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`.

nixos/modules/profiles/installation-device.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/audio/cdparanoia/default.nix

+88 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/editors/emacs/build-support/generic.nix

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ lib.extendMkDerivation { 
      propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs;



      strictDeps = args.strictDeps or true;

      __structuredAttrs = args.__structuredAttrs or true;



      inherit turnCompilationWarningToError ignoreCompilationError;

pkgs/applications/misc/sl1-to-photon/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ buildPythonApplication rec { 
  ];



  format = "setuptools";

  dontUseSetuptoolsCheck = true;



  installPhase = ''

    install -D -m 0755 SL1_to_Photon.py $out/bin/${pname}