Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

utillinux: rename to util-linux #104776

Merged
merged 1 commit into from Nov 24, 2020
Merged

utillinux: rename to util-linux #104776

merged 1 commit into from Nov 24, 2020

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Nov 24, 2020

Motivation for this change

Having the pname not match the attribute name in this case, when the pname is the project's actual name causes me quite a lot of headache.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

makefu
makefu approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@makefu makefu left a comment

Choose a reason for hiding this comment

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

Can confirm, i fell over a trace when upgrading to 20.09 which stated i should use util-linux package instead

@grahamc
Copy link
Member Author

grahamc commented Nov 24, 2020

I'm not sure this large patch should cleanup whitespace for the files which are already messy. Opinions?

@SuperSandro2000
Copy link
Member

I'm not sure this large patch should cleanup whitespace for the files which are already messy. Opinions?

If we keep the changes to minimum we maybe can skip staging and go straight to master. With whitespace fixes we could cause a lot of rebuilds if they are in the wrong places.

FRidh
FRidh reviewed Nov 24, 2020
View reviewed changes
pkgs/top-level/aliases.nix
@@ -642,6 +642,7 @@ mapAliases ({
unicorn-emu = unicorn; # added 2020-10-29
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
utillinux = util-linux; # added 2020-11-24
Copy link
Member

Choose a reason for hiding this comment

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

👍

vikanezrimaya
vikanezrimaya approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@vikanezrimaya vikanezrimaya left a comment

Choose a reason for hiding this comment

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

I love this. utillinux made me stumble first time I explicitly requested the package somewhere in my configuration, because I totally expected it to be util-linux, since dashes were always OK in attribute sets (unlike e.g. Python or JS where you could get in trouble with that kind of syntax)

@7c6f434c
Copy link
Member

7c6f434c commented Nov 24, 2020 via email

@grahamc
Copy link
Member Author

grahamc commented Nov 24, 2020

Just pushed a fixup addressing:

getting status of '/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/packet-spot-eval-4/pkgs/os-specific/linux/pam_mount/insert_util-linux_path_hooks.patch': No such file or directory

@grahamc grahamc marked this pull request as ready for review November 24, 2020 19:29
jonringer
jonringer approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

looks like rebuilds are from changing comments inside of code blocks

https://github.com/NixOS/nixpkgs/pull/104776
2 packages blacklisted:
tests.nixos-functions.nixos-test tests.nixos-functions.nixosTest-test

4 packages built:
lxcfs unixtools.util-linux util-linux util-linuxMinimal

roberth
roberth approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

💯

@grahamc
Copy link
Member Author

grahamc commented Nov 24, 2020

alleyoop

@grahamc grahamc merged commit d9c3f13 into NixOS:master Nov 24, 2020
@grahamc grahamc deleted the utillinux branch November 24, 2020 20:23
@r-burns r-burns mentioned this pull request Nov 25, 2020
Closed
10 tasks
@ju1m ju1m mentioned this pull request Nov 26, 2020
Merged
18 tasks
@mweinelt mweinelt mentioned this pull request Dec 1, 2020
Closed
This was referenced Dec 2, 2020
Closed
Merged
@midchildan midchildan mentioned this pull request Dec 13, 2020
Closed
10 tasks
@ElvishJerricco
Copy link
Contributor

Hm. Wish this would have included aliases for the other utillinux variants e.g. utillinuxMinimal.

@grahamc
Copy link
Member Author

grahamc commented Jan 9, 2021 via email

This was referenced May 17, 2021
Merged
Merged
sternenseemann added a commit that referenced this pull request Jun 10, 2021
@sternenseemann
haskellPackages: remove deprecated aliases mysql and utillinux
35a7369 
These attribute names were converted into aliases in the following
changes:

* 62733b3
* #104776

cabal2nix-unstable has been updated to be aware of these changes in
7a9080d, so these aliases should no
longer cause issues when evaluating with `allowAliases = false`.
@uakci uakci mentioned this pull request Sep 29, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

@prusnak prusnak prusnak approved these changes

@makefu makefu makefu approved these changes

@lukegb lukegb lukegb approved these changes

@roberth roberth roberth approved these changes

@jonringer jonringer jonringer approved these changes

@vikanezrimaya vikanezrimaya vikanezrimaya approved these changes

@alyssais alyssais Awaiting requested review from alyssais

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@peti peti Awaiting requested review from peti

@RaghavSood RaghavSood Awaiting requested review from RaghavSood RaghavSood is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: haskell 6.topic: nixos 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet