Skip to content

awscli2: fix tests#334858

Merged
fabaff merged 1 commit intoNixOS:masterfrom
deejayem:fix-awscli2
Aug 15, 2024
Merged

awscli2: fix tests#334858
fabaff merged 1 commit intoNixOS:masterfrom
deejayem:fix-awscli2

Conversation

@deejayem
Copy link
Copy Markdown
Member

Description of changes

Apply the patch from an upstream PR until it's merged, to fix an awscli2 test failure, caused by a dependency update.
Nixpkgs issue: #334730
Upstream PR: aws/aws-cli#8838

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@Fuuzetsu
Copy link
Copy Markdown
Member

Maybe it's better to store patch file in nixpkgs in case upstream gets rebased/diaappears after merging but other than that, LGTM

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 15, 2024
@deejayem
Copy link
Copy Markdown
Member Author

Maybe it's better to store patch file in nixpkgs in case upstream gets rebased/diaappears after merging but other than that, LGTM

I think this is fine, as fetchpatch is used nearly 3000 times in nixpkgs, including elsewhere in this file. But I'm happy to change it if others think it needs changing.

@fabaff
Copy link
Copy Markdown
Member

fabaff commented Aug 15, 2024

Result of nixpkgs-review pr 334858 run on x86_64-linux 1

3 packages built:
  • awscli2
  • awscli2.dist
  • liquidsoap

@fabaff
Copy link
Copy Markdown
Member

fabaff commented Aug 15, 2024

Storing the patch in nixpkgs would only add additional work to the already huge pile. If we can fetch a patch then we should as this make tracking easier. Sure, it could disappear but the same applies for almost all sources.

Copy link
Copy Markdown
Member

@fabaff fabaff left a comment

Choose a reason for hiding this comment

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

Change looks good to me.

@fabaff fabaff merged commit 92888c1 into NixOS:master Aug 15, 2024
@deejayem deejayem deleted the fix-awscli2 branch August 16, 2024 08:19
dc-tec added a commit to dc-tec/nixos-config that referenced this pull request Aug 18, 2024
…kes (#40)

- Configured waybar on second monitor.
- Use the stable package of AWSCLI2 due to build issue on unsable see:
NixOS/nixpkgs#334858. The merge hasn't yet
propogated. For now use stable package.
- Update flake inputs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants