modemmanager: 1.22.0 -> 1.24.0 / libmbim: 1.30.0 -> 1.32.0 (#414699)

This commit is contained in:
Sandro
2025-08-12 15:22:35 +02:00
committed by GitHub
3 changed files with 15 additions and 10 deletions
+2 -2
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "libmbim";
version = "1.30.0";
version = "1.32.0";
outputs = [
"out"
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
owner = "mobile-broadband";
repo = "libmbim";
rev = version;
hash = "sha256-sHTpu9WeMZroT+1I18ObEHWSzcyj/Relyz8UNe+WawI=";
hash = "sha256-+4INXuH2kbKs9C6t4bOJye7yyfYH/BLukmgDVvXo+u0=";
};
mesonFlags = [
@@ -18,3 +18,14 @@ index 5dc3b6a0..25a948a1 100644
mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdiruser))
meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdirpackage))
diff --git a/data/dispatcher-modem-setup/meson.build b/data/dispatcher-modem-setup/meson.build
index 812152a3..7527022b 100644
--- a/data/dispatcher-modem-setup/meson.build
+++ b/data/dispatcher-modem-setup/meson.build
@@ -22,5 +22,4 @@ install_data(
)
mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdiruser))
meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdirpackage))
+2 -8
View File
@@ -32,26 +32,20 @@
stdenv.mkDerivation rec {
pname = "modemmanager";
version = "1.22.0";
version = "1.24.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mobile-broadband";
repo = "ModemManager";
rev = version;
hash = "sha256-/D9b2rCCUhpDCUfSNAWR65+3EyUywzFdH1R17eSKRDo=";
hash = "sha256-3jI75aR2esmv5dkE4TrdCHIcCvtdOBKnBC5XLEKoVFs=";
};
patches = [
# Since /etc is the domain of NixOS, not Nix, we cannot install files there.
# But these are just placeholders so we do not need to install them at all.
./no-dummy-dirs-in-sysconfdir.patch
(fetchpatch {
name = "GI_TYPELIB_PATH.patch";
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch";
hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k=";
})
];
strictDeps = true;