Merge branch 'master' into staging

4 files changed, 32 insertions, 53 deletions

diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index c9c526bc520f..d8f53a032af8 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-    name = "abduco-0.4";
+    name = "abduco-0.5";
 
     meta = {
         homepage = http://brain-dump.org/projects/abduco;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
     src = fetchurl {
         url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz";
-        sha256 = "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx";
+        sha256 = "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz";
     };
 
     configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
diff --git a/pkgs/tools/misc/mates/default.nix b/pkgs/tools/misc/mates/default.nix
deleted file mode 100644
index 952bd1a2b7d9..000000000000
--- a/pkgs/tools/misc/mates/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  name = "mates-${version}";
-  version = "0.1.0";
-
-  depsSha256 = "03mqw9zs3hbsgz8m3qbrbbcg2q47nldfx280dyv0ivfksnlc7lyc";
-
-  src = fetchFromGitHub {
-    owner = "untitaker";
-    repo = "mates";
-    rev = "${version}";
-    sha256 = "00dpl7vh2byb4v94zxjbcqj7jnq65vcbrlpkxrrii0ip13dr69pw";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Very simple commandline addressbook";
-    homepage = https://github.com/untitaker/mates.rs;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.DamienCassou ];
-  };
-}
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 376d0ea6ad5c..f9512b09ce66 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,22 +1,25 @@
 { stdenv, fetchurl, gettext }:
 
-let version = "2.5.1"; in
+let version = "2.5.2"; in
 stdenv.mkDerivation rec {
   name = "ms-sys-${version}";
  
   src = fetchurl {
     url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
-    sha256 = "1vw8yvcqb6iccs4x7rgk09mqrazkalmpxxxsxmvxn32jzdzl5b26";
+    sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px";
   };
 
   buildInputs = [ gettext ];
 
+  enableParallelBuilding = true;
+
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
-    homepage = http://ms-sys.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
     description = "A program for writing Microsoft compatible boot records";
+    homepage = http://ms-sys.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index 49c2736095e4..46dbc2a2a224 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,37 +1,37 @@
-{stdenv, clang, fetchurl, curl}:
+{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }:
 
-with stdenv.lib;
-
-let version = "1.0"; in
+let version = "1.1.0"; in
 stdenv.mkDerivation {
   name = "tldr-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz";
-    sha256 = "11k2pc4vfhx9q3cfd1145sdwhis9g0zhw4qnrv7s7mqnslzrrkgw";
+  src = fetchFromGitHub {
+    sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz";
+    rev = "v${version}";
+    repo = "tldr-cpp-client";
+    owner = "tldr-pages";
   };
 
-  meta = {
+  buildInputs = [ curl clang libzip ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  preConfigure = ''
+    cd src
+  '';
+
+  installPhase = ''
+    install -Dm755 {.,$out/bin}/tldr
+  '';
+
+  meta = with stdenv.lib; {
     inherit version;
     description = "Simplified and community-driven man pages";
     longDescription = ''
-      tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags.
+      tldr pages gives common use cases for commands, so you don't need to hunt
+      through a man page for the correct flags.
     '';
     homepage = http://tldr-pages.github.io;
     license = licenses.mit;
-    maintainers = [maintainers.taeer];
+    maintainers = with maintainers; [ taeer nckx ];
     platforms = platforms.linux;
-
   };
-
-  buildInputs = [curl clang];
-
-  preBuild = ''
-    cd src
-  '';
-
-  installPhase = ''
-    install -d $prefix/bin
-    install tldr $prefix/bin
-  '';
 }