Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da446cf29159
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c6882b2cf9fa
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 23, 2018

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

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

fixes #30452
    @flokli @Mic92
    flokli authored and Mic92 committed Mar 23, 2018
    Copy the full SHA
    c6882b2 View commit details
Showing with 7 additions and 5 deletions.
  1. +6 −4 pkgs/tools/networking/{modemmanager → modem-manager}/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
10 changes: 6 additions & 4 deletions ...tools/networking/modemmanager/default.nix → ...ools/networking/modem-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };