Skip to content

rsync: fix missing ipv6 support#278184

Closed
bobrik wants to merge 1 commit intoNixOS:stagingfrom
bobrik:ivan/rsync-ipv6
Closed

rsync: fix missing ipv6 support#278184
bobrik wants to merge 1 commit intoNixOS:stagingfrom
bobrik:ivan/rsync-ipv6

Conversation

@bobrik
Copy link
Contributor

@bobrik bobrik commented Jan 2, 2024

Description of changes

Added a patch to apply RsyncProject/rsync#558.

Somehow aarch64-linux is okay:

While aarch64-darwin is not:

I think it broke with clang-16:

ivan@vm:~/projects/rsync$ clang-15 -o derp -g -O2 -Wall -W derp.c
derp.c:4:1: warning: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
main()
^
int
1 warning generated.
ivan@vm:~/projects/rsync$ clang-16 -o derp -g -O2 -Wall -W derp.c
derp.c:4:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
main()
^
int
1 error generated.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@ofborg ofborg bot requested review from a user and ivan January 2, 2024 04:26
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 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 Jan 2, 2024
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

this is similar to Issue #276961.
will need to target staging as there are too many rebuilds for master. see: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging

@bobrik
Copy link
Contributor Author

bobrik commented Jan 2, 2024

Can we gate it to just darwin and target master still or would it be still to big in terms of rebuilds?

@ghost
Copy link

ghost commented Jan 2, 2024

Can we gate it to just darwin and target master still or would it be still to big in terms of rebuilds?

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-causing-mass-rebuilds says over 500 is considered a mass rebuild event, so seems like it needs to target staging regardless.

@bobrik bobrik changed the base branch from master to staging January 2, 2024 07:06
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels Jan 2, 2024
@github-actions github-actions bot added 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab labels Jan 2, 2024
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab labels Jan 2, 2024
@bobrik
Copy link
Contributor Author

bobrik commented Jan 2, 2024

I asked GitHub to target staging + rebased and force pushed it. Same as always, there was a weird intermediate state with lots of unrelated changes that pulled many reviewers. I'm not sure if there's a proper way to do this in the same PR, but I'm happy to be pointed at the right docs for the next time.

@ghost
Copy link

ghost commented Jan 2, 2024

@ghost ghost closed this Jan 2, 2024
@bobrik bobrik mentioned this pull request Jan 2, 2024
13 tasks
@NixOS NixOS locked and limited conversation to collaborators Jan 2, 2024
@bobrik bobrik deleted the ivan/rsync-ipv6 branch January 2, 2024 21:40
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant