From 16371a37b97635505397346a2e5e0341cae3864e Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 30 Sep 2022 18:10:18 -0700 Subject: [PATCH 1/5] upstream element electron update --- nixpatches/list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 21c03949a..718e922fe 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -64,7 +64,8 @@ fetchpatch: [ # element-desktop: upgrade electron 19 -> 20 (fetchpatch { - url = "https://git.uninsane.org/colin/nixpkgs/commit/7e6a47b3904f5d8f2a37c35ff2d12772524727a9.diff"; + # url = "https://git.uninsane.org/colin/nixpkgs/commit/7e6a47b3904f5d8f2a37c35ff2d12772524727a9.diff"; + url = "https://github.com/NixOS/nixpkgs/pull/193799.diff"; sha256 = "sha256-OcqDIoBcphGZfeeOzaS7Ip1khocpkYrpG6tMGExa3S4="; }) ] From 151fdad014d83770606c21a65a27ec838815a4ae Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 30 Sep 2022 17:00:05 -0700 Subject: [PATCH 2/5] phosh-mobile-settings: init at 0.21.1 --- nixpatches/list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 718e922fe..06d25ff0c 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -68,4 +68,10 @@ fetchpatch: [ url = "https://github.com/NixOS/nixpkgs/pull/193799.diff"; sha256 = "sha256-OcqDIoBcphGZfeeOzaS7Ip1khocpkYrpG6tMGExa3S4="; }) + + # phosh-mobile-settings: init at 0.21.1 + (fetchpatch { + url = "https://git.uninsane.org/colin/nixpkgs/commit/002e6527a404600f81951547566b4c8fc769f1da.diff"; + sha256 = "sha256-omIDd+ZpMtmcdbyXYAMWYk4JuLpVSUwHOGQ1v8kWmz4="; + }) ] From 56f484f4608cd904ed3e73820cf19771343b2bef Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 30 Sep 2022 17:19:08 -0700 Subject: [PATCH 3/5] install phosh-mobile-settings --- modules/gui/phosh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/phosh.nix b/modules/gui/phosh.nix index b1281842e..9f91c55c8 100644 --- a/modules/gui/phosh.nix +++ b/modules/gui/phosh.nix @@ -60,6 +60,8 @@ in }; sane.home-manager.extraPackages = with pkgs; [ + phosh-mobile-settings + # TODO: see about removing this if the in-built gnome-settings bluetooth manager can work gnome.gnome-bluetooth ]; From b88a20b0f45ee7f77006f992bc328cb53e9d98df Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 30 Sep 2022 18:03:20 -0700 Subject: [PATCH 4/5] phosh-mobile-settings: link phosh plugins into the plugins dir --- nixpatches/list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 06d25ff0c..4fc4dde6a 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -71,7 +71,7 @@ fetchpatch: [ # phosh-mobile-settings: init at 0.21.1 (fetchpatch { - url = "https://git.uninsane.org/colin/nixpkgs/commit/002e6527a404600f81951547566b4c8fc769f1da.diff"; - sha256 = "sha256-omIDd+ZpMtmcdbyXYAMWYk4JuLpVSUwHOGQ1v8kWmz4="; + url = "https://git.uninsane.org/colin/nixpkgs/commit/8222214abb1992bac5bb37d1285abcfafb8992be.diff"; + sha256 = "sha256-bgbmrT4e7n/lqrGpw58PRylHFHP9lzbiv93Dg30e2SY="; }) ] From f78b06bc88eb33ee06bf957da51e41addd127bb7 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 30 Sep 2022 18:27:07 -0700 Subject: [PATCH 5/5] phosh-mobile-settings: remove the unneeded gnome schema ref --- nixpatches/list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 4fc4dde6a..ec4c21530 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -71,7 +71,7 @@ fetchpatch: [ # phosh-mobile-settings: init at 0.21.1 (fetchpatch { - url = "https://git.uninsane.org/colin/nixpkgs/commit/8222214abb1992bac5bb37d1285abcfafb8992be.diff"; - sha256 = "sha256-bgbmrT4e7n/lqrGpw58PRylHFHP9lzbiv93Dg30e2SY="; + url = "https://git.uninsane.org/colin/nixpkgs/commit/43bc666dfc85cf563c64c6651ca860488bbbcba1.diff"; + sha256 = "sha256-d/N7n8RV1eX5HY9p0131NyaADAQzNVy/5QQ0gsQghlY="; }) ]