From 985d2d0dec0a2041fa22ef38fb4f01e36ed7946a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 1 Aug 2021 19:04:49 +0200
Subject: [PATCH 1/3] nixos/captive-browser: fix startup

It seems as since Chromium 92, `chromium` crashes on startup if
`XDG_CONFIG_HOME` points to a read-only (store-)path.

(cherry picked from commit 8c35a69a6ea206204ddfd3116c4497020b9f2724)
---
 nixos/modules/programs/captive-browser.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix
index 1f223e2475c..007b0369ec1 100644
--- a/nixos/modules/programs/captive-browser.nix
+++ b/nixos/modules/programs/captive-browser.nix
@@ -27,6 +27,7 @@ in
       browser = mkOption {
         type = types.str;
         default = concatStringsSep " " [
+          ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
           ''${pkgs.chromium}/bin/chromium''
           ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
           ''--proxy-server="socks5://$PROXY"''
@@ -111,6 +112,7 @@ in
     security.wrappers.captive-browser = {
       capabilities = "cap_net_raw+p";
       source = pkgs.writeShellScript "captive-browser" ''
+        export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
         export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
                                   browser = """${cfg.browser}"""
                                   dhcp-dns = """${cfg.dhcp-dns}"""

From 655cc5e747af08a73bda49d96eb50677616eefab Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 1 Aug 2021 23:13:09 +0200
Subject: [PATCH 2/3] captive-browser: 2019-04-16 -> 2021-08-01

Had to do this manually, because this `name`->`pname` "refactoring"
makes automated backports impossible.

Changes: https://github.com/FiloSottile/captive-browser/compare/08450562e58bf9564ee98ad64ef7b2800e53338f...9c707dc32afc6e4146e19b43a3406329c64b6f3c
(cherry picked from commit bee0468d7ba37fffc19d509eaffdd49bf30ed9e1)
---
 .../networking/browsers/captive-browser/default.nix  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix
index b302be4e013..d764f74b614 100644
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/pkgs/applications/networking/browsers/captive-browser/default.nix
@@ -1,21 +1,21 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "captive-browser";
-  version = "2019-04-16";
-  goPackagePath = name;
+  pname = "captive-browser";
+  version = "2021-08-01";
+  goPackagePath = pname;
 
   src = fetchFromGitHub {
     owner  = "FiloSottile";
     repo   = "captive-browser";
-    rev    = "08450562e58bf9564ee98ad64ef7b2800e53338f";
-    sha256 = "17icgjg7h0xm8g4yy38qjhsvlz9pmlmj9kydz01y2nyl0v02i648";
+    rev    = "9c707dc32afc6e4146e19b43a3406329c64b6f3c";
+    sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y=";
   };
 
   meta = with lib; {
     description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
     homepage = "https://blog.filippo.io/captive-browser";
     license = licenses.mit;
-    maintainers = with maintainers; [ volth ];
+    maintainers = with maintainers; [ volth ma27 ];
   };
 }

From dd05346f79fe5256b631861b8f22d1df15d33bbd Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Mon, 26 Jul 2021 17:41:07 +0200
Subject: [PATCH 3/3] seahorse: add glib-networking for sync

(cherry picked from commit 9f629693f349ec0064a67bfdbffdfd1e8f2fb08c)
---
 pkgs/desktops/gnome/apps/seahorse/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix
index d46aed7bbe9..d09a4c9ff3e 100644
--- a/pkgs/desktops/gnome/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome/apps/seahorse/default.nix
@@ -7,6 +7,7 @@
 , pkg-config
 , gtk3
 , glib
+, glib-networking
 , wrapGAppsHook
 , itstool
 , gnupg
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3
     glib
+    glib-networking
     gcr
     gsettings-desktop-schemas
     gnupg