Merge branch 'master' into staging

pkgs/development/tools/analysis/kcov/default.nix

@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "code coverage tester for compiled programs, Python scripts and shell scripts";
 
-    longDescription =
-      '' Kcov is a code coverage tester for compiled programs, Python
+    longDescription = ''
+      Kcov is a code coverage tester for compiled programs, Python
       scripts and shell scripts. It allows collecting code coverage
       information from executables without special command-line
       arguments, and continuosly produces output from long-running
       applications.
-      '';
+    '';
 
-    homePage = http://simonkagstrom.github.io/kcov/index.html;
+    homepage = http://simonkagstrom.github.io/kcov/index.html;
     license = licenses.gpl2;
 
     maintainers = [ maintainers.gal_bolle ];

pkgs/development/tools/build-managers/gradle/default.nix

@@ -51,11 +51,11 @@ rec {
   };
 
   gradleLatest = gradleGen rec {
-    name = "gradle-2.12";
+    name = "gradle-2.13";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0p5b6dngza6c2lchz5j0w4cbsizpzvkf638yzxv09k8636c68w77";
+      sha256 = "0r5nrgrb14fi1p4cx5q5x82nghhrzdd843dsyzx6ay56lp35wrhg";
     };
   };
 

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

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "3.08.00";
+  version = "3.08.01";
 
   buildInputs = [ perl icmake ];
 
   src = fetchFromGitHub {
-    sha256 = "107jhywx0xdyp7yll1c5zwngzjl3yvg1b4yan8wl2acnbrv6hwa4";
+    sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";

pkgs/development/tools/pypi2nix/default.nix

@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, python, zip, makeWrapper
+}:
+
+let
+  deps = import ./deps.nix { inherit fetchurl; };
+  version = "1.0.0";
+  src = fetchurl {
+    url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
+    sha256 = "1rbwkmsllg8wxv45xyvc3vh97na0zxxydcfqrvig496xkylvw2rn";
+    
+  };
+in stdenv.mkDerivation rec {
+  name = "pypi2nix-${version}";
+  srcs = with deps; [ src pip click setuptools zcbuildout zcrecipeegg ];
+  buildInputs = [ python zip makeWrapper ];
+  sourceRoot = ".";
+
+  postUnpack = ''
+    mkdir -p $out/pkgs
+
+    mv pip-*/pip                        $out/pkgs/pip
+    mv click-*/click                    $out/pkgs/click
+    mv setuptools-*/setuptools          $out/pkgs/setuptools
+    mv zc.buildout-*/src/zc             $out/pkgs/zc
+    mv zc.recipe.egg-*/src/zc/recipe    $out/pkgs/zc/recipe
+
+    if [ "$IN_NIX_SHELL" != "1" ]; then
+      if [ -e git-export ]; then
+        mv git-export/src/pypi2nix      $out/pkgs/pypi2nix
+      else
+        mv pypi2nix*/src/pypi2nix       $out/pkgs/pypi2nix
+      fi
+    fi
+  '';
+
+  commonPhase = ''
+    mkdir -p $out/bin
+
+    echo "#!${python}/bin/python"  >  $out/bin/pypi2nix
+    echo "import pypi2nix.cli"          >> $out/bin/pypi2nix
+    echo "pypi2nix.cli.main()"          >> $out/bin/pypi2nix
+
+    chmod +x $out/bin/pypi2nix
+
+    export PYTHONPATH=$out/pkgs:$PYTHONPATH
+  '';
+
+  installPhase = commonPhase + ''
+    wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  shellHook = ''
+    export home=`pwd`
+    export out=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+
+    rm -rf $out
+    mkdir -p $out
+
+    cd $out
+    runHook unpackPhase
+    runHook commonPhase
+    cd $home
+
+    export PATH=$out/bin:$PATH
+    export PYTHONPATH=`pwd`/src:$PYTHONPATH
+  '';
+  meta = {
+    homepage = https://github.com/garbas/pypi2nix;
+    description = "A tool that generates nix expressions for your python packages, so you don't have to.";
+    maintainers = with stdenv.lib.maintainers; [ garbas ];
+  };
+}

pkgs/development/tools/pypi2nix/deps.nix

@@ -0,0 +1,68 @@
+{ fetchurl
+#, pypi_url ? "https://files.pythonhosted.org/packages"
+, pypi_url ? "https://pypi.io/packages/source/packages"
+}:
+
+rec {
+
+  pipVersion = "8.1.1";
+  pipHash = "6b86f11841e89c8241d689956ba99ed7";
+  pipWhlHash = "22db7b6a517a09c29d54a76650f170eb";
+
+  setuptoolsVersion = "21.0.0";
+  setuptoolsHash = "81964fdb89534118707742e6d1a1ddb4";
+  setuptoolsWhlHash = "6027400d6870a7dad29952b7d2dfdc7b";
+
+  zcbuildoutVersion = "2.5.1";
+  zcbuildoutHash = "c88947a3c021ee1509a331c4fa9be187";
+
+  zcrecipeeggVersion = "2.0.3";
+  zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";
+
+  wheelVersion = "0.29.0";
+  wheelHash = "555a67e4507cedee23a0deb9651e452f";
+
+  clickVersion = "6.6";
+  clickHash = "d0b09582123605220ad6977175f3e51d";
+
+  pipWhl = fetchurl {
+    url = "https://pypi.python.org/packages/31/6a/0f19a7edef6c8e5065f4346137cc2a08e22e141942d66af2e1e72d851462/pip-${pipVersion}-py2.py3-none-any.whl";
+    md5 = pipWhlHash;
+  };
+
+  setuptoolsWhl = fetchurl {
+    url = "https://pypi.python.org/packages/15/b7/a76624e5a3b18c8c1c8d33a5240b34cdabb08aef2da44b536a8b53ba1a45/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl";
+    md5 = setuptoolsWhlHash;
+  };
+
+  pip = fetchurl {
+    url = "${pypi_url}/source/p/pip/pip-${pipVersion}.tar.gz";
+    md5 = pipHash;
+  };
+
+  setuptools = fetchurl {
+    url = "${pypi_url}/source/s/setuptools/setuptools-${setuptoolsVersion}.tar.gz";
+    md5 = setuptoolsHash;
+  };
+
+  zcbuildout = fetchurl {
+    url = "${pypi_url}/source/z/zc.buildout/zc.buildout-${zcbuildoutVersion}.tar.gz";
+    md5 = zcbuildoutHash;
+  };
+
+  zcrecipeegg = fetchurl {
+    url = "${pypi_url}/source/z/zc.recipe.egg/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";
+    md5 = zcrecipeeggHash;
+  };
+
+  wheel = fetchurl {
+    url = "${pypi_url}/source/w/wheel/wheel-${wheelVersion}.tar.gz";
+    md5 = wheelHash;
+  };
+
+  click = fetchurl {
+    url = "${pypi_url}/source/c/click/click-${clickVersion}.tar.gz";
+    md5 = clickHash;
+  };
+
+}

pkgs/development/tools/redis-dump/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: vendor
+BUNDLE_DISABLE_SHARED_GEMS: '1'

pkgs/development/tools/redis-dump/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'redis-dump'

pkgs/development/tools/redis-dump/Gemfile.lock

@@ -0,0 +1,21 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    drydock (0.6.9)
+    redis (3.3.0)
+    redis-dump (0.3.5)
+      drydock (>= 0.6.9)
+      redis (>= 2.0)
+      uri-redis (>= 0.4.0)
+      yajl-ruby (>= 0.1)
+    uri-redis (0.4.2)
+    yajl-ruby (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  redis-dump
+
+BUNDLED WITH
+   1.11.2

pkgs/development/tools/redis-dump/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
+
+bundlerEnv {
+  name = "redis-dump-0.3.5";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  buildInputs = [ perl autoconf ];
+
+  meta = with lib; {
+    description = "Backup and restore your Redis data to and from JSON";
+    homepage    = http://delanotes.com/redis-dump/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ offline ];
+    platforms   = platforms.unix;
+  };
+}

pkgs/development/tools/redis-dump/gemset.nix

@@ -0,0 +1,41 @@
+{
+  drydock = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grf3361mh93lczljmnwafl7gbcp9kk1bjpfwx4ykpd43fzdbfyj";
+      type = "gem";
+    };
+    version = "0.6.9";
+  };
+  redis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v68ggm0pwcyml3ngfyngwgvypwmsrmji1kyx48qqcg045zjs5p6";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  redis-dump = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y6s3nvcw84jqqvp9pjg9qmqyc0b8jkrp0dknhjjr0lg2q3fq87h";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  uri-redis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13n8ak41rikkbmml054pir4i1xbgjpmf3dbqihc2kcrgmz3dg81a";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  yajl-ruby = {
+    source = {
+      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+}