Commit Graph

20 Commits

Author SHA1 Message Date
Peter Hoeg
641c4116a9 kdiff3: 2016-04-20 -> 2017-02-19 2017-05-11 21:10:00 +08:00
Vladimír Čunát
5a3e454db3
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Vladimír Čunát
b72d4e13c7
kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Vladimír Čunát
be7ce1b0e9
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Michael Raskin
8565047bdd kdiff3: fix build 2017-03-19 12:16:32 +01:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
c9de5eca0f
Remove kde4.kdiff3
- Already updated to KDE 5 in Nixpkgs
2017-02-24 16:48:32 -06:00
Peter Hoeg
8d803b90ac kdiff3-qt5: init at 1.7.0
Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
2017-02-02 13:01:40 +08:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Vladimír Čunát
8a4827a881 kdiff3: minor update 2014-08-14 19:43:27 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
6726776c74 kdiff3: maintenance update 2013-07-05 14:45:59 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Yury G. Kudryashov
8b4f571491 kdiff3-0.9.96
svn path=/nixpkgs/trunk/; revision=32348
2012-02-17 13:29:34 +00:00
Karn Kallio
a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps.
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Karn Kallio
6a2f1f3d72 Remove kdebase as input to kdiff3.
Seems not to be needed and gives evaluation error when with kde4.7

svn path=/nixpkgs/trunk/; revision=28197
2011-08-06 18:01:56 +00:00
Yury G. Kudryashov
51ac7f1a27 Patch kdiff3 so it will build with KDE 4.5.2
The DocBook DTD version must be at least 4.2 for validation.  Add a patch
to change version number in the DOCTYPE.

Submitted by Karn Kallio

svn path=/nixpkgs/trunk/; revision=24382
2010-10-20 11:59:13 +00:00
Yury G. Kudryashov
b86b382b50 kdiff3 cleanup
svn path=/nixpkgs/trunk/; revision=24381
2010-10-20 11:59:06 +00:00
Yury G. Kudryashov
673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00