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] 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 ];
 }