Skip to content

stdenv: updateAutotoolsGnuConfigScriptsHook unconditionally#237968

Merged
wegank merged 1 commit intostagingfrom
unknown repository
Jun 16, 2023
Merged

stdenv: updateAutotoolsGnuConfigScriptsHook unconditionally#237968
wegank merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jun 15, 2023

Description of changes

Unlike autoreconfHook, updateAutotoolsGnuConfigScriptsHook adds almost no compilations. Therefore, in the interest of building the same source code on every platform wherever possible, let's eliminate the conditional guards around updateAutotoolsGnuConfigScriptsHook in stdenv.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jun 15, 2023
Unlike autoreconfHook, updateAutotoolsGnuConfigScriptsHook adds
almost no compilations.  Therefore, in the interest of building the
same source code on every platform wherever possible, let's
eliminate the conditional guards around
updateAutotoolsGnuConfigScriptsHook in stdenv.
@ofborg ofborg bot added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 16, 2023
@ghost ghost marked this pull request as ready for review June 16, 2023 08:00
@ghost ghost requested review from trofi and wegank June 16, 2023 08:00
Copy link
Contributor

@trofi trofi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huge +1 for making it unconditional. Thank you!

@wegank wegank merged commit 8e334a9 into NixOS:staging Jun 16, 2023
@Artturin
Copy link
Member

Artturin commented Jun 30, 2023

exposed that makeSetupHook is broken in __structuredAttrs __bootPackages

discovered with tests.stdenv.structuredAttrsByDefault.hooks.make-symlinks-relative

$ nix build --impure --expr "with import ./. { config = { structuredAttrsByDefault = true; }; }; stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.libxcrypt"
this derivation will be built:
  /nix/store/994qfy50ylyafndz12zh8zq1a73gi5ll-libxcrypt-4.4.35.drv
building '/nix/store/994qfy50ylyafndz12zh8zq1a73gi5ll-libxcrypt-4.4.35.drv'...
libxcrypt> structuredAttrs is enabled
libxcrypt> unpacking sources
libxcrypt> unpacking source archive /nix/store/spzw99ag9wq184zd9il0n66937m30dzl-libxcrypt-4.4.35.tar.xz
libxcrypt> source root is libxcrypt-4.4.35
libxcrypt> setting SOURCE_DATE_EPOCH to timestamp 1686071870 of file libxcrypt-4.4.35/config.h.in
libxcrypt> patching sources
libxcrypt> updateAutotoolsGnuConfigScriptsPhase
libxcrypt> Updating Autotools / GNU config script to a newer upstream version: ./build-aux/m4-autogen/config.sub
libxcrypt> cp: cannot stat '@gnu_config@/config.sub': No such file or directory

nix build --impure --expr "with import ./. { config = { structuredAttrsByDefault = true; }; }; stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.updateAutotoolsGnuConfigScriptsHook"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: stdenv Standard environment 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants