JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This is in line with NetworkManager.service being renamed to
network-manager.service

fixes #30452
This commit is contained in:
Florian Klink 2017-10-15 23:08:03 +02:00 committed by Jörg Thalheim
parent da446cf291
commit c6882b2cf9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/modemmanager/default.nix → pkgs/tools/networking/modem-manager/default.nix
View File

@ -2,11 +2,12 @@
, libmbim, libqmi, systemd, fetchpatch }: , libmbim, libqmi, systemd, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ModemManager-${version}"; name = "modem-manager-${version}";
pname = "ModemManager";
version = "1.7.990"; version = "1.7.990";
src = fetchurl { 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"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
}; };
@ -38,7 +39,8 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' 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 rm -rf $out/$out/etc
mv $out/$out/* $out mv $out/$out/* $out
DIR=$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 # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves. # 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 $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -3685,7 +3685,7 @@ with pkgs;
mmake = callPackage ../tools/misc/mmake { }; mmake = callPackage ../tools/misc/mmake { };
modemmanager = callPackage ../tools/networking/modemmanager {}; modemmanager = callPackage ../tools/networking/modem-manager {};
modsecurity_standalone = callPackage ../tools/security/modsecurity { }; modsecurity_standalone = callPackage ../tools/security/modsecurity { };