diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-12 11:29:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-12 12:03:37 +0200 |
| commit | 51e0f8f759250b77a7ab7529f5c7da5053465ff4 (patch) | |
| tree | 50de122859daf1dd33084735165df62fcb09d2e8 /pkgs/tools/text/kdiff3/default.nix | |
| parent | fc873b69f08a881fe16d6d09e3c829fe1bc2396a (diff) | |
| parent | e25665591b66038c668418c58eaf2810d8f1c90e (diff) | |
| download | nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.gz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.bz2 nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.lz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.xz nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.tar.zst nixlib-51e0f8f759250b77a7ab7529f5c7da5053465ff4.zip | |
Merge branch 'master' into staging
Some more larger rebuilds from master.
Diffstat (limited to 'pkgs/tools/text/kdiff3/default.nix')
| -rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index bd76b89ccf74..124855525ac6 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -4,16 +4,15 @@ }: let - rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; - unwrapped = kdeDerivation rec { name = "kdiff3-${version}"; - version = "1.7.0-${lib.strings.substring 0 7 rev}"; + version = "1.7.0-2017-02-19"; src = fetchgit { - url = "https://gitlab.com/tfischer/kdiff3"; - sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; - inherit rev; + # gitlab is outdated + url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; + sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; + rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; }; setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; |