about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2017-10-15 23:08:03 +0200
committerJörg Thalheim <joerg@thalheim.io>2018-03-23 23:48:58 +0000
commitc6882b2cf9fa13579f64d5c33cbc071fa5d5e884 (patch)
treed7d3e132a4e0dd25a371b810b132c8e6e2ee8e0d /pkgs/tools
parentda446cf2915923318f2c35cf5016788b8b491784 (diff)
modemmanager: rename ModemManager.service to modem-manager.service
This is in line with NetworkManager.service being renamed to
network-manager.service

fixes #30452
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/modem-manager/default.nix (renamed from pkgs/tools/networking/modemmanager/default.nix)10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 999a269d0b780..e9af9dc980e73 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
   '';