Skip to content

threadsCross: factor out copy-and-pasted code#243394

Merged
1 commit merged intomasterfrom
unknown repository
Jul 15, 2023
Merged

threadsCross: factor out copy-and-pasted code#243394
1 commit merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jul 14, 2023

Description of changes

In #236598 a chunk of code was simply copy-pasted-tweaked. The more often this happens, the more unmaintainable nixpkgs becomes. Let's use the wonderful functions and conditionals that Nix gives us to avoid this duplication.

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.

In #236598 a chunk of code was
simply copy-pasted-tweaked.  The more often this happens, the more
unmaintainable nixpkgs becomes.  Let's use the wonderful functions
and conditionals that Nix gives us to avoid this duplication.
@ghost
Copy link
Copy Markdown
Author

ghost commented Jul 14, 2023

Verified no change to eval for pkgsCross.mingwW64.buildPackages.{gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 go_1_18 go_1_19 go_1_20}

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 14, 2023
@ghost ghost merged commit 1f0d951 into NixOS:master Jul 15, 2023
@ghost ghost deleted the pr/threadsCross/deduplicate branch January 23, 2024 06:50
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants