From d83cadf84172ef46d76707c2c7408876b0d3372c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 31 Aug 2017 15:12:52 +0100 Subject: [PATCH] photoqt: 1.3 -> 1.5.1 related to #28643 --- pkgs/applications/graphics/photoqt/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 22db78b81254..a3c8d805b234 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cmake, exiv2, graphicsmagick -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools +{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw +, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects }: -let - version = "1.3"; -in stdenv.mkDerivation rec { name = "photoqt-${version}"; + version = "1.5.1"; + src = fetchurl { url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; + sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qtquickcontrols qttools exiv2 graphicsmagick - qtmultimedia qtdeclarative + qtmultimedia qtdeclarative libraw qtgraphicaleffects ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2124b237ac7b..5ba13b013c18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15668,7 +15668,7 @@ with pkgs; pflask = callPackage ../os-specific/linux/pflask {}; - photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoqt = libsForQt56.callPackage ../applications/graphics/photoqt { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };