Skip to content

net-tools: rename from nettools#416056

Merged
wolfgangwalther merged 3 commits intoNixOS:stagingfrom
zimbatm:rename-net-tools
Jun 21, 2025
Merged

net-tools: rename from nettools#416056
wolfgangwalther merged 3 commits intoNixOS:stagingfrom
zimbatm:rename-net-tools

Conversation

@zimbatm
Copy link
Member

@zimbatm zimbatm commented Jun 12, 2025

By being in sync with the pname, it makes it easier to walk back from
the pname that shows in the /nix/store back to the attribute.

This change should not cause any rebuild.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@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 6.topic: kernel The Linux kernel 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 12, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 12, 2025
@maralorn
Copy link
Member

maralorn commented Jun 12, 2025

Sadly your commit touches the autogenerated hackage-packages.nix file.

Annoyingly changing this would require modifying this line: https://github.com/NixOS/cabal2nix/blob/0caafdd58fa45228b2abc67078f239c85df21b89/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs#L140

I have never heard of this program and it is broken, so probably the cheapest fix to eval is fine.

zimbatm added a commit to zimbatm/cabal2nix that referenced this pull request Jun 14, 2025
The package is broken and has a dependency on nettools, which I want to
rename in NixOS/nixpkgs#416056
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

I'm neither for nor against it ... so for my module just lgtm/rejeckt on what the majority of maintainers of this rename think.

as for my two cents: please dont bikeshed :) - it it's good it is else well let it be ?!?

@wolfgangwalther
Copy link
Contributor

I'm not sure why this causes as many darwin rebuilds. They were already there before cabal2nix was bumped, so unrelated to that. I went through the diff once, and nothing stood out.

Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this causes the rebuilds via name = "${pname}-${version}"; above.

@github-actions github-actions bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 20, 2025
@sternenseemann
Copy link
Member

Should go to staging with this rebuild since the change is not particularly urgent.

@zimbatm zimbatm changed the base branch from master to staging June 21, 2025 17:57
@nixpkgs-ci nixpkgs-ci bot closed this Jun 21, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Jun 21, 2025
zimbatm added 3 commits June 21, 2025 19:57
By being in sync with the pname, it makes it easier to walk back from
the pname that shows in the /nix/store back to the attribute.

This change should not cause any rebuild.
…S#416056)

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast
@zimbatm zimbatm force-pushed the rename-net-tools branch from 935427f to 08c7dcb Compare June 21, 2025 17:58
@zimbatm
Copy link
Member Author

zimbatm commented Jun 21, 2025

Ok it's ready!

@wolfgangwalther wolfgangwalther merged commit e80ca91 into NixOS:staging Jun 21, 2025
23 of 27 checks passed
@zimbatm zimbatm deleted the rename-net-tools branch June 21, 2025 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 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.

5 participants