12 files changed, 129 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
new file mode 100644
index 000000000000..bc3785181a8f
--- /dev/null
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, perl, libusb }:
+
+stdenv.mkDerivation rec {
+
+  name="avarice-2.13";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avarice/${name}.tar.bz2";
+    sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1";
+  };
+
+  buildInputs = [ pkgconfig perl libusb ];
+
+  meta = {
+    license = stdenv.lib.licenses.gpl2;
+    description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol";
+    homepage = http://sourceforge.net/projects/avarice/files/avarice/;
+    maintainers = [ stdenv.lib.maintainers.smironov ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 7a294e720781..7574500dbbb2 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, yacc, flex, texLive }:
+{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }:
 
 let edf = composableDerivation.edf; in
 
@@ -6,13 +6,13 @@ composableDerivation.composableDerivation {} rec {
   name="avrdude-5.10";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz";
+    url = "mirror://savannah/avrdude/${name}.tar.gz";
     sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
 
-  buildInputs = [ yacc flex ];
+  buildInputs = [ yacc flex libusb ];
 
   flags =
        edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e1afceebaa23..ca763a5e1fb3 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
+{ stdenv, fetchurl, noSysDirs, zlib
+, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null
+, deterministic ? false }:
 
 let basename = "binutils-2.23.1"; in
 stdenv.mkDerivation rec {
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     # That requires upstream changes for things to work. So we can patch it to
     # get the old behaviour by now.
     ./dtneeded.patch
-  ];
+  ] ++ (stdenv.lib.optional deterministic ./deterministic.patch);
 
   buildInputs =
     [ zlib ]
@@ -48,7 +50,8 @@ stdenv.mkDerivation rec {
       + stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
         " --enable-fix-loongson2f-nop"
       + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
-      + stdenv.lib.optionalString gold " --enable-gold";
+      + stdenv.lib.optionalString gold " --enable-gold"
+      + stdenv.lib.optionalString deterministic " --enable-deterministic-archives";
 
   enableParallelBuilding = true;
       
diff --git a/pkgs/development/tools/misc/binutils/deterministic.patch b/pkgs/development/tools/misc/binutils/deterministic.patch
new file mode 100644
index 000000000000..736e0aca6ce1
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/deterministic.patch
@@ -0,0 +1,12 @@
+diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c
+--- orig/ld/ldlang.c
++++ new/ld/ldlang.c
+@@ -3095,6 +3095,8 @@
+                           ldfile_output_machine))
+     einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
+ 
++  link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT;
++
+   link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
+   if (link_info.hash == NULL)
+     einfo (_("%P%F: can not create hash table: %E\n"));
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
new file mode 100644
index 000000000000..63c585b00a95
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="cl-launch";
+    version="3.21.1";
+    name="${baseName}-${version}";
+    hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz";
+    sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  preConfigure = ''
+    export makeFlags="$makeFlags PREFIX='$out'"
+    mkdir -p "$out/bin"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''Common Lisp launcher script'';
+    license = stdenv.lib.licenses.llgpl21 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream
new file mode 100644
index 000000000000..1ff5daca02c5
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.upstream
@@ -0,0 +1,2 @@
+url http://common-lisp.net/project/xcvb/cl-launch/
+version_link '.-[0-9].*[0-9][.]tar[.].*'
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index 00ff11c3c880..0c82c2cd2759 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "indent-2.2.10";
 
   src = fetchurl {
-    url = "ftp://ftp.gnu.org/gnu/indent/${name}.tar.gz";
+    url = "mirror://gnu/indent/${name}.tar.gz";
     sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
   };
 
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index da44a7d73a56..7681c8153dbb 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,7 +3,7 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.0.13";
+    version="2.0.13-rc1";
     name="${baseName}-${version}";
     hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y";
     url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz";
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index c87bd9d55354..e0da284887cc 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.7.0";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2";
+    url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
     sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj";
   };
 
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
new file mode 100644
index 000000000000..25140093f516
--- /dev/null
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, libtool, groff, ghostscript }:
+
+stdenv.mkDerivation rec {
+  name = "srecord-1.62";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/srecord/${name}.tar.gz";
+    sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904";
+  };
+
+  buildInputs = [ boost libtool groff ghostscript ];
+
+  meta = with stdenv.lib; {
+    description = "Collection of powerful tools for manipulating EPROM load files";
+    homepage = http://srecord.sourceforge.net/;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
new file mode 100644
index 000000000000..496288285c7b
--- /dev/null
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "stm32flash-1.0";
+
+  src = fetchurl {
+    url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz;
+    sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6";
+  };
+
+  buildInputs = [];
+
+  installPhase = ''
+    # Manually copy, make install copies to /usr/local/bin
+    mkdir -pv $out/bin/
+    cp stm32flash $out/bin/
+  '';
+
+  meta = { 
+    description = "Open source flash program for the STM32 ARM processors using the ST bootloader.";
+    homepage = https://code.google.com/p/stm32flash/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all; # Should work on all platforms
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix
index 2089142284f4..7fa604e4af65 100644
--- a/pkgs/development/tools/misc/texi2html/default.nix
+++ b/pkgs/development/tools/misc/texi2html/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "texi2html-1.82";
 
   src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2";
+    url = "mirror://savannah/texi2html/${name}.tar.bz2";
     sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n";
   };