Skip to content

Commit

Permalink
Merge pull request #35316 from peterhoeg/u/pk
Browse files Browse the repository at this point in the history
packagekit: 1.1.7 -> 1.1.8 (packagekit-qt: init at 1.0.1)
  • Loading branch information
peterhoeg committed Feb 22, 2018
2 parents cdaedbf + 353b00f commit 1fa6097
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/packagekit/default.nix
Expand Up @@ -8,13 +8,13 @@

stdenv.mkDerivation rec {
name = "packagekit-${version}";
version = "1.1.7";
version = "1.1.8";

src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit";
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb";
sha256 = "0bn9flsjbzlwmlbv2gphqwgzy9sx8ahch28z6dzgak4csbz5wcws";
};

buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]
Expand Down
24 changes: 24 additions & 0 deletions pkgs/tools/package-management/packagekit/qt.nix
@@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qttools, packagekit }:

stdenv.mkDerivation rec {
name = "packagekit-qt-${version}";
version = "1.0.1";

src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit-Qt";
rev = "v${version}";
sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk";
};

buildInputs = [ packagekit ];

nativeBuildInputs = [ cmake pkgconfig qttools ];

enableParallelBuilding = true;

meta = packagekit.meta // {
description = "System to facilitate installing and updating packages - Qt";
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -4027,6 +4027,8 @@ with pkgs;
nix = nixUnstable;
};

packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { };

packetdrill = callPackage ../tools/networking/packetdrill { };

padthv1 = callPackage ../applications/audio/padthv1 { };
Expand Down

0 comments on commit 1fa6097

Please sign in to comment.