Merge branch 'master' into staging-next

Hydra: ?compare=1472947

pkgs/tools/misc/alarm-clock-applet/default.nix

@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, fetchFromGitHub
+, pkgconfig
+, autoconf
+, automake111x
+, libtool
+
 , glib
 , gtk2
 , gst_all_1
@@ -15,16 +20,27 @@ stdenv.mkDerivation rec {
   version = "0.3.4";
   name = "alarm-clock-applet-${version}";
 
-  src = fetchurl {
-    url = "http://launchpad.net/alarm-clock/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1mrrw5cgv0izdmhdg83vprvbj6062yzk77b2nr1nx6hhmk00946r";
+  src = fetchFromGitHub {
+    owner = "joh";
+    repo = "alarm-clock";
+    rev = version;
+    sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn";
   };
 
   nativeBuildInputs = [
-    makeWrapper
     pkgconfig
+    intltool
+    automake111x
+    autoconf
+    libtool
+
+    gnome2.gnome-common
+
+    wrapGAppsHook
   ];
 
+  preConfigure = "./autogen.sh";
+
   buildInputs = [
     glib
     gtk2
@@ -34,8 +50,6 @@ stdenv.mkDerivation rec {
     libnotify
     libxml2
     libunique
-    intltool
-    wrapGAppsHook
   ] ++ gst_plugins;
 
   propagatedUserEnvPkgs = [ gnome2.GConf.out ];

pkgs/tools/misc/appdata-tools/default.nix

@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4
-, intltool, glib, libsoup, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  version = "0_1_7";
-  name = "appdata_tools-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz";
-    sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake m4 intltool glib
-                  libsoup gdk_pixbuf ];
-
-  configureScript = "./autogen.sh";
-
-  meta = with stdenv.lib; {
-    homepage = https://people.freedesktop.org/~hughsient/appdata;
-    description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide";
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ lethalman ];
-  };
-}

pkgs/tools/misc/convmv/default.nix

@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     description = "Converts filenames from one encoding to another";
     platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
     maintainers = [ ];
+    license = licenses.gpl2Plus;
   };
 }

pkgs/tools/misc/diskscan/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux;
     maintainers = with maintainers; [ peterhoeg ];
     inherit version;
+    license = licenses.gpl3;
   };
 }

pkgs/tools/misc/disper/default.nix

@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     description = "On-the-fly display switch utility";
     homepage = http://willem.engen.nl/projects/disper/;
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
   };
 
 }

pkgs/tools/misc/fondu/default.nix

@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
   };
 }

pkgs/tools/misc/moreutils/default.nix

@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = https://joeyh.name/code/moreutils/;
     maintainers = with maintainers; [ koral pSub ];
     platforms = platforms.all;
+    license = licenses.gpl2Plus;
   };
 }

pkgs/tools/misc/multitail/default.nix

@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "tail on Steroids";
     maintainers = with stdenv.lib.maintainers; [ ];
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/misc/opentimestamps-client/default.nix

@@ -1,5 +1,6 @@
 { lib, buildPythonApplication, fetchFromGitHub, isPy3k
-, opentimestamps, appdirs, GitPython, pysocks }:
+, opentimestamps, appdirs, GitPython, pysocks, fetchpatch, git
+}:
 
 buildPythonApplication rec {
   pname = "opentimestamps-client";
@@ -15,6 +16,15 @@ buildPythonApplication rec {
     sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch";
+      sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl";
+    })
+  ];
+
+  checkInputs = [ git ];
+
   propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ];
 
   meta = {

pkgs/tools/misc/renameutils/default.nix

@@ -16,5 +16,6 @@ stdenv.mkDerivation {
     homepage = http://www.nongnu.org/renameutils/;
     description = "A set of programs to make renaming of files faster";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/misc/riemann-tools/default.nix

@@ -1,8 +1,14 @@
-{ bundlerEnv }:
+{ stdenv, bundlerEnv }:
 
 bundlerEnv {
   name = "riemann-tools-0.2.13";
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
+
+  meta = {
+    description = "Tools to submit data to Riemann";
+    homepage = "https://riemann.io";
+    license = stdenv.lib.licenses.mit;
+  };
 }

pkgs/tools/misc/uudeview/default.nix

@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ tcl tk ];
   hardeningDisable = [ "format" ];
   configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ];
+
+  # https://wiki.tcl.tk/3577
+  patches = [ ./matherr.patch ];
   postPatch = ''
     substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
   '';

pkgs/tools/misc/uudeview/matherr.patch

@@ -0,0 +1,19 @@
+diff --git a/tcl/uutcl.c b/tcl/uutcl.c
+index f101f2ce52b..71c24688dc4 100644
+--- a/tcl/uutcl.c
++++ b/tcl/uutcl.c
+@@ -48,14 +48,6 @@
+ #include <tcl.h>
+ #endif
+
+-/*
+- * The following variable is a special hack that is needed in order for
+- * Sun shared libraries to be used for Tcl.
+- */
+-
+-extern int matherr();
+-int *tclDummyMathPtr = (int *) matherr;
+-
+ #include <uudeview.h>
+ #include <uuint.h>
+ #include <fptools.h>

pkgs/tools/misc/wv/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Converter from Microsoft Word formats to human-editable ones";
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl2;
   };
 }