Skip to content

Revert "fetchurl, fetchgitlab: fix curlOpts extension"#470831

Merged
ShamrockLee merged 1 commit intomasterfrom
revert-470550-curlopts-array-extension
Dec 15, 2025
Merged

Revert "fetchurl, fetchgitlab: fix curlOpts extension"#470831
ShamrockLee merged 1 commit intomasterfrom
revert-470550-curlopts-array-extension

Conversation

@ShamrockLee
Copy link
Contributor

Reverts #470550

PR #470550 is based on the assumption that curlOpts is passed as a Bash array since PR #464475 sets __structuredAttrs = true for all fetchurl-constructed FODs. However, curlOpts is only passed as a Bash array if it is specified as a list, and passing curlOpts has already been warned against before PR #464475.

@nixpkgs-ci nixpkgs-ci bot requested a review from philiptaron December 14, 2025 20:18
@nixpkgs-ci nixpkgs-ci 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. 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) labels Dec 14, 2025
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

Thanks for clarifying and reverting! Sorry for the confusion.

However, curlOpts is only passed as a Bash array if it is specified as a list

I still think the bash code should attempt to handle it being an array if we still permit it to be passed as a list. If the bash code doesn't handle it being an array, then the warning ought to be a throw.

In this case that probably means using ${curlOpts[*]} expansion?

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 15, 2025
@ShamrockLee ShamrockLee added this pull request to the merge queue Dec 15, 2025
Merged via the queue into master with commit 5cbd4c3 Dec 15, 2025
31 of 34 checks passed
@ShamrockLee ShamrockLee deleted the revert-470550-curlopts-array-extension branch December 15, 2025 18:27
@ShamrockLee
Copy link
Contributor Author

I still think the bash code should attempt to handle it being an array if we still permit it to be passed as a list. If the bash code doesn't handle it being an array, then the warning ought to be a throw.

Let's settle that in PR #471172.

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

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants