mmsd: push in nixpkgs#196965

diff --git a/hosts/aubergine/networking.nix b/hosts/aubergine/networking.nix
index cd9fe2e0f5285b35875d59d2ebfcf69de63fd843..bedf5471b26b83dfaa92c0c6449c181d9ffaee27 100644 (file)
--- 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 4ac38903ffbabcb01c51fde31eac9212f3831e58..40213f280f4b591495f19daeabee805a3b99c28b 100644 (file)
--- 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 8ef508fa857666fcca8cee640816cc0b11d6880f..2351406c26b0ff8a811d20a5d763141d7aea58b3 100644 (file)
--- 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 (file)
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 29d85a6c884a27d59d2ba040a89c72a0a73c4ace..91267cbcd2b126d0b4b00bffc23dbf5129cf1bde 100644 (file)
--- 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 7376c4ba510e3f9e7087a0ab7eda970c0d0fb350..96f90dd237c26c88c72a93c429ea6b2734be35b4 100644 (file)
--- 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 (file)
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;
-  };
-}