kdiff3: 1.11.5 -> 1.12.2

+10 -16
+10 -14
pkgs/tools/text/kdiff3/default.nix pkgs/by-name/kd/kdiff3/package.nix
··· 3 lib, 4 fetchurl, 5 extra-cmake-modules, 6 - kdoctools, 7 - wrapQtAppsHook, 8 boost, 9 - kcrash, 10 - kconfig, 11 - kinit, 12 - kparts, 13 - kiconthemes, 14 }: 15 16 stdenv.mkDerivation (finalAttrs: { 17 pname = "kdiff3"; 18 - version = "1.11.5"; 19 20 src = fetchurl { 21 url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; 22 - hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU="; 23 }; 24 25 nativeBuildInputs = [ 26 extra-cmake-modules 27 - kdoctools 28 - wrapQtAppsHook 29 ]; 30 31 - buildInputs = [ 32 boost 33 kconfig 34 kcrash 35 - kinit 36 kparts 37 kiconthemes 38 ]; 39 40 cmakeFlags = [ "-Wno-dev" ]; 41 42 postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' 43 ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin" 44 ''; ··· 49 homepage = "https://invent.kde.org/sdk/kdiff3"; 50 license = licenses.gpl2Plus; 51 maintainers = with maintainers; [ peterhoeg ]; 52 - platforms = with platforms; linux ++ darwin; 53 }; 54 })
··· 3 lib, 4 fetchurl, 5 extra-cmake-modules, 6 boost, 7 + kdePackages, 8 }: 9 10 stdenv.mkDerivation (finalAttrs: { 11 pname = "kdiff3"; 12 + version = "1.12.2"; 13 14 src = fetchurl { 15 url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; 16 + hash = "sha256-MaN8vPnUIHintIRdQqwaAzp9cjKlq66qAo9kJbufpDk="; 17 }; 18 19 nativeBuildInputs = [ 20 extra-cmake-modules 21 + kdePackages.kdoctools 22 + kdePackages.wrapQtAppsHook 23 ]; 24 25 + buildInputs = with kdePackages; [ 26 + qtbase 27 boost 28 kconfig 29 kcrash 30 kparts 31 kiconthemes 32 ]; 33 34 cmakeFlags = [ "-Wno-dev" ]; 35 36 + env.LANG = "C.UTF-8"; 37 + 38 postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' 39 ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin" 40 ''; ··· 45 homepage = "https://invent.kde.org/sdk/kdiff3"; 46 license = licenses.gpl2Plus; 47 maintainers = with maintainers; [ peterhoeg ]; 48 + inherit (kdePackages.qtbase.meta) platforms; 49 }; 50 })
-2
pkgs/top-level/all-packages.nix
··· 4046 4047 kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; 4048 4049 - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; 4050 - 4051 kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; 4052 4053 peruse = libsForQt5.callPackage ../tools/misc/peruse { };
··· 4046 4047 kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; 4048 4049 kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; 4050 4051 peruse = libsForQt5.callPackage ../tools/misc/peruse { };