Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1287298

7 files changed, 239 insertions, 22 deletions

diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix
new file mode 100644
index 000000000000..c7a686201b0d
--- /dev/null
+++ b/pkgs/tools/text/par/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, fetchpatch}:
+
+stdenv.mkDerivation {
+  name = "par-1.52";
+
+  src = fetchurl {
+    url = http://www.nicemice.net/par/Par152.tar.gz;
+    sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082";
+  };
+
+  patches = [
+    # A patch by Jérôme Pouiller that adds support for multibyte
+    # charsets (like UTF-8), plus Debian packaging.
+    (fetchpatch {
+      url = "http://sysmic.org/dl/par/par-1.52-i18n.4.patch";
+      sha256 = "0alw44lf511jmr38jnh4j0mpp7vclgy0grkxzqf7q158vzdb6g23";
+    })
+  ];
+
+  buildPhase = ''make -f protoMakefile'';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp par $out/bin
+
+    mkdir -p $out/share/man/man1
+    cp  par.1 $out/share/man/man1
+  '';
+
+
+  meta = {
+    homepage = http://www.nicemice.net/par/;
+    description = "Paragraph reflow for email";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json
index fc137e262983..5578478eb4c3 100644
--- a/pkgs/tools/text/platinum-searcher/deps.json
+++ b/pkgs/tools/text/platinum-searcher/deps.json
@@ -1,16 +1,83 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/BurntSushi/toml",
-      "github.com/monochromegane/conflag",
-      "github.com/monochromegane/go-home",
-      "github.com/monochromegane/terminal",
-      "github.com/monochromegane/go-gitignore",
-      "github.com/shiena/ansicolor",
-      "golang.org/x/text",
-      "gopkg.in/yaml.v2",
-      "github.com/jessevdk/go-flags"
-    ]
-  }
+    {
+        "goPackagePath": "gopkg.in/yaml.v2",
+        "fetch": {
+            "type": "git",
+            "url": "https://gopkg.in/yaml.v2",
+            "rev": "a83829b6f1293c91addabc89d0571c246397bbf4",
+            "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/jessevdk/go-flags",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/jessevdk/go-flags",
+            "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+            "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+        }
+    },
+    {
+        "goPackagePath": "github.com/BurntSushi/toml",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/BurntSushi/toml",
+            "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
+            "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
+        }
+    },
+    {
+        "goPackagePath": "golang.org/x/text",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/text",
+            "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e",
+            "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"
+        }
+    },
+    {
+        "goPackagePath": "github.com/monochromegane/conflag",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/monochromegane/conflag",
+            "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9",
+            "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/monochromegane/go-home",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/monochromegane/go-home",
+            "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401",
+            "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"
+        }
+    },
+    {
+        "goPackagePath": "github.com/monochromegane/terminal",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/monochromegane/terminal",
+            "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48",
+            "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"
+        }
+    },
+    {
+        "goPackagePath": "github.com/monochromegane/go-gitignore",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/monochromegane/go-gitignore",
+            "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729",
+            "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"
+        }
+    },
+    {
+        "goPackagePath": "github.com/shiena/ansicolor",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/shiena/ansicolor",
+            "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b",
+            "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"
+        }
+    }
 ]
diff --git a/pkgs/tools/text/reckon/Gemfile b/pkgs/tools/text/reckon/Gemfile
new file mode 100644
index 000000000000..f708ddd93664
--- /dev/null
+++ b/pkgs/tools/text/reckon/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'reckon'
diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock
new file mode 100644
index 000000000000..0ede7e2a2564
--- /dev/null
+++ b/pkgs/tools/text/reckon/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chronic (0.10.2)
+    fastercsv (1.5.5)
+    highline (1.7.8)
+    reckon (0.4.4)
+      chronic (>= 0.3.0)
+      fastercsv (>= 1.5.1)
+      highline (>= 1.5.2)
+      terminal-table (>= 1.4.2)
+    terminal-table (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  reckon
+
+BUNDLED WITH
+   1.12.5
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
new file mode 100644
index 000000000000..370fcf265d51
--- /dev/null
+++ b/pkgs/tools/text/reckon/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, bundlerEnv, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "reckon-${version}";
+  version = "0.4.4";
+
+  env = bundlerEnv {
+    name = "${name}-gems";
+
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/reckon $out/bin/reckon
+  '';
+
+  meta = with lib; {
+    description = "Flexibly import bank account CSV files into Ledger for command line accounting";
+    license = licenses.mit;
+    maintainers = "mckean.kylej@gmail.com";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix
new file mode 100644
index 000000000000..e1e4a43188df
--- /dev/null
+++ b/pkgs/tools/text/reckon/gemset.nix
@@ -0,0 +1,42 @@
+{
+  chronic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  fastercsv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  reckon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p6w8w7vpl8fq4yfggrxbv6ph76psg7l5b4q29a8zvfbzzx6a0xw";
+      type = "gem";
+    };
+    version = "0.4.4";
+  };
+  terminal-table = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/text/sift/deps.json b/pkgs/tools/text/sift/deps.json
index 649660353ad2..3869e6e5ca9a 100644
--- a/pkgs/tools/text/sift/deps.json
+++ b/pkgs/tools/text/sift/deps.json
@@ -1,10 +1,29 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-        "github.com/svent/go-flags",
-        "github.com/svent/go-nbreader",
-        "golang.org/x/crypto"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/svent/go-flags",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/svent/go-flags",
+            "rev": "4bcbad344f0318adaf7aabc16929701459009aa3",
+            "sha256": "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"
+        }
+    },
+    {
+        "goPackagePath": "github.com/svent/go-nbreader",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/svent/go-nbreader",
+            "rev": "7cef48da76dca6a496faa7fe63e39ed665cbd219",
+            "sha256": "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"
+        }
+    }
 ]