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: e5fd7ba15c48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bc0bf85781d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 21, 2019

  1. qtpass: 1.2.1 -> 1.2.3 

    Patch no longer needed (seems to be already applied, and notes mention).
    @dtzWill
    dtzWill committed Mar 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f7d2c23 View commit details

Commits on Mar 24, 2019

  1. Merge pull request #58075 from dtzWill/update/qtpass-1.2.3 

    qtpass: 1.2.1 -> 1.2.3
    @hrdinka
    hrdinka authored Mar 24, 2019
    Copy the full SHA
    2bc0bf8 View commit details
Showing with 4 additions and 22 deletions.
  1. +4 −9 pkgs/applications/misc/qtpass/default.nix
  2. +0 −13 pkgs/applications/misc/qtpass/hidpi.patch
13 changes: 4 additions & 9 deletions pkgs/applications/misc/qtpass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:

stdenv.mkDerivation rec {
name = "qtpass-${version}";
version = "1.2.1";
pname = "qtpass";
version = "1.2.3";

src = fetchFromGitHub {
owner = "IJHack";
repo = "QtPass";
rev = "v${version}";
sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8";
sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky";
};

patches = [ ./hidpi.patch ];

buildInputs = [ git gnupg pass qtbase qtsvg qttools ];

nativeBuildInputs = [ makeWrapper qmake ];

postPatch = ''
substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main"
substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src"
'';
enableParallelBuilding = true;

postInstall = ''
install -D qtpass.desktop $out/share/applications/qtpass.desktop
13 changes: 0 additions & 13 deletions pkgs/applications/misc/qtpass/hidpi.patch
View file

This file was deleted.