pmbootstrap: 3.0.0 -> 3.1.0, fix build, tweaking
Signed-off-by: lucasew <lucas59356@gmail.com>
This commit is contained in:
@@ -9,18 +9,20 @@
|
||||
sudo,
|
||||
python3Packages,
|
||||
gitUpdater,
|
||||
util-linux,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hUrWMU4V7tf/qVR4geR5FsCQ+BZA+zCPTdCZGN1PMKk=";
|
||||
tag = version;
|
||||
hash = "sha256-ijXyX+VJqiS0z5IOXGjeL2SGZ/4ledhnq/Zr1ZLW/Io=";
|
||||
domain = "gitlab.postmarketos.org";
|
||||
};
|
||||
|
||||
@@ -34,103 +36,46 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3Packages.pytestCheckHook
|
||||
git
|
||||
multipath-tools
|
||||
openssl
|
||||
ps
|
||||
python3Packages.pytestCheckHook
|
||||
sudo
|
||||
util-linux
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
# Add test dependency in PATH
|
||||
preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
|
||||
preCheck = ''
|
||||
export PYTHONPATH=$PYTHONPATH:${pmb_test}
|
||||
'';
|
||||
|
||||
# skip impure tests
|
||||
disabledTests = [
|
||||
"test_apk_static"
|
||||
"test_aportgen"
|
||||
"test_aportgen_device_wizard"
|
||||
"test_bootimg"
|
||||
"test_build_abuild_leftovers"
|
||||
"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_check"
|
||||
"test_can_fast_forward"
|
||||
"test_check_build_for_arch"
|
||||
"test_check_config"
|
||||
"test_chroot_arguments"
|
||||
"test_chroot_interactive_shell"
|
||||
"test_chroot_interactive_shell_user"
|
||||
"test_chroot_mount"
|
||||
"test_clean_worktree"
|
||||
"test_config_user"
|
||||
"test_cross_compile_distcc"
|
||||
"test_crossdirect"
|
||||
"test_extract_arch"
|
||||
"test_extract_version"
|
||||
"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_all_component_names"
|
||||
"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_pkgrepo_pmaports"
|
||||
"test_pkgrel_bump"
|
||||
"test_pmbootstrap_status"
|
||||
"test_print_checks_git_repo"
|
||||
"test_proxy"
|
||||
"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_skip_already_built"
|
||||
"test_switch_to_channel_branch"
|
||||
"test_version"
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
openssl
|
||||
multipath-tools
|
||||
util-linux
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
|
||||
homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
onny
|
||||
lucasew
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user