mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

ModemManager: 0.5.4.0 -> 0.7.991

Browse source
This commit is contained in:
Domen Kožar 2014-02-08 20:16:34 +01:00
parent 61f20ca45e
commit b17edbac57
4 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/networking/networkmanager.nix
View file

@ -31,7 +31,7 @@ let
[modem-manager] [modem-manager]
Identity=unix-group:networkmanager Identity=unix-group:networkmanager
Action=org.freedesktop.ModemManager.* Action=org.freedesktop.ModemManager*
ResultAny=yes ResultAny=yes
ResultInactive=no ResultInactive=no
ResultActive=yes ResultActive=yes
@ -42,7 +42,7 @@ let
subject.isInGroup("networkmanager") subject.isInGroup("networkmanager")
&& subject.active && subject.active
&& (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && (action.id.indexOf("org.freedesktop.NetworkManager.") == 0
|| action.id.indexOf("org.freedesktop.ModemManager.") == 0 || action.id.indexOf("org.freedesktop.ModemManager") == 0
)) ))
{ return polkit.Result.YES; } { return polkit.Result.YES; }
}); });
@ -161,6 +161,7 @@ in {
networkmanager_vpnc networkmanager_vpnc
networkmanager_openconnect networkmanager_openconnect
networkmanager_pptp networkmanager_pptp
modemmanager
]; ];
users.extraGroups = singleton { users.extraGroups = singleton {
@ -177,7 +178,7 @@ in {
description = "NetworkManager initialisation"; description = "NetworkManager initialisation";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
partOf = [ "NetworkManager.service" ]; partOf = [ "NetworkManager.service" ];
wants = [ "NetworkManager.service" ]; wants = [ "ModemManager.service" ];
before = [ "NetworkManager.service" ]; before = [ "NetworkManager.service" ];
script = '' script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 700 -p /etc/NetworkManager/system-connections
@ -206,6 +207,7 @@ in {
networkmanager_vpnc networkmanager_vpnc
networkmanager_openconnect networkmanager_openconnect
networkmanager_pptp networkmanager_pptp
modemmanager
]; ];
services.udev.packages = cfg.packages; services.udev.packages = cfg.packages;

23
pkgs/development/libraries/libmbim/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, glib, python, udev }:
stdenv.mkDerivation rec {
name = "libmbim-1.6.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz";
sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0";
};
preConfigure = ''
for f in build-aux/mbim-codegen/*; do
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
done
'';
buildInputs = [ pkgconfig glib udev ];
meta = with stdenv.lib; {
description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
platforms = platforms.linux;
};
}

19
pkgs/tools/networking/modemmanager/default.nix
View file

@ -1,19 +1,22 @@
{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig }: { stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "ModemManager-0.7.991";
src = fetchurl_gnome { src = fetchurl {
project = "ModemManager"; url = "mirror://gnome/sources/ModemManager/0.7/${name}.tar.xz";
major = "0"; minor = "5"; patchlevel = "4.0"; extension = "xz"; sha256 = "0p8shqsbgnsazim7s52ylxjk064cbx2n1vm1jgywr7i58hsd6n4y";
sha256 = "1fdf5d5cc494825afe9f551248e00a2d91e220e88435b47f109ca2a707a40f1f";
}; };
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = [ udev polkit dbus_glib ppp ]; buildInputs = [ udev polkit dbus_glib ppp libmbim libqmi ];
configureFlags = "--with-polkit --with-udev-base-dir=$(out)/lib/udev"; configureFlags = [
"--with-polkit"
"--with-udev-base-dir=$(out)/lib/udev"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
meta = { meta = {
description = "WWAN modem manager, part of NetworkManager"; description = "WWAN modem manager, part of NetworkManager";

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

@ -1284,6 +1284,8 @@ let
libqmi = callPackage ../development/libraries/libqmi { }; libqmi = callPackage ../development/libraries/libqmi { };
libmbim = callPackage ../development/libraries/libmbim { };
libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
logcheck = callPackage ../tools/system/logcheck { logcheck = callPackage ../tools/system/logcheck {