Skip to content

Commit

Permalink
modemmanager: rename ModemManager.service to modem-manager.service
Browse files Browse the repository at this point in the history
This is in line with NetworkManager.service being renamed to
network-manager.service

fixes #30452
  • Loading branch information
flokli authored and Mic92 committed Mar 23, 2018
1 parent da446cf commit c6882b2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
, libmbim, libqmi, systemd, fetchpatch }:

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

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

Expand Down Expand Up @@ -38,7 +39,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
rm -rf $out/$out/etc
mv $out/$out/* $out
DIR=$out/$out
Expand All @@ -48,7 +50,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
Original file line number Diff line number Diff line change
Expand Up @@ -3685,7 +3685,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

0 comments on commit c6882b2

Please sign in to comment.