Merge pull request #200029 from teutat3s/bump/qMasterpassword

Sandro 61249a63 5ce5a814

Changed files
+20 -8
pkgs
applications
misc
qMasterPassword
top-level
+19 -7
pkgs/applications/misc/qMasterPassword/default.nix
···
-
{ lib, stdenv, mkDerivation, fetchFromGitHub, qtbase, qmake, qttools, libX11, libXtst, openssl, libscrypt }:
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, libX11
+
, libXtst
+
, qmake
+
, qtbase
+
, qttools
+
, qtwayland
+
, openssl
+
, libscrypt
+
, wrapQtAppsHook
+
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qMasterPassword";
-
version = "1.2.3";
+
version = "1.2.4";
src = fetchFromGitHub {
owner = "bkueng";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-eUJD9FoGaDzADKm3wZHs5Bhdt7RoM1WTTVNP6xUV7gs=";
+
sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";
};
-
buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];
-
nativeBuildInputs = [ qmake qttools ];
+
buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];
+
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
# Upstream install is mostly defunct. It hardcodes target.path and doesn't
# install anything but the binary.
···
'';
homepage = "https://github.com/bkueng/qMasterPassword";
license = licenses.gpl3;
-
maintainers = [ maintainers.tadeokondrak ];
+
maintainers = with lib.maintainers; [ tadeokondrak teutat3s ];
platforms = platforms.all;
};
}
+1 -1
pkgs/top-level/all-packages.nix
···
gtk2 = gtk2-x11;
-
qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };
+
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };