summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-05-11 21:09:53 +0800
committerPeter Hoeg <peter@hoeg.com>2017-05-11 21:10:00 +0800
commit641c4116a9cb1fe71e2797a747d35342c0f938e2 (patch)
tree9de20ae72dcfdce60f3397a13aabaebd04c54dfb /pkgs/tools
parentb77a3466f8c85be2f58cc0f5c0467fcf104951ab (diff)
downloadnixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar.gz
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar.bz2
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar.lz
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar.xz
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.tar.zst
nixpkgs-641c4116a9cb1fe71e2797a747d35342c0f938e2.zip
kdiff3: 2016-04-20 -> 2017-02-19
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/text/kdiff3/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index bd76b89ccf7..124855525ac 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/)"'';