From 6901a575abb04c27427caff00a6a557ef74d11d0 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <cds@corbinsimpson.com>
Date: Wed, 24 Nov 2021 15:14:32 -0800
Subject: [PATCH] pmbootstrap: 1.30.0 -> 1.39.0 (#146576)

---
 pkgs/tools/misc/pmbootstrap/default.nix | 87 +++++++++++++------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix
index 3f75e8e33af0..f3cacf32cf1e 100644
--- a/pkgs/tools/misc/pmbootstrap/default.nix
+++ b/pkgs/tools/misc/pmbootstrap/default.nix
@@ -1,13 +1,13 @@
-{ lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps
+{ stdenv, lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps
 , fetchPypi, fetchFromGitLab }:
 
 buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "1.30.0";
+  version = "1.39.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uHN3nplQOMuBeQIxAocCVqwnmJUQZL67+iXLhQ7onps=";
+    sha256 = "13krdb0xmwgldfn8izm1x3j6i6s4n9j8n8n0p4g5kd74ygkvfczz";
   };
 
   repo = fetchFromGitLab {
@@ -15,7 +15,7 @@ buildPythonApplication rec {
     owner = "postmarketOS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-JunI/mqq+UvmzNVt3mdJN3+tKGN4uTrxkUU2imCNCNY=";
+    sha256 = "0mrhgi5y3jwd922cmm2niy9ia0g8p6bsqjjxg523yandshpa3683";
   };
 
   pmb_test = "${repo}/test";
@@ -23,64 +23,65 @@ buildPythonApplication rec {
   checkInputs = [ pytestCheckHook git openssl ps ];
 
   # Add test dependency in PATH
-  checkPhase = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
+  preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
 
   # skip impure tests
   disabledTests = [
-    "test_get_apkbuild"
-    "test_check_build_for_arch"
-    "test_get_depends"
-    "test_build_depends_no_binary_error"
-    "test_build_depends_binary_outdated"
-    "test_init_buildenv"
-    "test_run_abuild"
-    "test_finish"
-    "test_package"
-    "test_build_depends_high_level"
-    "test_build_local_source_high_level"
-    "test_chroot_interactive_shell"
-    "test_chroot_interactive_shell_user"
-    "test_chroot_arguments"
-    "test_switch_to_channel_branch"
-    "test_read_config_channel"
-    "test_cross_compile_distcc"
-    "test_build_src_invalid_path"
-    "test_can_fast_forward"
-    "test_clean_worktree"
-    "test_get_upstream_remote"
-    "test_pull"
-    "test_helpers_package_get_apkindex"
-    "test_filter_missing_packages_invalid"
-    "test_filter_missing_packages_binary_exists"
-    "test_filter_missing_packages_pmaports"
-    "test_filter_aport_packages"
-    "test_pmbootstrap_status"
-    "test_print_checks_git_repo"
-    "test_helpers_ui"
-    "test_newapkbuild"
-    "test_package_from_aports"
-    "test_recurse_invalid"
-    "test_questions_bootimg"
-    "test_questions_keymaps"
-    "test_questions_work_path"
-    "test_questions_channel"
     "test_apk_static"
     "test_aportgen"
     "test_aportgen_device_wizard"
     "test_bootimg"
+    "test_build_depends_binary_outdated"
+    "test_build_depends_high_level"
+    "test_build_depends_no_binary_error"
     "test_build_is_necessary"
+    "test_build_local_source_high_level"
+    "test_build_src_invalid_path"
+    "test_can_fast_forward"
+    "test_check_build_for_arch"
+    "test_chroot_arguments"
+    "test_chroot_interactive_shell"
+    "test_chroot_interactive_shell_user"
+    "test_clean_worktree"
     "test_config_user"
+    "test_cross_compile_distcc"
     "test_crossdirect"
     "test_file"
+    "test_filter_aport_packages"
+    "test_filter_missing_packages_binary_exists"
+    "test_filter_missing_packages_invalid"
+    "test_filter_missing_packages_pmaports"
+    "test_finish"
     "test_folder_size"
+    "test_get_apkbuild"
+    "test_get_depends"
+    "test_get_upstream_remote"
     "test_helpers_lint"
+    "test_helpers_package_get_apkindex"
     "test_helpers_repo"
+    "test_helpers_ui"
+    "test_init_buildenv"
     "test_kconfig_check"
     "test_keys"
+    "test_newapkbuild"
+    "test_package"
+    "test_package_from_aports"
     "test_pkgrel_bump"
+    "test_pmbootstrap_status"
+    "test_print_checks_git_repo"
+    "test_pull"
     "test_qemu_running_processes"
+    "test_questions_additional_options"
+    "test_questions_bootimg"
+    "test_questions_channel"
+    "test_questions_keymaps"
+    "test_questions_work_path"
+    "test_read_config_channel"
+    "test_recurse_invalid"
+    "test_run_abuild"
     "test_run_core"
     "test_shell_escape"
+    "test_switch_to_channel_branch"
     "test_version"
   ];
 
@@ -91,5 +92,7 @@ buildPythonApplication rec {
     homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ payas ];
+    # https://github.com/NixOS/nixpkgs/pull/146576#issuecomment-974267651
+    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }