Merge branch 'master' into staging

pkgs/development/tools/libsigrok/default.nix

@@ -1,22 +1,24 @@
 { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check
-, libserialport, librevisa
+, libserialport, librevisa, doxygen, glibmm, python
+, version ? "0.4.0", sha256 ? "17k63p3yhpx9qbfprgayphqqhn2hdrcph73g6fqxmrinxqziyaaz"
 }:
 
 stdenv.mkDerivation rec {
-  name = "libsigrok-0.3.0";
+  inherit version;
+  name = "libsigrok-${version}";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz";
-    sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
+    inherit sha256;
   };
 
   firmware = fetchurl {
-    url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz";
-    sha256 = "0w0w6l015d16181mx8mgyjha4bv3ba7x36p86k9n1x52809433gj";
+    url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
+    sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
   };
 
   buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport
-    librevisa
+    librevisa doxygen glibmm python
   ];
 
   postInstall = ''

pkgs/development/tools/libsigrokdecode/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
-  name = "libsigrokdecode-0.3.0";
+  name = "libsigrokdecode-0.4.0";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
-    sha256 = "13s7ss52dqj7fccjgrkx10zkj41ygxn8ml1l0bs1vgczz4fvnkpf";
+    sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx";
   };
 
   buildInputs = [ pkgconfig glib python3 libsigrok check ];

pkgs/development/tools/misc/autogen/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "autogen-${version}";
-  version = "5.18.6";
+  version = "5.18.7";
 
   src = fetchurl {
-    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
-    sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs";
+    url = "mirror://gnu/autogen/autogen-${version}.tar.xz";
+    sha256 = "01d4m8ckww12sy50vgyxlnz83z9dxqpyqp153cscncc9w6jq19d7";
   };
 
   outputs = [ "dev" "bin" "lib" "out" "man" "info" ];

pkgs/development/tools/misc/d-feet/default.nix

@@ -2,7 +2,7 @@
 , pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }:
 
 let
-  version = "${major}.10";
+  version = "${major}.11";
   major = "0.3";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
-    sha256 = "88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359";
+    sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2";
   };
 
   buildInputs = [

pkgs/development/tools/misc/usb-modeswitch/data.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }:
+
+let
+   version = "20160112";
+in
+
+stdenv.mkDerivation rec {
+  name = "usb-modeswitch-data-${version}";
+
+  src = fetchurl {
+     url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+     sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn";
+   };
+
+  # make clean: we always build from source. It should be necessary on x86_64 only
+  prePatch = ''
+    sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
+    sed -i "1 i\DESTDIR=$out" Makefile
+  '';
+
+  buildInputs = [ pkgconfig libusb1 usb-modeswitch ];
+
+  meta = {
+    description = "device database and the rules file for 'multi-mode' USB devices";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/tools/misc/usb-modeswitch/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 let
-   version = "2.2.1";
+   version = "2.3.0";
 in
 
 stdenv.mkDerivation rec {
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libusb1 ];
 
   meta = {
+    description = "a mode switching tool for controlling 'multi-mode' USB devices";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;

pkgs/development/tools/scalafmt/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip, jre }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.3";
+  baseName = "scalafmt";
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
+    sha256 = "0klzm86771wl6d8cq5cf4a4mfz8idcis6wrg0x2ix5rcc5zi0d4d";
+  };
+
+  unpackPhase = "tar xvzf $src";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/lib"
+
+    cp cli/target/scala-2.11/scalafmt.jar "$out/lib/${name}.jar"
+
+    cat > "$out/bin/${baseName}" << EOF
+    #!${stdenv.shell}
+    exec ${jre}/bin/java -jar "$out/lib/${name}.jar" "\$@"
+    EOF
+
+    chmod a+x "$out/bin/${baseName}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Opinionated code formatter for Scala";
+    homepage = http://scalafmt.org;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.markus1189 ];
+  };
+}

pkgs/development/tools/sigrok-cli/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
 
 stdenv.mkDerivation rec {
-  name = "sigrok-cli-0.5.0";
+  name = "sigrok-cli-0.6.0";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
-    sha256 = "0g3jzspq9iwz2szzxil9ilim1and85qd605f4jbc04sva80hb8vk";
+    sha256 = "0g3jhi7azm256gnryka70wn7j3af42yk19c9kbhqffaz4i7dwbmb";
   };
 
   buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ];