diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-02-22 16:04:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 16:04:34 +0800 |
| commit | 1fa60974e723bdcf7073d23399d506c4cbd7bb32 (patch) | |
| tree | 31fd61644a119686aa25a58e65656d0db0340557 | |
| parent | cdaedbffd8334b2aad359408ef2fc6715eb12a2d (diff) | |
| parent | 353b00f2962b8ad23854e039571b6f053e10bc33 (diff) | |
| download | nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar.gz nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar.bz2 nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar.lz nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar.xz nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.tar.zst nixlib-1fa60974e723bdcf7073d23399d506c4cbd7bb32.zip | |
Merge pull request #35316 from peterhoeg/u/pk
packagekit: 1.1.7 -> 1.1.8 (packagekit-qt: init at 1.0.1)
| -rw-r--r-- | pkgs/tools/package-management/packagekit/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/packagekit/qt.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 78ef19706d18..4f027560547f 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -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 ] diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix new file mode 100644 index 000000000000..c38ef25f3548 --- /dev/null +++ b/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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c3869b421f6..87e11668d7b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |