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

Commits on Mar 29, 2020

  1. kdiff3: 1.8.1 -> 1.8.2

    @r-ryantm
    r-ryantm committed Mar 29, 2020
    Copy the full SHA
    c27b5de View commit details

Commits on Mar 30, 2020

  1. Merge pull request #83723 from r-ryantm/auto-update/kdiff3 

    kdiff3: 1.8.1 -> 1.8.2
    @peterhoeg
    peterhoeg authored Mar 30, 2020
    Copy the full SHA
    639041e View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/text/kdiff3/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/text/kdiff3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,19 @@

mkDerivation rec {
pname = "kdiff3";
version = "1.8.1";
version = "1.8.2";

src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq";
sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv";
};

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ];

meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
homepage = "http://kdiff3.sourceforge.net/";
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
maintainers = with maintainers; [ peterhoeg ];