pyrox.dev
modemmanager: 1.22.0 -> 1.24.0
- removed GI_TYPELIB_PATH.patch as merged upstream into 1.24.0
- expanded patch to remove dummy dirs in sysconfdir
+11
pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
+11
pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
···
18
mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
19
-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdiruser))
20
meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdirpackage))
21
+
diff --git a/data/dispatcher-modem-setup/meson.build b/data/dispatcher-modem-setup/meson.build
22
+
index 812152a3..7527022b 100644
23
+
--- a/data/dispatcher-modem-setup/meson.build
24
+
+++ b/data/dispatcher-modem-setup/meson.build
25
+
@@ -22,5 +22,4 @@ install_data(
26
+
)
27
+
28
+
mkdir_cmd = 'mkdir -p ${DESTDIR}@0@'
29
+
-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdiruser))
30
+
meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_modemsetupdirpackage))
31
+
+2
-8
pkgs/by-name/mo/modemmanager/package.nix
+2
-8
pkgs/by-name/mo/modemmanager/package.nix
···
31
32
stdenv.mkDerivation rec {
33
pname = "modemmanager";
34
-
version = "1.22.0";
35
36
src = fetchFromGitLab {
37
domain = "gitlab.freedesktop.org";
38
owner = "mobile-broadband";
39
repo = "ModemManager";
40
rev = version;
41
-
hash = "sha256-/D9b2rCCUhpDCUfSNAWR65+3EyUywzFdH1R17eSKRDo=";
42
};
43
44
patches = [
45
# Since /etc is the domain of NixOS, not Nix, we cannot install files there.
46
# But these are just placeholders so we do not need to install them at all.
47
./no-dummy-dirs-in-sysconfdir.patch
48
-
49
-
(fetchpatch {
50
-
name = "GI_TYPELIB_PATH.patch";
51
-
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch";
52
-
hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k=";
53
-
})
54
];
55
56
strictDeps = true;
···
31
32
stdenv.mkDerivation rec {
33
pname = "modemmanager";
34
+
version = "1.24.0";
35
36
src = fetchFromGitLab {
37
domain = "gitlab.freedesktop.org";
38
owner = "mobile-broadband";
39
repo = "ModemManager";
40
rev = version;
41
+
hash = "sha256-3jI75aR2esmv5dkE4TrdCHIcCvtdOBKnBC5XLEKoVFs=";
42
};
43
44
patches = [
45
# Since /etc is the domain of NixOS, not Nix, we cannot install files there.
46
# But these are just placeholders so we do not need to install them at all.
47
./no-dummy-dirs-in-sysconfdir.patch
48
];
49
50
strictDeps = true;