Skip to content

modemmanager: rename ModemManager.service to modem-manager.service #30452

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

Closed
flokli wants to merge 1 commit into from
Closed

modemmanager: rename ModemManager.service to modem-manager.service #30452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...tools/networking/modemmanager/default.nix → ...ools/networking/modem-manager/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
, libmbim, libqmi, systemd }:

stdenv.mkDerivation rec {
name = "ModemManager-${version}";
name = "modem-manager-${version}";
pname = "ModemManager";
version = "1.6.8";

src = fetchurl {
url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
sha256 = "0xj3ng7qcqxkib5qkprwghcivaz0mn449fw08l67h1zbpz23bh7z";
};

Expand All @@ -30,7 +31,8 @@ stdenv.mkDerivation rec {
'';

postInstall = ''
mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system
# rename to modem-manager to be in style
mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service
Copy link
Member

@Mic92 Mic92 Oct 17, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I think we should stick to upstream here. Consistency is not worth breaking upstream documentation and expectation how things are named.

Copy link
Member Author

@flokli flokli Oct 17, 2017

Choose a reason for hiding this comment

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

Granted. I just found it weird renaming was done for NetworkManager, but not here. Should this also be reverted for NetworkManager then?

Copy link
Member

@Mic92 Mic92 Oct 18, 2017

Choose a reason for hiding this comment

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

Mhm. I would have not done it there too for the same reason.

Copy link
Member

@Mic92 Mic92 Oct 18, 2017

Choose a reason for hiding this comment

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

So it seems I have a different opinion then @domenkozar in 2014.

Copy link
Member Author

@flokli flokli Oct 29, 2017

Choose a reason for hiding this comment

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

I'd say as long as NetworkManager is renamed to modem-manager, ModemManager should be called modem-manager, too.

The current state is more than confusing.

rm -rf $out/$out/etc
mv $out/$out/* $out
DIR=$out/$out
Expand All @@ -40,7 +42,7 @@ stdenv.mkDerivation rec {

# systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves.
ln -s $out/etc/systemd/system/ModemManager.service \
ln -s $out/etc/systemd/system/modem-manager.service \
$out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
'';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3354,7 +3354,7 @@ with pkgs;

mmake = callPackage ../tools/misc/mmake { };

modemmanager = callPackage ../tools/networking/modemmanager {};
modemmanager = callPackage ../tools/networking/modem-manager {};

modsecurity_standalone = callPackage ../tools/security/modsecurity { };

Expand Down