Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 86e68d02b35a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c47fc5727af5
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 8, 2019

  1. qtpass: 1.3.0 -> 1.3.1 

    https://github.com/IJHack/QtPass/releases/tag/v1.3.1
    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    a009dcd View commit details

  2. qtpass: point to lupdate

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    7d733bb View commit details

  3. qtpass: install man page

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    a6ab41f View commit details

  4. qtpass: add pwgen as optional runtime dep

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    6362fec View commit details

  5. Merge pull request #70686 from dtzWill/update/qtpass-1.3.1 

    qtpass: 1.3.0 -> 1.3.1, fixups
    @teto
    teto authored Oct 8, 2019
    Copy the full SHA
    c47fc57 View commit details
Showing with 16 additions and 18 deletions.
  1. +16 −18 pkgs/applications/misc/qtpass/default.nix
34 changes: 16 additions & 18 deletions pkgs/applications/misc/qtpass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch
, git, gnupg, pass, qtbase, qtsvg, qttools, qmake
{ lib, mkDerivation, fetchFromGitHub
, git, gnupg, pass, pwgen
, qtbase, qtsvg, qttools, qmake
}:

mkDerivation rec {
pname = "qtpass";
version = "1.3.0";
version = "1.3.1";

src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv";
sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08";
};

buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
buildInputs = [ git gnupg pass qtbase qtsvg ];

nativeBuildInputs = [ qmake ];

# Fix missing app icon on Wayland. Has been upstreamed and should be safe to
# remove in versions > 1.3.0
patches = [
(fetchpatch {
url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch";
sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr";
})
];
nativeBuildInputs = [ qmake qttools ];

enableParallelBuilding = true;

qmakeFlags = [
# setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
"QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
];

qtWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
"--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}"
];

postInstall = ''
install -D qtpass.desktop $out/share/applications/qtpass.desktop
install -D qtpass.desktop -t $out/share/applications
install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
install -D qtpass.1 -t $out/share/man/man1
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "A multi-platform GUI for pass, the standard unix password manager";
homepage = https://qtpass.org;
license = licenses.gpl3;