Unverified Commit 1619cf00 authored by Aliaksandr's avatar Aliaksandr
Browse files

qmasterpassword: move to by-name, rename

parent 437fe2ff

pkgs/applications/misc/qMasterPassword/default.nix→pkgs/by-name/qm/qmasterpassword/package.nix

+11 −15
Original line number Diff line number Diff line
@@ -5,32 +5,28 @@ 
  libx11,

  libxtst,

  cmake,

  qtbase,

  qttools,

  qtwayland,

  openssl,

  libscrypt,

  wrapQtAppsHook,

  testers,

  qMasterPassword,

  qt6,

  x11Support ? true,

  waylandSupport ? false,

}:



stdenv.mkDerivation rec {

  pname = "qMasterPassword";

stdenv.mkDerivation (finalAttrs: {

  pname = "qmasterpassword";

  version = "2.0.3";



  src = fetchFromGitHub {

    owner = "bkueng";

    repo = "qMasterPassword";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc=";

  };



  buildInputs = [

    qtbase

    qtwayland

    qt6.qtbase

    qt6.qtwayland

    openssl

    libscrypt

  ]
@@ -40,8 +36,8 @@ stdenv.mkDerivation rec { 
  ];

  nativeBuildInputs = [

    cmake

    qttools

    wrapQtAppsHook

    qt6.qttools

    qt6.wrapQtAppsHook

  ];

  cmakeFlags = lib.optionals waylandSupport [

    "-DDISABLE_FILL_FORM_SHORTCUTS=1"
@@ -71,8 +67,8 @@ stdenv.mkDerivation rec { 


  passthru = {

    tests.version = testers.testVersion {

      package = qMasterPassword;

      version = "v${version}";

      package = finalAttrs.finalPackage;

      version = "v${finalAttrs.version}";

    };

  };
@@ -92,4 +88,4 @@ stdenv.mkDerivation rec { 
    maintainers = with lib.maintainers; [ teutat3s ];

    platforms = lib.platforms.all;

  };

}
 
})

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1594,6 +1594,7 @@ mapAliases { 
  qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20

  qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21

  qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27

  qMasterPassword = warnAlias "'qMasterPassword' has been renamed to/replaced by 'qmasterpassword'" qmasterpassword; # Added 2026-02-01

  qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26

  qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19

  qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -12710,9 +12710,7 @@ with pkgs; 
    gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;

  };



  qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };



  qMasterPassword-wayland = qt6Packages.callPackage ../applications/misc/qMasterPassword {

  qMasterPassword-wayland = qmasterpassword.override {

    x11Support = false;

    waylandSupport = true;

  };