From 21aafaa5f931896d7d74897d73c6e992006f1329 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 15:18:03 +0300
Subject: [PATCH 01/70] nix-shell environment and basic drone ci config

---
 .drone.yml | 8 ++++++++
 shell.nix  | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 .drone.yml
 create mode 100644 shell.nix

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 00000000..95fdd11e
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,8 @@
+kind: pipeline
+type: exec
+name: default
+
+steps:
+  - name: build
+    commands:
+      - nix-shell --pure --run "flutter build apk --split-per-abi"
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 00000000..893e6913
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,5 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  nativeBuildInputs = [ pkgs.flutter ];
+}
-- 
2.42.0


From 756754f1a99ae5fff272cdda5e8d616411ed9ef7 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:23:35 +0300
Subject: [PATCH 02/70] try be impure

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 95fdd11e..99a746c6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,4 +5,4 @@ name: default
 steps:
   - name: build
     commands:
-      - nix-shell --pure --run "flutter build apk --split-per-abi"
+      - nix-shell --run "flutter build apk --split-per-abi"
-- 
2.42.0


From 1313c9f976da12fabfb4ee3537191acf6994c8f5 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:33:17 +0300
Subject: [PATCH 03/70] add environment variable

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 99a746c6..2c2dd5c5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,3 +6,5 @@ steps:
   - name: build
     commands:
       - nix-shell --run "flutter build apk --split-per-abi"
+    environment:
+      - NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
-- 
2.42.0


From cad77c16fb88819821574ad96ed8fc126218450e Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:33:56 +0300
Subject: [PATCH 04/70] fix syntax

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 2c2dd5c5..bdb702fb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,4 +7,4 @@ steps:
     commands:
       - nix-shell --run "flutter build apk --split-per-abi"
     environment:
-      - NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
+      - NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
-- 
2.42.0


From e06b143325d3f388adb54f59cef0d627c75b21b9 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:34:43 +0300
Subject: [PATCH 05/70] fix syntax

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index bdb702fb..67dc2567 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,4 +7,4 @@ steps:
     commands:
       - nix-shell --run "flutter build apk --split-per-abi"
     environment:
-      - NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
+      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
-- 
2.42.0


From 91a6079e593c40ef8ef2e52674f4ce9f50af3bef Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:43:21 +0300
Subject: [PATCH 06/70] be pure and add dart

---
 .drone.yml | 2 +-
 shell.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 67dc2567..875255c4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,6 @@ name: default
 steps:
   - name: build
     commands:
-      - nix-shell --run "flutter build apk --split-per-abi"
+      - nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
       NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
diff --git a/shell.nix b/shell.nix
index 893e6913..3f12f50d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,5 @@
 { pkgs ? import <nixpkgs> {} }:
 
 pkgs.mkShell {
-  nativeBuildInputs = [ pkgs.flutter ];
+  nativeBuildInputs = with pkgs; [ flutter dart ];
 }
-- 
2.42.0


From e882ace7a778e9e4c77d6839a0f07d55722bc515 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:50:12 +0300
Subject: [PATCH 07/70] debug

---
 .drone.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 875255c4..a5eb91d7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,8 @@ name: default
 steps:
   - name: build
     commands:
-      - nix-shell --pure --run "flutter build apk --split-per-abi"
+      - nix-shell --pure --run "flutter doctor -v"
+      - nix-shell --pure --run "dart --version"
+      #- nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
       NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
-- 
2.42.0


From eb9d8a704aaa86b9b0c33a8283ee50a4b3631b92 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 16:54:11 +0300
Subject: [PATCH 08/70] add android sdk

---
 shell.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/shell.nix b/shell.nix
index 3f12f50d..09859658 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,14 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; } }:
 
+let
+  androidComposition = pkgs.androidenv.composeAndroidPackages {
+    toolsVersion = "26.1.1";
+    platformToolsVersion = "33.0.2";
+    buildToolsVersions = [ "33.0.0" ];
+  };
+in
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [ flutter dart ];
+  ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
+  ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
+  nativeBuildInputs = with pkgs; [ flutter dart openjdk11 ];
 }
-- 
2.42.0


From 894fc45399831ed8a64427a9b1029ea68d5ef766 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 17:00:10 +0300
Subject: [PATCH 09/70] allow unfree nixpkgs

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index a5eb91d7..395067e8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,3 +10,4 @@ steps:
       #- nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
       NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
+      NIXPKGS_ALLOW_UNFREE: 1
-- 
2.42.0


From 6eb404fc11383522e3e0cba9124c2a3064ef6ddd Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 17:09:06 +0300
Subject: [PATCH 10/70] switch to unstable channel for ci

---
 .drone.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 395067e8..8331d514 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,9 +5,9 @@ name: default
 steps:
   - name: build
     commands:
-      - nix-shell --pure --run "flutter doctor -v"
-      - nix-shell --pure --run "dart --version"
-      #- nix-shell --pure --run "flutter build apk --split-per-abi"
+      #- nix-shell --pure --run "flutter doctor -v"
+      #- nix-shell --pure --run "dart --version"
+      - nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
-      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:/nix/var/nix/profiles/per-user/root/channels"
+      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
       NIXPKGS_ALLOW_UNFREE: 1
-- 
2.42.0


From d278f0f06bcc7d4710d8487d747bb79a702d905d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 17:11:47 +0300
Subject: [PATCH 11/70] delete unneded packages

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 09859658..6f3b3582 100644
--- a/shell.nix
+++ b/shell.nix
@@ -10,5 +10,5 @@ in
 pkgs.mkShell {
   ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
   ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-  nativeBuildInputs = with pkgs; [ flutter dart openjdk11 ];
+  nativeBuildInputs = with pkgs; [ flutter ];
 }
-- 
2.42.0


From 8dbb8548357858163e6c7ab1fc9f5f0921a998f6 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 17:17:35 +0300
Subject: [PATCH 12/70] add java

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 6f3b3582..fd729a2f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -10,5 +10,5 @@ in
 pkgs.mkShell {
   ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
   ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-  nativeBuildInputs = with pkgs; [ flutter ];
+  nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
 }
-- 
2.42.0


From 856e26bd9e614fa1a93e8f8d5106e2ad8c65dc3a Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 17:37:48 +0300
Subject: [PATCH 13/70] use unstable flutter thru channel

---
 .drone.yml | 2 +-
 shell.nix  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8331d514..a743b793 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,5 +9,5 @@ steps:
       #- nix-shell --pure --run "dart --version"
       - nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
-      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixpkgs"
+      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
       NIXPKGS_ALLOW_UNFREE: 1
diff --git a/shell.nix b/shell.nix
index fd729a2f..1f15e2fd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,8 @@
 { pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; } }:
 
 let
+  unstable = import (fetchTarball "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz") {};
+
   androidComposition = pkgs.androidenv.composeAndroidPackages {
     toolsVersion = "26.1.1";
     platformToolsVersion = "33.0.2";
@@ -10,5 +12,5 @@ in
 pkgs.mkShell {
   ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
   ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-  nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
+  nativeBuildInputs = with pkgs; [ unstable.flutter openjdk11_headless ];
 }
-- 
2.42.0


From 53ef810a0923900ccb8c2c86897f0f64f3d329ba Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 18:22:58 +0300
Subject: [PATCH 14/70] final version of ci spec

---
 .drone.yml | 2 +-
 shell.nix  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a743b793..6c43b6ee 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,5 +9,5 @@ steps:
       #- nix-shell --pure --run "dart --version"
       - nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
-      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+      NIX_PATH: "unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
       NIXPKGS_ALLOW_UNFREE: 1
diff --git a/shell.nix b/shell.nix
index 1f15e2fd..6ff05a0d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,15 @@
-{ pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; } }:
+{ pkgs ? import <unstable> { config.android_sdk.accept_license = true; } }:
 
 let
-  unstable = import (fetchTarball "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz") {};
-
   androidComposition = pkgs.androidenv.composeAndroidPackages {
     toolsVersion = "26.1.1";
     platformToolsVersion = "33.0.2";
-    buildToolsVersions = [ "33.0.0" ];
+    buildToolsVersions = [ "30.0.3" ];
+    platformVersions = [ "31" "30" "29" ];
   };
 in
 pkgs.mkShell {
   ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
   ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-  nativeBuildInputs = with pkgs; [ unstable.flutter openjdk11_headless ];
+  nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
 }
-- 
2.42.0


From 498c455f8ddce98f693e4862ddeb2cb998b215a5 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 18:25:39 +0300
Subject: [PATCH 15/70] fix nix shell

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 6c43b6ee..762a6f54 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,5 +9,5 @@ steps:
       #- nix-shell --pure --run "dart --version"
       - nix-shell --pure --run "flutter build apk --split-per-abi"
     environment:
-      NIX_PATH: "unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
+      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
       NIXPKGS_ALLOW_UNFREE: 1
-- 
2.42.0


From 5bf582b5ab0769d3ecd7278bad5b931d97de0721 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 20:57:24 +0300
Subject: [PATCH 16/70] trigger ci

-- 
2.42.0


From 2f6d1ce486c1e843e5bf0a435b04c49d27da6798 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 21:05:12 +0300
Subject: [PATCH 17/70] route ci to the builder server

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 762a6f54..c2cc84d2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,3 +11,6 @@ steps:
     environment:
       NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
       NIXPKGS_ALLOW_UNFREE: 1
+
+node:
+  server: builder
-- 
2.42.0


From ce1f7197003c3a67c9a0bc0f427498d2afde0660 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 21:17:25 +0300
Subject: [PATCH 18/70] route ci to the ci server

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index c2cc84d2..2ada30ae 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,4 +13,4 @@ steps:
       NIXPKGS_ALLOW_UNFREE: 1
 
 node:
-  server: builder
+  server: ci
-- 
2.42.0


From 357bb5e7b39dd7eca3f139f713e784fd266bfae6 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 27 Aug 2022 23:59:33 +0300
Subject: [PATCH 19/70] copy apks to repo

---
 .drone.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2ada30ae..fd7a5299 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,12 +5,11 @@ name: default
 steps:
   - name: build
     commands:
-      #- nix-shell --pure --run "flutter doctor -v"
-      #- nix-shell --pure --run "dart --version"
       - nix-shell --pure --run "flutter build apk --split-per-abi"
+      - scp build/app/outputs/apk/release/*.apk 10.0.0.3:/var/lib/fdroid/repo
     environment:
       NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
       NIXPKGS_ALLOW_UNFREE: 1
 
 node:
-  server: ci
+  server: builder
-- 
2.42.0


From 58b3c08b9f70b4abce02dc331c0aeb370c2cf6f5 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sun, 28 Aug 2022 00:05:13 +0300
Subject: [PATCH 20/70] split tasks

---
 .drone.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fd7a5299..35ee1961 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,10 +6,13 @@ steps:
   - name: build
     commands:
       - nix-shell --pure --run "flutter build apk --split-per-abi"
+  - name: deploy
+    commands:
       - scp build/app/outputs/apk/release/*.apk 10.0.0.3:/var/lib/fdroid/repo
-    environment:
-      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
-      NIXPKGS_ALLOW_UNFREE: 1
+
+environment:
+  NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
+  NIXPKGS_ALLOW_UNFREE: 1
 
 node:
   server: builder
-- 
2.42.0


From 74b52b317b7530c8215e3ed2bc440d29aa21414d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sun, 28 Aug 2022 00:08:28 +0300
Subject: [PATCH 21/70] fix environment variables

---
 .drone.yml | 8 ++++----
 shell.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 35ee1961..135e6378 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,13 +6,13 @@ steps:
   - name: build
     commands:
       - nix-shell --pure --run "flutter build apk --split-per-abi"
+    environment:
+      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
+      NIXPKGS_ALLOW_UNFREE: 1
+
   - name: deploy
     commands:
       - scp build/app/outputs/apk/release/*.apk 10.0.0.3:/var/lib/fdroid/repo
 
-environment:
-  NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
-  NIXPKGS_ALLOW_UNFREE: 1
-
 node:
   server: builder
diff --git a/shell.nix b/shell.nix
index 6ff05a0d..da57151a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,7 +9,7 @@ let
   };
 in
 pkgs.mkShell {
-  ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
+  ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
   ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
   nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
 }
-- 
2.42.0


From 50788fe21c3126ed5c3f5d1de687d31e634688ba Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:30:32 +0300
Subject: [PATCH 22/70] test ssh access

---
 .drone.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 135e6378..31a97d6c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,18 +1,12 @@
 kind: pipeline
 type: exec
-name: default
+name: debug
 
 steps:
-  - name: build
+  - name: test
     commands:
-      - nix-shell --pure --run "flutter build apk --split-per-abi"
-    environment:
-      NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
-      NIXPKGS_ALLOW_UNFREE: 1
-
-  - name: deploy
-    commands:
-      - scp build/app/outputs/apk/release/*.apk 10.0.0.3:/var/lib/fdroid/repo
+      - ssh-add - <<< "${SSH_PRIVATE_KEY}"
+      - ssh isolated echo hello
 
 node:
   server: builder
-- 
2.42.0


From f35ef53fdbe09cca9797a472b82d5edd5fa68876 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:32:01 +0300
Subject: [PATCH 23/70] test ssh access

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index 31a97d6c..9ff91b6b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,7 @@ name: debug
 steps:
   - name: test
     commands:
+      - eval `ssh-agent -s`
       - ssh-add - <<< "${SSH_PRIVATE_KEY}"
       - ssh isolated echo hello
 
-- 
2.42.0


From 7fba16388a1da56e08caaea0399b93e8e812600d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:33:30 +0300
Subject: [PATCH 24/70] test ssh access

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 9ff91b6b..f6e0bbd2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ steps:
   - name: test
     commands:
       - eval `ssh-agent -s`
-      - ssh-add - <<< "${SSH_PRIVATE_KEY}"
+      - echo "${SSH_PRIVATE_KEY}" | ssh-add -
       - ssh isolated echo hello
 
 node:
-- 
2.42.0


From 9cb60e515a2f9295ef5a415866356240f527a91c Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:42:37 +0300
Subject: [PATCH 25/70] test ssh access

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index f6e0bbd2..ed7a3f0e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,6 +8,9 @@ steps:
       - eval `ssh-agent -s`
       - echo "${SSH_PRIVATE_KEY}" | ssh-add -
       - ssh isolated echo hello
+    environment:
+      SSH_SECRET_KEY:
+        from_secret: SSH_SECRET_KEY
 
 node:
   server: builder
-- 
2.42.0


From 33304ae202992b2d62fb272e468808067c7832d8 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:43:59 +0300
Subject: [PATCH 26/70] test ssh access

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ed7a3f0e..f87c049d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,8 +9,8 @@ steps:
       - echo "${SSH_PRIVATE_KEY}" | ssh-add -
       - ssh isolated echo hello
     environment:
-      SSH_SECRET_KEY:
-        from_secret: SSH_SECRET_KEY
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
 
 node:
   server: builder
-- 
2.42.0


From 0d7712a3b9cde04cea561b113633f416b54e5023 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:44:37 +0300
Subject: [PATCH 27/70] test ssh access

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index f87c049d..a8077c9c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ steps:
   - name: test
     commands:
       - eval `ssh-agent -s`
-      - echo "${SSH_PRIVATE_KEY}" | ssh-add -
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - ssh isolated echo hello
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 9d743d61485fb087289a4aab5c5684e0ca7e18e7 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:47:35 +0300
Subject: [PATCH 28/70] try to copy contents to the build server

---
 .drone.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index a8077c9c..200a0346 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,7 +7,8 @@ steps:
     commands:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      - ssh isolated echo hello
+      - scp -r `pwd`/. isolated:/var/lib/builder/
+      - ssh isolated flutter doctor
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From 3ffb7e4bfeae2ad3c2f25ef9e1ad49972a5447f2 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:54:55 +0300
Subject: [PATCH 29/70] try to copy contents to the build server

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 200a0346..41e9742f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,8 +7,8 @@ steps:
     commands:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      - scp -r `pwd`/. isolated:/var/lib/builder/
-      - ssh isolated flutter doctor
+      - scp -r `pwd` isolated:/var/lib/builder/
+      - ssh isolated cd "$DRONE_REPO" && flutter doctor
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From 4ad7637663eb3af7ef05be9e4bc4e5a9cb7e5b08 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:55:30 +0300
Subject: [PATCH 30/70] try to copy contents to the build server

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 41e9742f..b36454e5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder/
-      - ssh isolated cd "$DRONE_REPO" && flutter doctor
+      - ssh isolated cd "$DRONE_REPO_NAME" && flutter doctor
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From db49fa69aac493c855868ab221d96df06e8d4e34 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 21:58:48 +0300
Subject: [PATCH 31/70] try to copy contents to the build server

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b36454e5..757923c7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,8 +7,8 @@ steps:
     commands:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      - scp -r `pwd` isolated:/var/lib/builder/
-      - ssh isolated cd "$DRONE_REPO_NAME" && flutter doctor
+      - scp -r `pwd` isolated:
+      - ssh isolated cd src && flutter doctor
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From cec5f6e256222105607f0be659668ca90595b43c Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 22:00:02 +0300
Subject: [PATCH 32/70] try to copy contents to the build server

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 757923c7..c4ec4428 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,7 +7,7 @@ steps:
     commands:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      - scp -r `pwd` isolated:
+      - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated cd src && flutter doctor
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From c04d45ee7d9da90ea21be4cde15094c1b3c64fe2 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 22:06:20 +0300
Subject: [PATCH 33/70] try to copy contents to the build server

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index c4ec4428..61d16382 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
-      - ssh isolated cd src && flutter doctor
+      - ssh isolated "cd src && flutter doctor"
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From 43ab7cfd21683aa3d0170145a724c28032c94c37 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 22:07:21 +0300
Subject: [PATCH 34/70] try to copy contents to the build server

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 61d16382..e625e03a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
-      - ssh isolated "cd src && flutter doctor"
+      - ssh isolated "cd src && flutter build apk --split-per-abi"
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From eeceb23bd92f9e97025d33f4f01b4ae65030869d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 22:47:49 +0300
Subject: [PATCH 35/70] ephemeral containers

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index e625e03a..7d0060ae 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,6 +5,8 @@ name: debug
 steps:
   - name: test
     commands:
+      - sudo nixos-container stop isolated
+      - sudo nixos-container start isolated
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
-- 
2.42.0


From fa814b95a63ffd48a9cc2760926262a0588a5d5d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 23:15:18 +0300
Subject: [PATCH 36/70] ephemeral containers

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7d0060ae..49fc2398 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,8 +5,8 @@ name: debug
 steps:
   - name: test
     commands:
-      - sudo nixos-container stop isolated
-      - sudo nixos-container start isolated
+      - nixos-container stop isolated
+      - nixos-container start isolated
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
-- 
2.42.0


From 10a9f6a5ef0724893aea94d2d34ca101fb82da80 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 30 Aug 2022 23:59:39 +0300
Subject: [PATCH 37/70] ephemeral containers

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 49fc2398..6465e97e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,9 @@
 kind: pipeline
 type: exec
-name: debug
+name: release
 
 steps:
-  - name: test
+  - name: build
     commands:
       - nixos-container stop isolated
       - nixos-container start isolated
-- 
2.42.0


From 1d8d970cac533e085a724b397ccee2d7f7c23be1 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 00:13:49 +0300
Subject: [PATCH 38/70] deploy artifacts

---
 .drone.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 6465e97e..7d71e219 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,9 +11,14 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated "cd src && flutter build apk --split-per-abi"
+      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*.apk `pwd`
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
+  - name: deploy
+    commands:
+      - ls
+
 node:
   server: builder
-- 
2.42.0


From 451d2c7aac1c2fb307de5b04bd3ab777e5afe40d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 00:45:50 +0300
Subject: [PATCH 39/70] deploy artifacts

---
 .drone.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7d71e219..5fac5064 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,14 +11,15 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated "cd src && flutter build apk --split-per-abi"
-      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*.apk `pwd`
+      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
+      - rename app pro.kherel.selfprivacy *.apk && rename release `git rev-parse --short HEAD` *.apk
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
   - name: deploy
     commands:
-      - ls
+      - ls *.apk
 
 node:
   server: builder
-- 
2.42.0


From 844269ee4fa39fb61aa35e37ac940ba0bb57295c Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 01:09:04 +0300
Subject: [PATCH 40/70] deploy artifacts

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 5fac5064..dd908aef 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,13 +12,13 @@ steps:
       - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated "cd src && flutter build apk --split-per-abi"
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
-      - rename app pro.kherel.selfprivacy *.apk && rename release `git rev-parse --short HEAD` *.apk
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
   - name: deploy
     commands:
+      - rename app pro.kherel.selfprivacy *.apk && rename release `git rev-parse --short HEAD` *.apk
       - ls *.apk
 
 node:
-- 
2.42.0


From 8a051da0f26768e0757c73d2a81340429f13aecf Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 13:17:35 +0300
Subject: [PATCH 41/70] ci pipeline

---
 .drone.yml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dd908aef..4a55d91c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,21 @@
 kind: pipeline
 type: exec
+name: ci
+
+steps:
+  - name: build
+    commands:
+      - flutter build apk --debug --split-per-abi
+      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
+      - ls *.apk
+
+node:
+  server: builder
+
+---
+kind: pipeline
+type: exec
 name: release
 
 steps:
@@ -10,7 +26,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       - scp -r `pwd` isolated:/var/lib/builder
-      - ssh isolated "cd src && flutter build apk --split-per-abi"
+      - ssh isolated "cd src && flutter build apk --release --split-per-abi"
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
     environment:
       SSH_PRIVATE_KEY:
@@ -18,8 +34,14 @@ steps:
 
   - name: deploy
     commands:
-      - rename app pro.kherel.selfprivacy *.apk && rename release `git rev-parse --short HEAD` *.apk
+      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_TAG" *.apk
       - ls *.apk
 
+trigger:
+  ref:
+    include:
+      - refs/tags/v.*
+
 node:
   server: builder
+
-- 
2.42.0


From 0ba249818716c880fd079708e50e6812ecff0be6 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 13:49:12 +0300
Subject: [PATCH 42/70] debug env

---
 .drone.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4a55d91c..8f45eca5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,10 +5,15 @@ name: ci
 steps:
   - name: build
     commands:
-      - flutter build apk --debug --split-per-abi
-      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
-      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
-      - ls *.apk
+#      - flutter build apk --debug --split-per-abi
+#      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+#      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
+#      - ls *.apk
+      - echo $JAVA_HOME $ANDROID_HOME $ANDROID_SDK_ROOT
+    environment:
+     JAVA_HOME: /nix/store/i9bbniszl2g4pkjy1lbcchg0lnk69xn6-openjdk-headless-11.0.15+10/lib/openjdk
+     ANDROID_HOME: /nix/store/xvr502awmkzaw29gv0nmg2yr29ksz5wy-androidsdk/libexec/android-sdk
+     ANDROID_SDK_ROOT: /nix/store/xvr502awmkzaw29gv0nmg2yr29ksz5wy-androidsdk/libexec/android-sdk
 
 node:
   server: builder
@@ -44,4 +49,3 @@ trigger:
 
 node:
   server: builder
-
-- 
2.42.0


From 573a3e8c0d866d4e8f5dcf06ee1193552820b311 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 13:51:30 +0300
Subject: [PATCH 43/70] try to build

---
 .drone.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8f45eca5..e01ee4b4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,11 +5,10 @@ name: ci
 steps:
   - name: build
     commands:
-#      - flutter build apk --debug --split-per-abi
-#      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
-#      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
-#      - ls *.apk
-      - echo $JAVA_HOME $ANDROID_HOME $ANDROID_SDK_ROOT
+      - flutter build apk --debug --split-per-abi
+      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
+      - ls *.apk
     environment:
      JAVA_HOME: /nix/store/i9bbniszl2g4pkjy1lbcchg0lnk69xn6-openjdk-headless-11.0.15+10/lib/openjdk
      ANDROID_HOME: /nix/store/xvr502awmkzaw29gv0nmg2yr29ksz5wy-androidsdk/libexec/android-sdk
-- 
2.42.0


From 1eb2eb0a1a9ebf83f9378a9738a35ce608fb9d4d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 13:57:09 +0300
Subject: [PATCH 44/70] remove unneeded envs

---
 .drone.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e01ee4b4..d435ce0c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,10 +9,6 @@ steps:
       - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
       - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
       - ls *.apk
-    environment:
-     JAVA_HOME: /nix/store/i9bbniszl2g4pkjy1lbcchg0lnk69xn6-openjdk-headless-11.0.15+10/lib/openjdk
-     ANDROID_HOME: /nix/store/xvr502awmkzaw29gv0nmg2yr29ksz5wy-androidsdk/libexec/android-sdk
-     ANDROID_SDK_ROOT: /nix/store/xvr502awmkzaw29gv0nmg2yr29ksz5wy-androidsdk/libexec/android-sdk
 
 node:
   server: builder
-- 
2.42.0


From 4e0d59120be9d8d5ca9cc40e2db0b31c110f53f1 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 14:21:54 +0300
Subject: [PATCH 45/70] debug env

---
 .drone.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d435ce0c..99bc4f99 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,10 +5,11 @@ name: ci
 steps:
   - name: build
     commands:
-      - flutter build apk --debug --split-per-abi
-      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
-      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
-      - ls *.apk
+#      - flutter build apk --debug --split-per-abi
+#      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+#      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
+#      - ls *.apk
+       - echo $JAVA_HOME $ANDROID_HOME $ANDROID_SDK_ROOT
 
 node:
   server: builder
-- 
2.42.0


From cb0016f1843570ffa3afbd62f07947bd56b52c6d Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 14:35:44 +0300
Subject: [PATCH 46/70] ci pipeline

---
 .drone.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 99bc4f99..f5b11695 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,11 +5,10 @@ name: ci
 steps:
   - name: build
     commands:
-#      - flutter build apk --debug --split-per-abi
-#      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
-#      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
-#      - ls *.apk
-       - echo $JAVA_HOME $ANDROID_HOME $ANDROID_SDK_ROOT
+      - flutter build apk --debug --split-per-abi
+      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+      - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
+      - ls *.apk
 
 node:
   server: builder
@@ -39,9 +38,8 @@ steps:
       - ls *.apk
 
 trigger:
-  ref:
-    include:
-      - refs/tags/v.*
+  event:
+    - tag
 
 node:
   server: builder
-- 
2.42.0


From 9c8d2526acb245f6378a80f8df684ba7c8ac050b Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 14:40:33 +0300
Subject: [PATCH 47/70] rename release artifacts to semver

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index f5b11695..7f02d753 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,7 +34,7 @@ steps:
 
   - name: deploy
     commands:
-      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_TAG" *.apk
+      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
       - ls *.apk
 
 trigger:
-- 
2.42.0


From f2960967435eca12634930c5579376885f86294e Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 14:55:54 +0300
Subject: [PATCH 48/70] trigger ci only on push and pr

---
 .drone.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 7f02d753..8017c406 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,6 +10,11 @@ steps:
       - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
       - ls *.apk
 
+trigger:
+  event:
+    - push
+    - pull_request
+
 node:
   server: builder
 
-- 
2.42.0


From f28580ba622fe530d15ce039c1b7dbd4aa031831 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 15:43:07 +0300
Subject: [PATCH 49/70] deploy on fdroid

---
 .drone.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8017c406..fe9e7d47 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,9 @@
 kind: pipeline
 type: exec
-name: ci
+name: Continuous Integration
 
 steps:
-  - name: build
+  - name: Build Debug Artifacts
     commands:
       - flutter build apk --debug --split-per-abi
       - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
@@ -19,17 +19,21 @@ node:
   server: builder
 
 ---
+
 kind: pipeline
 type: exec
-name: release
+name: Release
 
 steps:
-  - name: build
+  - name: Prepare for Build
     commands:
       - nixos-container stop isolated
       - nixos-container start isolated
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
+
+  - name: Build Release Artifacts
+    commands:
       - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated "cd src && flutter build apk --release --split-per-abi"
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
@@ -37,11 +41,18 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
-  - name: deploy
+  - name: Prepare for Deploy
     commands:
       - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
       - ls *.apk
 
+  - name: Deploy on F-Droid Repository
+    commands:
+      - ls *.apk
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
+
 trigger:
   event:
     - tag
-- 
2.42.0


From 0fc34669de4efe6a9f48f5b3e4ff2dbf2db56119 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 15:45:02 +0300
Subject: [PATCH 50/70] deploy on fdroid

---
 .drone.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fe9e7d47..ec040e07 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,15 +31,15 @@ steps:
       - nixos-container start isolated
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
 
   - name: Build Release Artifacts
     commands:
       - scp -r `pwd` isolated:/var/lib/builder
       - ssh isolated "cd src && flutter build apk --release --split-per-abi"
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
-    environment:
-      SSH_PRIVATE_KEY:
-        from_secret: SSH_PRIVATE_KEY
 
   - name: Prepare for Deploy
     commands:
@@ -49,9 +49,6 @@ steps:
   - name: Deploy on F-Droid Repository
     commands:
       - ls *.apk
-    environment:
-      SSH_PRIVATE_KEY:
-        from_secret: SSH_PRIVATE_KEY
 
 trigger:
   event:
-- 
2.42.0


From 1c9854e83b21abdd3564fa15eabfe7c5c4911789 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 15:53:02 +0300
Subject: [PATCH 51/70] deploy on fdroid

---
 .drone.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ec040e07..5a3f93ec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,30 +24,33 @@ kind: pipeline
 type: exec
 name: Release
 
-steps:
-  - name: Prepare for Build
-    commands:
-      - nixos-container stop isolated
-      - nixos-container start isolated
-      - eval `ssh-agent -s`
-      - echo "$SSH_PRIVATE_KEY" | ssh-add -
-    environment:
-      SSH_PRIVATE_KEY:
-        from_secret: SSH_PRIVATE_KEY
+environment:
+  SSH_PRIVATE_KEY:
+    from_secret: SSH_PRIVATE_KEY
 
+steps:
   - name: Build Release Artifacts
     commands:
+      # Prepare SSH keys
+      - eval `ssh-agent -s`
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
+      # Reset building environment
+      - nixos-container stop isolated
+      - nixos-container start isolated
+      # Copy sources to the building environment
       - scp -r `pwd` isolated:/var/lib/builder
+      # Build release artifacts
       - ssh isolated "cd src && flutter build apk --release --split-per-abi"
+      # Fetch the release artifacts
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
 
-  - name: Prepare for Deploy
-    commands:
-      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
-      - ls *.apk
-
   - name: Deploy on F-Droid Repository
     commands:
+      # Prepare SSH keys
+      - eval `ssh-agent -s`
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
+      # Rename the artifacts in a more informative way
+      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
       - ls *.apk
 
 trigger:
-- 
2.42.0


From 954f4ecda966f3257f1d7a6ac4f49d9b8f6f3855 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 15:55:04 +0300
Subject: [PATCH 52/70] deploy on fdroid

---
 .drone.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5a3f93ec..edb8dc17 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,10 +24,6 @@ kind: pipeline
 type: exec
 name: Release
 
-environment:
-  SSH_PRIVATE_KEY:
-    from_secret: SSH_PRIVATE_KEY
-
 steps:
   - name: Build Release Artifacts
     commands:
@@ -43,6 +39,9 @@ steps:
       - ssh isolated "cd src && flutter build apk --release --split-per-abi"
       # Fetch the release artifacts
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
 
   - name: Deploy on F-Droid Repository
     commands:
@@ -52,6 +51,9 @@ steps:
       # Rename the artifacts in a more informative way
       - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
       - ls *.apk
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
 
 trigger:
   event:
-- 
2.42.0


From 37c08a9db7103974beea8fb77a936c1315c62bd5 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 16:32:08 +0300
Subject: [PATCH 53/70] deploy on fdroid

---
 .drone.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index edb8dc17..74a13967 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,6 +39,9 @@ steps:
       - ssh isolated "cd src && flutter build apk --release --split-per-abi"
       # Fetch the release artifacts
       - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
+      # Rename the artifacts in a more informative way
+      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
+      - ls *.apk
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -48,9 +51,8 @@ steps:
       # Prepare SSH keys
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      # Rename the artifacts in a more informative way
-      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
-      - ls *.apk
+      # Copy the artifacts to the F-Droid repository
+      - scp *.apk ci:/var/lib/fdroid/unsigned
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From 2e1a1a0afe6079d1ebb400bc9d60c0a36b28ba4f Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 17:13:59 +0300
Subject: [PATCH 54/70] properly name fdroid artifacts

---
 .drone.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 74a13967..ece87434 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,11 +36,12 @@ steps:
       # Copy sources to the building environment
       - scp -r `pwd` isolated:/var/lib/builder
       # Build release artifacts
-      - ssh isolated "cd src && flutter build apk --release --split-per-abi"
+      - ssh isolated "cd src && flutter build apk --release"
       # Fetch the release artifacts
-      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/*-release.apk `pwd`
+      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/app-release.apk `pwd`
       # Rename the artifacts in a more informative way
-      - rename app pro.kherel.selfprivacy *.apk && rename release "$DRONE_SEMVER" *.apk
+      - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
+      - mv app-release.apk "pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
       - ls *.apk
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 331ec5ffc5161bb950d4f785804421d43d202cec Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 18:46:27 +0300
Subject: [PATCH 55/70] deploy on fdroid

---
 .drone.yml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ece87434..f38c33fc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,24 +25,33 @@ type: exec
 name: Release
 
 steps:
-  - name: Build Release Artifacts
+  - name: Prepare for Build
+    commands:
+      # Reset building environment
+      - nixos-container stop isolated
+      - nixos-container start isolated
+      # Prepare SSH keys
+      - eval `ssh-agent -s`
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
+      # Copy sources to the building environment
+      - scp -r `pwd` builder@isolated:/var/lib/builder
+
+  - name: Build and Sign Release Artifact for F-Droid Repository
     commands:
       # Prepare SSH keys
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      # Reset building environment
-      - nixos-container stop isolated
-      - nixos-container start isolated
-      # Copy sources to the building environment
-      - scp -r `pwd` isolated:/var/lib/builder
-      # Build release artifacts
-      - ssh isolated "cd src && flutter build apk --release"
-      # Fetch the release artifacts
-      - scp isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/app-release.apk `pwd`
-      # Rename the artifacts in a more informative way
+      # Build release artifact
+      - ssh builder@isolated "cd src && flutter build apk --release"
+      # Fetch the release artifact
+      - scp builder@isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/app-release.apk `pwd`
+      # Rename the artifact in a more informative way
       - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
       - mv app-release.apk "pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
-      - ls *.apk
+      # Upload and sign the artifact
+      - scp "pro.kherel.selfprivacy_$APP_BUILD_ID.apk" fdroid@isolated:/var/lib/fdroid/unsigned
+      - ssh fdroid@isolated "fdroid publish && fdroid update"
+      - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -53,7 +62,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Copy the artifacts to the F-Droid repository
-      - scp *.apk ci:/var/lib/fdroid/unsigned
+      - ls repo/
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From b7fe16c1b5bf19571b906d272882d81368b2a077 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 31 Aug 2022 18:49:15 +0300
Subject: [PATCH 56/70] deploy on fdroid

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index f38c33fc..419b0891 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,6 +35,9 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Copy sources to the building environment
       - scp -r `pwd` builder@isolated:/var/lib/builder
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
 
   - name: Build and Sign Release Artifact for F-Droid Repository
     commands:
-- 
2.42.0


From e368ba0c42091a52741dcc540c94e2f868d4f2fc Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Thu, 1 Sep 2022 03:54:16 +0300
Subject: [PATCH 57/70] isolated fdroid keys

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 419b0891..4a49f764 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -53,7 +53,7 @@ steps:
       - mv app-release.apk "pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
       # Upload and sign the artifact
       - scp "pro.kherel.selfprivacy_$APP_BUILD_ID.apk" fdroid@isolated:/var/lib/fdroid/unsigned
-      - ssh fdroid@isolated "fdroid publish && fdroid update"
+      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat .store-key` FDROID_KEY_PASS=`.repo-key` && fdroid publish && fdroid update"
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 6ddd5cf7c434e080e5c7cc82eb00303eb2c31080 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Thu, 1 Sep 2022 03:57:07 +0300
Subject: [PATCH 58/70] isolated fdroid keys

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 4a49f764..ac1424cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -53,7 +53,7 @@ steps:
       - mv app-release.apk "pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
       # Upload and sign the artifact
       - scp "pro.kherel.selfprivacy_$APP_BUILD_ID.apk" fdroid@isolated:/var/lib/fdroid/unsigned
-      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat .store-key` FDROID_KEY_PASS=`.repo-key` && fdroid publish && fdroid update"
+      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat .store-key` FDROID_KEY_PASS=`cat .repo-key` && fdroid publish && fdroid update"
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 014d5847212f7c549548c45666c74e9589f77f39 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 03:24:14 +0300
Subject: [PATCH 59/70] add standalone signing

---
 .drone.yml | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ac1424cf..db59e8e6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,21 +39,45 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
-  - name: Build and Sign Release Artifact for F-Droid Repository
+  - name: Build Intermediate Release Artifact
     commands:
       # Prepare SSH keys
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      # Build release artifact
+      # Build intermediate release artifact
       - ssh builder@isolated "cd src && flutter build apk --release"
       # Fetch the release artifact
       - scp builder@isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/app-release.apk `pwd`
-      # Rename the artifact in a more informative way
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
+
+  - name: Sign Release Artifact for Standalone Use
+    commands:
+      # Get app build ID
       - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
-      - mv app-release.apk "pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
+      # Prepare SSH keys
+      - eval `ssh-agent -s`
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
-      - scp "pro.kherel.selfprivacy_$APP_BUILD_ID.apk" fdroid@isolated:/var/lib/fdroid/unsigned
-      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat .store-key` FDROID_KEY_PASS=`cat .repo-key` && fdroid publish && fdroid update"
+      - scp app-release.apk builder@isolated:/var/lib/builder
+      - ssh builder@isolated "zipalign -f -v 4 app-release.apk standalone_app-release.apk && apksigner sign --ks /run/secrets/standalone-keystore --ks-key-alias standalone --ks-pass file:/run/secrets/standalone-keystore-pass standalone_app-release.apk"
+      # Fetch the signed artifact
+      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
+      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk.idsig"
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
+
+  - name: Sign Release Artifact for F-Droid Repository
+      # Get app build ID
+      - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
+      # Prepare SSH keys
+      - eval `ssh-agent -s`
+      - echo "$SSH_PRIVATE_KEY" | ssh-add -
+      # Upload and sign the artifact
+      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
+      - ssh fdroid@isolated "fdroid publish && fdroid update"
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
@@ -65,6 +89,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Copy the artifacts to the F-Droid repository
+      - ls
       - ls repo/
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 38a8880b1cbc9df99e57c3843fc864b8640fac38 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 03:28:03 +0300
Subject: [PATCH 60/70] add standalone signing

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index db59e8e6..dd22b076 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -70,6 +70,7 @@ steps:
         from_secret: SSH_PRIVATE_KEY
 
   - name: Sign Release Artifact for F-Droid Repository
+    commands:
       # Get app build ID
       - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
       # Prepare SSH keys
-- 
2.42.0


From 2ea278400e17df0aa8d944cb49fda97b43e135ff Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 04:00:25 +0300
Subject: [PATCH 61/70] add standalone signing

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index dd22b076..b2b54ec2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -78,7 +78,7 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
       - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
-      - ssh fdroid@isolated "fdroid publish && fdroid update"
+      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` && fdroid publish && fdroid update"
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 852ad48606cda3c70caaefe4bb145d2ebf9f09fc Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 04:32:57 +0300
Subject: [PATCH 62/70] add standalone signing

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index b2b54ec2..83b956fc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -78,7 +78,7 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
       - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
-      - ssh fdroid@isolated "export FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` && fdroid publish && fdroid update"
+      - ssh fdroid@isolated 'FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` fdroid publish && fdroid update'
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 62267fd7ac43efd5f54f8670aa04846e6ab3173a Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 04:43:45 +0300
Subject: [PATCH 63/70] add standalone signing

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 83b956fc..c6524da9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -77,7 +77,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
-      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
+      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
       - ssh fdroid@isolated 'FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` fdroid publish && fdroid update'
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
-- 
2.42.0


From 20f0bc0e795cf132e2d22c39c07839b06079c3f6 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 12:02:23 +0300
Subject: [PATCH 64/70] add standalone signing

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index c6524da9..99ce5b27 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -78,7 +78,7 @@ steps:
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
       - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
-      - ssh fdroid@isolated 'FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` fdroid publish && fdroid update'
+      - ssh fdroid@isolated 'export FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` && fdroid publish && fdroid update'
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
       SSH_PRIVATE_KEY:
-- 
2.42.0


From 04ab319dedc246f628109aead566867abd1cf50c Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 14:59:04 +0300
Subject: [PATCH 65/70] create gitea releases

---
 .drone.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 99ce5b27..0d3d9ec6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -84,6 +84,18 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
+  - name: Create release on Gitea Repository
+    commands:
+      # Prepare tea CLI
+      - tea login add --token "$GITEA_RELEASE_TOKEN" --url https://git.selfprivacy.org
+      # Create release and push artifacts
+      - tea releases --repo "$DRONE_REPO" create --tag "$DRONE_SEMVER" --title "$DRONE_SEMVER" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk".idsig
+    environment:
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
+      GITEA_RELEASE_TOKEN:
+        from_secret: GITEA_RELEASE_TOKEN
+
   - name: Deploy on F-Droid Repository
     commands:
       # Prepare SSH keys
-- 
2.42.0


From c1b2f95d9babc2a286240e4838da4374a7c560ac Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 15:02:47 +0300
Subject: [PATCH 66/70] create gitea releases

---
 .drone.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0d3d9ec6..19c6c7e3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -84,15 +84,13 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
 
-  - name: Create release on Gitea Repository
+  - name: Create Release on Gitea Repository
     commands:
       # Prepare tea CLI
       - tea login add --token "$GITEA_RELEASE_TOKEN" --url https://git.selfprivacy.org
       # Create release and push artifacts
-      - tea releases --repo "$DRONE_REPO" create --tag "$DRONE_SEMVER" --title "$DRONE_SEMVER" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk".idsig
+      - tea releases create --repo "$DRONE_REPO" --tag "$DRONE_SEMVER" --title "$DRONE_SEMVER" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk".idsig
     environment:
-      SSH_PRIVATE_KEY:
-        from_secret: SSH_PRIVATE_KEY
       GITEA_RELEASE_TOKEN:
         from_secret: GITEA_RELEASE_TOKEN
 
-- 
2.42.0


From 6debead430cb13dde8954b06dc1cc658854c4715 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 16:01:37 +0300
Subject: [PATCH 67/70] create gitea releases

---
 .drone.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 19c6c7e3..14d08ee6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -63,8 +63,8 @@ steps:
       - scp app-release.apk builder@isolated:/var/lib/builder
       - ssh builder@isolated "zipalign -f -v 4 app-release.apk standalone_app-release.apk && apksigner sign --ks /run/secrets/standalone-keystore --ks-key-alias standalone --ks-pass file:/run/secrets/standalone-keystore-pass standalone_app-release.apk"
       # Fetch the signed artifact
-      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
-      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/"standalone_pro.kherel.selfprivacy_$APP_BUILD_ID.apk.idsig"
+      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk"
+      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk.idsig `pwd`/standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk.idsig"
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -77,7 +77,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
-      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/"pro.kherel.selfprivacy_$APP_BUILD_ID.apk"
+      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/pro.kherel.selfprivacy_"$APP_BUILD_ID".apk
       - ssh fdroid@isolated 'export FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` && fdroid publish && fdroid update'
       - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
     environment:
@@ -86,10 +86,12 @@ steps:
 
   - name: Create Release on Gitea Repository
     commands:
+      # Get app build ID
+      - export APP_BUILD_ID=`yq '.version' pubspec.yaml | cut -d "+" -f2`
       # Prepare tea CLI
       - tea login add --token "$GITEA_RELEASE_TOKEN" --url https://git.selfprivacy.org
       # Create release and push artifacts
-      - tea releases create --repo "$DRONE_REPO" --tag "$DRONE_SEMVER" --title "$DRONE_SEMVER" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk" --asset standalone_"pro.kherel.selfprivacy_$APP_BUILD_ID.apk".idsig
+      - tea releases create --repo "$DRONE_REPO" --tag "$DRONE_SEMVER" --title "$DRONE_SEMVER" --asset standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk --asset standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk.idsig
     environment:
       GITEA_RELEASE_TOKEN:
         from_secret: GITEA_RELEASE_TOKEN
-- 
2.42.0


From ce5d779370565cb850969301440f6d80d8dadc4c Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 16:28:51 +0300
Subject: [PATCH 68/70] create gitea releases

---
 .drone.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 14d08ee6..52d04bdf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ steps:
   - name: Build Debug Artifacts
     commands:
       - flutter build apk --debug --split-per-abi
-      - mv build/app/outputs/flutter-apk/*-debug.apk `pwd`
+      - mv build/app/outputs/flutter-apk/*-debug.apk .
       - rename app pro.kherel.selfprivacy *.apk && rename debug "$DRONE_COMMIT" *.apk
       - ls *.apk
 
@@ -34,7 +34,7 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Copy sources to the building environment
-      - scp -r `pwd` builder@isolated:/var/lib/builder
+      - scp -r `pwd` builder@isolated:~
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -47,7 +47,7 @@ steps:
       # Build intermediate release artifact
       - ssh builder@isolated "cd src && flutter build apk --release"
       # Fetch the release artifact
-      - scp builder@isolated:/var/lib/builder/src/build/app/outputs/flutter-apk/app-release.apk `pwd`
+      - scp builder@isolated:src/build/app/outputs/flutter-apk/app-release.apk .
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -60,11 +60,11 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
-      - scp app-release.apk builder@isolated:/var/lib/builder
+      - scp app-release.apk builder@isolated:~
       - ssh builder@isolated "zipalign -f -v 4 app-release.apk standalone_app-release.apk && apksigner sign --ks /run/secrets/standalone-keystore --ks-key-alias standalone --ks-pass file:/run/secrets/standalone-keystore-pass standalone_app-release.apk"
       # Fetch the signed artifact
-      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk `pwd`/standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk"
-      - scp builder@isolated:/var/lib/builder/standalone_app-release.apk.idsig `pwd`/standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk.idsig"
+      - scp builder@isolated:standalone_app-release.apk standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk
+      - scp builder@isolated:standalone_app-release.apk.idsig standalone_pro.kherel.selfprivacy_"$APP_BUILD_ID".apk.idsig
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
@@ -77,9 +77,9 @@ steps:
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
       # Upload and sign the artifact
-      - scp app-release.apk fdroid@isolated:/var/lib/fdroid/unsigned/pro.kherel.selfprivacy_"$APP_BUILD_ID".apk
+      - scp app-release.apk fdroid@isolated:unsigned/pro.kherel.selfprivacy_"$APP_BUILD_ID".apk
       - ssh fdroid@isolated 'export FDROID_KEY_STORE_PASS=`cat /run/secrets/fdroid-keystore-pass` && fdroid publish && fdroid update'
-      - scp -r fdroid@isolated:/var/lib/fdroid/repo `pwd`
+      - scp -r fdroid@isolated:repo .
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From 7cdc8c9eb19895fac054300952f4c9e1645899ce Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 17:39:42 +0300
Subject: [PATCH 69/70] deploy fdroid repo to the production

---
 .drone.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 52d04bdf..eedcec9b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -96,14 +96,13 @@ steps:
       GITEA_RELEASE_TOKEN:
         from_secret: GITEA_RELEASE_TOKEN
 
-  - name: Deploy on F-Droid Repository
+  - name: Deploy F-Droid Repository
     commands:
       # Prepare SSH keys
       - eval `ssh-agent -s`
       - echo "$SSH_PRIVATE_KEY" | ssh-add -
-      # Copy the artifacts to the F-Droid repository
-      - ls
-      - ls repo/
+      # Copy the repository to the production server
+      - scp -r repo/* deployer@production:/var/www/fdroid.selfprivacy.org
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
-- 
2.42.0


From c5970afe5ba35ed958e8c4fda7685f44d403ba82 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 2 Sep 2022 20:28:14 +0300
Subject: [PATCH 70/70] use flakes shell

---
 flake.lock | 26 ++++++++++++++++++++++++++
 flake.nix  | 22 ++++++++++++++++++++++
 shell.nix  | 15 ---------------
 3 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix
 delete mode 100644 shell.nix

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..ca75926d
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,26 @@
+{
+  "nodes": {
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs-unstable": "nixpkgs-unstable"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000..ed8dad75
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,22 @@
+{
+  inputs.nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+
+  outputs = { self, nixpkgs-unstable }:
+    let
+      pkgs = import nixpkgs-unstable { config.allowUnfree = true; config.android_sdk.accept_license = true; };
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        toolsVersion = "26.1.1";
+        platformToolsVersion = "33.0.2";
+        buildToolsVersions = [ "30.0.3" ];
+        platformVersions = [ "31" "30" "29" ];
+      };
+    in {
+      devShell.x86_64-linux = pkgs.mkShell {
+        JAVA_HOME = "${pkgs.openjdk11_headless.home}";
+        ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
+        ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
+
+        buildInputs = with pkgs; [ bash git androidComposition.androidsdk flutter openjdk11_headless ];
+      };
+    };
+}
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index da57151a..00000000
--- a/shell.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs ? import <unstable> { config.android_sdk.accept_license = true; } }:
-
-let
-  androidComposition = pkgs.androidenv.composeAndroidPackages {
-    toolsVersion = "26.1.1";
-    platformToolsVersion = "33.0.2";
-    buildToolsVersions = [ "30.0.3" ];
-    platformVersions = [ "31" "30" "29" ];
-  };
-in
-pkgs.mkShell {
-  ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
-  ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-  nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
-}
-- 
2.42.0