From 9e5f97e405541170499f137dbf2473dc9a2d1a9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Jun 2024 16:35:22 +0000
Subject: [PATCH] =?UTF-8?q?networkmanager-iodine:=20unstable-2019-11-05=20?=
 =?UTF-8?q?=E2=86=92=201.2.0-unstable-2024-05-12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/network-manager-iodine/-/compare/2ef0abf089b00a0546f214dde0d45e63f2990b79...8ec0a35e12047ccf256b3951897c701661ddb8af

- Removes nm-glib https://gitlab.gnome.org/GNOME/network-manager-iodine/-/commit/dca561224903ea0dc68fdd77011fc47e59dae961
---
 .../networkmanager/iodine/default.nix          | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix
index 0aa607ca2a05..fa706f1b5892 100644
--- a/pkgs/tools/networking/networkmanager/iodine/default.nix
+++ b/pkgs/tools/networking/networkmanager/iodine/default.nix
@@ -12,21 +12,20 @@
   gtk3,
   withGnome ? true,
   unstableGitUpdater,
-  fetchpatch,
   libnma,
   glib,
 }:
 
 stdenv.mkDerivation {
   pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
-  version = "unstable-2019-11-05";
+  version = "1.2.0-unstable-2024-05-12";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "network-manager-iodine";
-    rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79";
-    sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7";
+    rev = "8ec0a35e12047ccf256b3951897c701661ddb8af";
+    sha256 = "cNjznry8wi1UmE5khf0JCEYjs9nDU/u8lFLte53MLTM=";
   };
 
   patches = [
@@ -34,11 +33,6 @@ stdenv.mkDerivation {
       src = ./fix-paths.patch;
       inherit iodine;
     })
-    # Don't use etc/dbus-1/system.d
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/network-manager-iodine/merge_requests/2.patch";
-      sha256 = "108pkf0mddj32s46k7jkmpwcaq2ylci4dqpp7wck3zm9q2jffff2";
-    })
   ];
 
   nativeBuildInputs = [
@@ -60,7 +54,6 @@ stdenv.mkDerivation {
     ];
 
   configureFlags = [
-    "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
     "--enable-absolute-paths"
@@ -70,11 +63,6 @@ stdenv.mkDerivation {
     intltoolize
   '';
 
-  env = {
-    # glib-2.62 deprecations
-    NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
-  };
-
   passthru = {
     updateScript = unstableGitUpdater {
       tagPrefix = "v";