5 files changed, 50 insertions, 90 deletions
diff --git a/pkgs/tools/graphics/logstalgica/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index bdde9daea9f17..bdde9daea9f17 100644
--- a/pkgs/tools/graphics/logstalgica/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index e6787ec76c8a4..525c3ba9f2c49 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,50 +1,24 @@
-{ stdenv, fetchurl, fetchgit
+{ stdenv, fetchurl, fetchgit, bashCompletion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
+, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }:
 
-, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection
-, version ? "git"
-}:
+stdenv.mkDerivation rec {
+  name = "colord-1.1.5";
 
-# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db
-# thus they get symlinked to /etc and /var
-
-stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version {
-  "0.1.33" = {
-    name = "colord-0.1.33";
-    src = fetchurl {
-      url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz;
-      sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7";
-    };
-  };
-  "git" = {
-    name = "colord-git-11dca";
-    src = fetchgit {
-      url = "https://github.com/hughsie/colord.git";
-      rev = "11dcaba034edff3955ceff53795df82c57c34adc";
-      sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf";
-    };
-
-    preConfigure = ''
-      ./autogen.sh
-    '';
-    buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ];
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
+    sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j";
   };
-} {
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d"
-  '';
+  configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion";
 
-  buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus];
+  buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+                  bashCompletion ];
 
   postInstall = ''
-    sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules
-    mv $out/etc/colord.conf{,.default}
-    ln -s /etc/colord.conf $out/etc/colord.conf
     rm -fr $out/var/lib/colord
-    ln -s /var/lib/colord $out/var/lib/colord
   '';
 
   meta = {
@@ -54,4 +28,4 @@ stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version {
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
   };
-})
+}
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 443feee2ea032..a47a0397bf5a6 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -11,16 +11,13 @@ let
     sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
   };
 
-  version = "0.7.1";
-
 in
 stdenv.mkDerivation rec {
-  name = "filegive-${version}";
+  name = "filegive-0.7.4";
 
   src = fetchurl {
-    url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}";
-    name = "${name}.tar.gz";
-    sha256 = "14yyif6q89ihn28kliszaf19vywjg9f7192q1ak8823da1svbq8a";
+    url = "http://viric.name/soft/filegive/${name}.tar.gz";
+    sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index ebbfcb5d36081..e29433adae3cf 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,51 +1,18 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="siege";
-    version="2.70";
-    name="${baseName}-${version}";
-    url="ftp://ftp.joedog.org/pub/siege/${name}.tar.gz";
-    hash="14fxfmfsqwyahc91w4vn3n8hvclf78n4k1xllqsrpvjb5asvrd1w";
+{ stdenv, fetchurl, lib }:
+let
+  version = "3.0.5";
+  baseName = "siege";
+in stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+  src = fetchurl {
+    url = "http://www.joedog.org/pub/siege/${name}.tar.gz";
+    sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "createDirs" "doMakeInstall"];
-
-  createDirs = a.fullDepEntry ''
-    mkdir -p "$out/"{bin,lib,share/man,etc}
-  '' ["defEnsureDir"];
-
   meta = {
     description = "HTTP load tester";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.joedog.org/index/siege-home";
-    };
+    maintainers = with lib.maintainers; [ ocharles raskin ];
+    platforms = with lib.platforms; linux;
+    license = with lib.licenses; gpl2Plus;
   };
-}) x
-
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+}
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
new file mode 100644
index 0000000000000..83a89cfb6028b
--- /dev/null
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
+
+let release = "0.18.1"; in
+stdenv.mkDerivation {
+  name = "silver-searcher-${release}";
+
+  src = fetchgit {
+    url = "https://github.com/ggreer/the_silver_searcher.git";
+    rev = "refs/tags/${release}";
+    sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
+
+  meta = {
+    homepage = https://github.com/ggreer/the_silver_searcher/;
+    description = "A code-searching tool similar to ack, but faster";
+    maintainers = [ stdenv.lib.maintainers.madjar ];
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.asl20;
+  };
+}