modemmanager: 1.14.12 -> 1.16.6

This commit is contained in:
Alyssa Ross 2021-06-17 16:04:38 +00:00
parent 4542d4ce83
commit 85cc349087

View file

@ -1,20 +1,34 @@
{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkg-config
, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }:
{ lib, stdenv, fetchurl, fetchpatch
, glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3
, libmbim, libqmi, systemd, vala, gobject-introspection, dbus
}:
stdenv.mkDerivation rec {
pname = "modem-manager";
version = "1.14.12";
version = "1.16.6";
package = "ModemManager";
src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
sha256 = "sha256-0QqXEZndwl3N8VbFasCOkWEsCVOdVlIueu1G1G5IO7E=";
url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz";
sha256 = "05wn94x71qr36avxjzvyf56nj5illynnf9nn15b17lv61wkbd41a";
};
patches = [
# Fix a broken test.
# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/556
(fetchpatch {
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/a324667386f35df0c3b3bbf615fa0560d215485d.patch";
sha256 = "1xj9gfl6spbp4xdp6gn76k8zvzam5m6lgmbiwdn6ixffzhlfwi5l";
})
];
nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];
buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
installCheckInputs = [
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3
];
configureFlags = [
"--with-polkit"
"--with-udev-base-dir=${placeholder "out"}/lib/udev"
@ -26,13 +40,23 @@ stdenv.mkDerivation rec {
"--with-systemd-journal"
];
preCheck = ''
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
postPatch = ''
patchShebangs tools/test-modemmanager-service.py
'';
enableParallelBuilding = true;
# In Nixpkgs g-ir-scanner is patched to produce absolute paths, and
# that interferes with ModemManager's tests, causing them to try to
# load libraries from the install path, which doesn't usually exist
# when `make check' is run. So to work around that, we run it as an
# install check instead, when those paths will have been created.
doInstallCheck = true;
preInstallCheck = ''
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
patchShebangs tools/tests/test-wrapper.sh
'';
installCheckTarget = "check";
doCheck = true;
enableParallelBuilding = true;
meta = with lib; {
description = "WWAN modem manager, part of NetworkManager";