Unverified Commit e9dab0cc authored by Lin Jian's avatar Lin Jian
Browse files

Revert "emacs: enable __structuredAttrs by default in elisp build helpers" 

This reverts commit d64a233e.

A stdenv bug breaks emacs.pkgs.withPackages wrapper.  A fix PR[1] will
take a few weeks to reach users because it has to go through a staging
cycle.  Revert this for now to unbreak emacs.pkgs.withPackages
wrapper.

[1]: https://github.com/NixOS/nixpkgs/pull/388908
parent 56f4e06f

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

+0 −3
Original line number Diff line number Diff line
@@ -206,9 +206,6 @@ 


- `pkgs.nextcloud28` has been removed since it's out of support upstream.



- 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`.

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

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



      strictDeps = args.strictDeps or true;

      __structuredAttrs = args.__structuredAttrs or true;



      inherit turnCompilationWarningToError ignoreCompilationError;