Merge master into staging-next

3 files changed, 15 insertions, 6 deletions

diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix
index 78504c1fc79d2..3d71482d4ead9 100644
--- a/pkgs/tools/misc/kakoune-cr/default.nix
+++ b/pkgs/tools/misc/kakoune-cr/default.nix
@@ -1,4 +1,4 @@
-{ lib, crystal, fetchFromGitHub, fetchurl, jq }:
+{ lib, crystal, fetchFromGitHub, fetchurl, jq, bash }:
 let
   icon = fetchurl {
     url = "https://github.com/mawww/kakoune/raw/master/doc/kakoune_logo.svg";
@@ -16,6 +16,7 @@ crystal.buildCrystalPackage rec {
     hash = "sha256-xFrxbnZl/49vGKdkESPa6LpK0ckq4Jv5GNLL/G0qA1w=";
   };
 
+  buildInputs = [ bash ];
   propagatedUserEnvPkgs = [ jq ];
 
   format = "shards";
diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix
index 7f2a3d150226c..1db9dc2e2103d 100644
--- a/pkgs/tools/misc/qflipper/default.nix
+++ b/pkgs/tools/misc/qflipper/default.nix
@@ -19,12 +19,14 @@
 , qtquickcontrols2
 , qtgraphicaleffects
 , qtwayland
+, nix-update-script
 }:
 let
-  version = "1.0.1";
+  pname = "qFlipper";
+  version = "1.0.2";
+  sha256 = "sha256-CJQOEUwYPNd4x+uBINrxeYVITtYrsEFaYLHQh2l12kA=";
   timestamp = "99999999999";
   commit = "nix-${version}";
-  hash = "sha256-vHBlrtQ06kjjXXGL/jSdpAPHgqb7Vn1c6jXZVXwxHPQ=";
 
   udev_rules = ''
     #Flipper Zero serial port
@@ -35,15 +37,14 @@ let
 
 in
 mkDerivation {
-  pname = "qFlipper";
-  inherit version;
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "flipperdevices";
     repo = "qFlipper";
     rev = version;
-    inherit hash;
     fetchSubmodules = true;
+    inherit sha256;
   };
 
   nativeBuildInputs = [
@@ -96,6 +97,10 @@ mkDerivation {
     EOF
   '';
 
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
   meta = with lib; {
     description = "Cross-platform desktop tool to manage your flipper device";
     homepage = "https://flipperzero.one/";
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix
index c392dd2802728..fe4ac3599a76a 100644
--- a/pkgs/tools/misc/upterm/default.nix
+++ b/pkgs/tools/misc/upterm/default.nix
@@ -2,6 +2,7 @@
 , buildGo118Module
 , fetchFromGitHub
 , installShellFiles
+, nixosTests
 }:
 
 buildGo118Module rec {
@@ -29,6 +30,8 @@ buildGo118Module rec {
 
   doCheck = true;
 
+  passthru.tests = { inherit (nixosTests) uptermd; };
+
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {