From 3e0b37f2d15eb41f8dff3046d0789915243da7d8 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+julm-nix@sourcephile.fr>
Date: Thu, 20 Oct 2022 00:42:28 +0200
Subject: [PATCH] mmsd: push in nixpkgs#196965
---
hosts/aubergine/networking.nix | 2 +-
hosts/aubergine/networking/lte.nix | 1 -
nixos/modules.nix | 1 -
nixos/modules/mmsd.nix | 37 ---------------------
nixpkgs/overlays.nix | 6 ----
nixpkgs/patches.nix | 5 +++
nixpkgs/pkgs/mmsd-tng.nix | 53 ------------------------------
7 files changed, 6 insertions(+), 99 deletions(-)
delete mode 100644 nixos/modules/mmsd.nix
delete mode 100644 nixpkgs/pkgs/mmsd-tng.nix
diff --git a/hosts/aubergine/networking.nix b/hosts/aubergine/networking.nix
index cd9fe2e..bedf547 100644
--- a/hosts/aubergine/networking.nix
+++ b/hosts/aubergine/networking.nix
@@ -12,7 +12,7 @@ imports = [
../../nixos/profiles/wireguard/wg-intra.nix
];
install.substituteOnDestination = false;
-networking.domain = "sourcephile.fr";
+networking.domain = "wg";
networking.useDHCP = false;
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
diff --git a/hosts/aubergine/networking/lte.nix b/hosts/aubergine/networking/lte.nix
index 4ac3890..40213f2 100644
--- a/hosts/aubergine/networking/lte.nix
+++ b/hosts/aubergine/networking/lte.nix
@@ -75,7 +75,6 @@ environment.systemPackages = [
pkgs.libmbim
pkgs.chatty
pkgs.gnome.gnome-contacts
- pkgs.mmsd-tng
pkgs.picocom
pkgs.calls
pkgs.dfeet
diff --git a/nixos/modules.nix b/nixos/modules.nix
index 8ef508f..2351406 100644
--- a/nixos/modules.nix
+++ b/nixos/modules.nix
@@ -1,7 +1,6 @@
{ pkgs, lib, config, ... }:
{
imports = [
- modules/mmsd.nix
modules/security/systemd-creds.nix
];
}
diff --git a/nixos/modules/mmsd.nix b/nixos/modules/mmsd.nix
deleted file mode 100644
index 89a6c24..0000000
--- a/nixos/modules/mmsd.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, lib, config, ... }:
-with lib;
-let
- cfg = config.services.mmsd;
- dbusServiceFile = pkgs.writeTextDir "share/dbus-1/services/org.ofono.mms.service" ''
- [D-BUS Service]
- Name=org.ofono.mms
- SystemdService=dbus-org.ofono.mms.service
-
- # Exec= is still required despite SystemdService= being used:
- # https://github.com/freedesktop/dbus/blob/ef55a3db0d8f17848f8a579092fb05900cc076f5/test/data/systemd-activation/com.example.SystemdActivatable1.service
- Exec=${pkgs.coreutils}/bin/false mmsd
- '';
-in
-{
- options.services.mmsd = {
- enable = mkEnableOption "Multimedia Messaging Service Daemon";
- extraArgs = mkOption {
- type = with types; listOf str;
- default = [];
- example = ["--debug"];
- };
- };
- config = mkIf cfg.enable {
- services.dbus.packages = [ dbusServiceFile ];
- systemd.user.services.mmsd = {
- after = [ "ModemManager.service" ];
- aliases = [ "dbus-org.ofono.mms.service" ];
- serviceConfig = {
- Type = "dbus";
- ExecStart = "${pkgs.mmsd-tng}/bin/mmsdtng " + escapeShellArgs cfg.extraArgs;
- BusName = "org.ofono.mms";
- Restart = "on-failure";
- };
- };
- };
-}
diff --git a/nixpkgs/overlays.nix b/nixpkgs/overlays.nix
index 29d85a6..91267cb 100644
--- a/nixpkgs/overlays.nix
+++ b/nixpkgs/overlays.nix
@@ -5,10 +5,4 @@ map import
overlays/podl.nix
overlays/vim-ghcid-quickfix.nix
overlays/zerobin.nix
- #overlays/chatty.nix
-] ++
-[
- (final: prev: {
- mmsd-tng = final.callPackage pkgs/mmsd-tng.nix {};
- })
]
diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 7376c4b..96f90dd 100644
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -9,4 +9,9 @@
url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
sha256 = "sha256-FVp0ogzLwYbQuU8Luj+yAmFOjGC4ZyyQLSybRdfQLoA=";
}
+{
+ meta.description = "mmsd";
+ url = "https://github.com/NixOS/nixpkgs/pull/196965.diff";
+ sha256 = "sha256-7hNuN2RUzLT0hZmITIEdRK3k7xu07I7XC1m8NPN+BYU=";
+}
]
diff --git a/nixpkgs/pkgs/mmsd-tng.nix b/nixpkgs/pkgs/mmsd-tng.nix
deleted file mode 100644
index 2818451..0000000
--- a/nixpkgs/pkgs/mmsd-tng.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, stdenv
-, fetchFromGitLab
-, c-ares
-, dbus
-, glib
-, libphonenumber
-, libsoup
-, meson
-, mobile-broadband-provider-info
-, modemmanager
-, ninja
-, pkg-config
-, protobuf
-}:
-
-stdenv.mkDerivation rec {
- pname = "mmsd-tng";
- version = "1.12.1";
-
- src = fetchFromGitLab {
- owner = "kop316";
- repo = "mmsd";
- rev = version;
- sha256 = "sha256-fhbiTJWmQwJpuMaVX2qWyWwJ/2Y/Vczo//+0T0b6jhA=";
- };
-
- nativeBuildInputs = [
- meson
- ninja
- pkg-config
- ];
-
- buildInputs = [
- c-ares
- dbus
- glib
- libphonenumber
- libsoup
- mobile-broadband-provider-info
- modemmanager
- protobuf
- ];
-
- doCheck = true;
-
- meta = with lib; {
- description = "Multimedia Messaging Service Daemon - The Next Generation";
- homepage = "https://gitlab.com/kop316/mmsd";
- license = licenses.gpl2;
- maintainers = with maintainers; [ julm ];
- platforms = platforms.linux;
- };
-}
--
2.47.2