diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modem-manager/default.nix similarity index 85% rename from pkgs/tools/networking/modemmanager/default.nix rename to pkgs/tools/networking/modem-manager/default.nix index 999a269d0b78..e9af9dc980e7 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -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"; }; @@ -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 @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e34ceacd680..aecf96b5a953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };