From e941eff18abea342546fcd2973dbb54d6c2c1b37 Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 02:22:39 +0300 Subject: [PATCH 1/3] modem-manager-gui: 0.0.19.1 -> 0.0.20 Upstream source is on Sourceforge, but that's HTTP-only. --- .../networking/modem-manager-gui/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 38662bf7f699..1709db3bf031 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,8 +1,7 @@ { stdenv , pkgconfig , python3 -, fetchhg -, fetchpatch +, fetchFromGitLab , gtk3 , glib , gdbm @@ -18,12 +17,14 @@ stdenv.mkDerivation rec { pname = "modem-manager-gui"; - version = "0.0.19.1"; + version = "0.0.20"; - src = fetchhg { - url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; - rev = "version ${version}"; - sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "modem-manager-gui"; + rev = "upstream%2F${version}"; + sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; patches = [ From a041da0faa05345d14df220b9153163ed5dc9dbb Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 03:05:14 +0300 Subject: [PATCH 2/3] modem-manager-gui: remove docs patch Included in current release --- .../applications/networking/modem-manager-gui/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 1709db3bf031..811c89f6c815 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -27,14 +27,6 @@ stdenv.mkDerivation rec { sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; - patches = [ - # Fix docs build - (fetchpatch { - url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; - sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7"; - }) - ]; - nativeBuildInputs = [ pkgconfig python3 From 22e9ad4654a4f8affab077bdc6bc3569f4ab06e4 Mon Sep 17 00:00:00 2001 From: galagora Date: Thu, 27 Aug 2020 04:13:58 +0300 Subject: [PATCH 3/3] modem-manager-gui: replace libappindicator-gtk3 libappindicator-gtk3 is unmaintained, should be replaced with fork (see #96420) --- pkgs/applications/networking/modem-manager-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 811c89f6c815..64b1be363f34 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -8,7 +8,7 @@ , gtkspell3 , ofono , itstool -, libappindicator-gtk3 +, libayatana-appindicator-gtk3 , perlPackages , glibcLocales , meson @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libappindicator-gtk3 + libayatana-appindicator-gtk3 ]; postPatch = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; }; }