Merge remote-tracking branch 'tv/master'

2 files changed, 22 insertions, 16 deletions

diff --git a/tv/5pkgs/simple/field.nix b/tv/5pkgs/simple/field.nix
new file mode 100644
index 000000000..71362398d
--- /dev/null
+++ b/tv/5pkgs/simple/field.nix
@@ -0,0 +1,6 @@
+{ gawk, writeDashBin }:
+
+writeDashBin "field" ''
+  set -u
+  exec ${gawk}/bin/awk -v n="$1" '{print$n}'
+''
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
index 0ae4ed880..0414eae09 100644
--- a/tv/5pkgs/simple/utsushi.nix
+++ b/tv/5pkgs/simple/utsushi.nix
@@ -46,33 +46,34 @@ let
   '';
 
   imagescan-plugin-networkscan = stdenv.mkDerivation rec {
-    name = "imagescan-plugin-networkscan-${meta.version}";
+    pname = "imagescan-plugin-networkscan";
+    version = "1.1.3";
 
     src =
       if stdenv.system == "i686-linux" then
         fetchurl {
           urls = [
-            "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-3.55.0.x86.deb.tar.gz"
-            "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.55.0.x86.deb.tar.gz"
+            "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-3.59.2.x86.deb.tar.gz"
+            "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.59.2.x86.deb.tar.gz"
           ];
-          sha256 = "12syk4y8z22hm9r1lgxqp81vd24jbqgmq83b7yiyqfd4wfxb6k3s";
+          sha256 = "1whw96kcfj65h2jnk72xgyr9jj05fa07d0xjxpaqb0zwdag3465g";
         }
       else if stdenv.system == "x86_64-linux" then
         fetchurl {
           urls = [
-            "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-3.55.0.x64.deb.tar.gz"
-            "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.55.0.x64.deb.tar.gz"
+            "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-3.59.2.x64.deb.tar.gz"
+            "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.59.2.x64.deb.tar.gz"
           ];
-          sha256 = "1wp372hqhzdar6ldxy7s9js2s872x8c5nwq3608dwg9gca11ppc5";
+          sha256 = "0kd6mrs48wwss54gw4v9fm7ss5ma2xpn6gd1pz26cgjvp6n8hknn";
         }
-      else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
+      else throw "${pname} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 
     dontBuild = true;
 
     installPhase = ''
       # Wildcard * stand for either i386 or amd64
       ${dpkg}/bin/dpkg -x \
-          plugins/imagescan-plugin-networkscan_${meta.version}-1epson4debian9_*.deb \
+          plugins/imagescan-plugin-networkscan_${version}-1epson4debian9_*.deb \
           tmp
 
       mv tmp/usr $out
@@ -94,25 +95,25 @@ let
         This package provides the unfree networkscan plugin from the Epson
         Image Scan v3 scanner driver bundle, which can be used by Utsushi.
       '';
-      homepage = "http://support.epson.net/linux/en/imagescanv3.php?version=${meta.version}";
+      homepage = "http://support.epson.net/linux/en/imagescanv3.php?version=${version}";
       license = stdenv.lib.licenses.eapl;
       maintainers = [ stdenv.lib.maintainers.tv ];
       platforms = stdenv.lib.platforms.linux;
-      version = "1.1.2";
     };
   };
 
 in
 
 stdenv.mkDerivation rec {
-  name = "utsushi-${meta.version}";
+  pname = "utsushi";
+  version = "3.59.2";
 
   src = fetchurl {
     urls = [
-      "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz"
-      "http://ni.r/~tv/mirrors/epson/imagescan_${meta.version}.orig.tar.gz"
+      "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${version}.orig.tar.gz"
+      "http://ni.r/~tv/mirrors/epson/imagescan_${version}.orig.tar.gz"
     ];
-    sha256 = "0xwl4xp07cigslbi1qc52jsjvxcyvjlx54g812mn7211p01v2h4l";
+    sha256 = "1mns10mpyjprkrh2bjcg2nda9iyrnd0pf1did9py84glpapkzrdq";
   };
 
   preConfigure = ''
@@ -212,6 +213,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.linux;
-    version = "3.55.0";
   };
 }