3 files changed, 129 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/by-name/pm/pm2/package.nix b/nixpkgs/pkgs/by-name/pm/pm2/package.nix
index 1b29f2fa52dc..20ad72df7853 100644
--- a/nixpkgs/pkgs/by-name/pm/pm2/package.nix
+++ b/nixpkgs/pkgs/by-name/pm/pm2/package.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "pm2";
-  version = "5.3.1";
+  version = "5.4.1";
 
   src = fetchFromGitHub {
     owner = "Unitech";
     repo = "pm2";
     rev = "v${version}";
-    hash = "sha256-thShqrnM5S3/IImEm+2vHVRLCsLJN5NGaSRYubtULW0=";
+    hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4=";
   };
 
-  npmDepsHash = "sha256-6M8kwiCHaQzcFyUUx7Yax/dobATWXG0Di7enEzlO8YE=";
+  npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA=";
 
   dontNpmBuild = true;
 
diff --git a/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix b/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix
new file mode 100644
index 000000000000..666f12396681
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -0,0 +1,122 @@
+{ stdenv
+, lib
+, git
+, openssl
+, ps
+, fetchFromGitLab
+, sudo
+, python3Packages
+, gitUpdater
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "pmbootstrap";
+  version = "2.3.1";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "postmarketos";
+    repo = pname;
+    rev = version;
+    hash = "sha256-0hC84Gyfr1FOpZGAc7pAhz/QBSTA5A/Lu/ZJdzlEcX4=";
+  };
+
+  pmb_test = "${src}/test";
+
+  # Tests depend on sudo
+  doCheck = stdenv.isLinux;
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    python3Packages.setuptools
+    git
+    openssl
+    ps
+    sudo
+  ];
+
+  # Add test dependency in PATH
+  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_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"
+  ];
+
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ git openssl ]}" ];
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = with lib; {
+    description =
+      "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
+    homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ onny lucasew ];
+    mainProgram = "pmbootstrap";
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix b/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix
index b6930bf1ef86..aa2f3ea91853 100644
--- a/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix
+++ b/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix
@@ -1,16 +1,16 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.19.1";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     rev = "v${version}";
-    hash = "sha256-JVx543uatVUWD1TmnjJBz4X/oHPKpbrGpGcxQd2IYiw=";
+    hash = "sha256-ZwTZtMNgQE0AIbxdjA+8CFKSp1B9QnV5wmP+z/JoIpg=";
   };
 
-  vendorHash = "sha256-N/8n3NDHShcXjPvLSkLRacY4aqFzLYM/+/mJRGXQAVg=";
+  vendorHash = "sha256-Buzk+rPSPrs0q+g6MWVb47cAIKMxsNXlj3CWA0JINXM=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
 
@@ -19,7 +19,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "The single-file utility for creating and working with PMTiles archives";
+    description = "Single-file utility for creating and working with PMTiles archives";
     homepage = "https://github.com/protomaps/go-pmtiles";
     license = licenses.bsd3;
     maintainers = [ maintainers.theaninova ];