Merge branch 'kde-5' into staging

3 files changed, 58 insertions, 7 deletions

diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix
new file mode 100644
index 000000000000..9e936548050f
--- /dev/null
+++ b/pkgs/tools/misc/geteltorito/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, perl, ronn, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "geteltorito-${version}";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+      owner = "Profpatsch";
+      repo = "geteltorito";
+      rev = version;
+      sha256 = "05bcn3pam29xmsz1ykyqsdbkz8y23kcrvvhm987f65wd1g741f75";
+  };
+
+  buildInputs = [ perl ronn ];
+
+  unpackCmd = "";
+  dontBuild = true;
+  configurePhase = "";
+  installPhase = ''
+    # reformat README to ronn markdown
+    cat > README.new <<EOF
+    geteltorito -- ${meta.description}
+    ===========
+
+    ## SYNOPSIS
+
+    EOF
+
+    # skip the first two lines
+    # -e reformat function call
+    # -e reformat example
+    # -e make everything else (that is no code) that contains `: ` a list item
+    tail -n +3 README | sed \
+        -e 's/^\(call:\s*\)\(getelt.*\)$/\1`\2`/' \
+        -e 's/^\(example:\s*\)\(getelt.*\)$/\1 `\2`/' \
+        -e 's/^\(.*: \)/- \1/g' \
+           >> README.new
+    mkdir -p $out/man/man1
+    ronn --roff README.new --pipe > $out/man/man1/geteltorito.1
+    install -vD geteltorito $out/bin/geteltorito
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Extract the initial/default boot image from a CD image if existent";
+    homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/";
+    maintainer = [ maintainers.profpatsch ];
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index fbd2c642b9d2..e840aa15ec20 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.17";
+  version = "4.8.18";
   
   src = fetchurl {
-    url = "http://www.midnight-commander.org/downloads/${name}.tar.bz2";
-    sha256 = "0fvqzffppj0aja9hi0k1xdjg5m6s99immlla1y9yzn5fp8vwpl36";    
+    url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
+    sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp";
   };
   
   buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs
@@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
   meta = {
     description = "File Manager and User Shell for the GNU Project";
     homepage = http://www.midnight-commander.org;
+    downloadPage = "http://www.midnight-commander.org/downloads/";
     repositories.git = git://github.com/MidnightCommander/mc.git;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
     platforms = stdenv.lib.platforms.linux;
+    updateWalker = true;
   };
 }
diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix
index 738363bd47a4..0695504cc012 100644
--- a/pkgs/tools/system/r10k/default.nix
+++ b/pkgs/tools/system/r10k/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, makeWrapper, docker, git, gnutar, gzip, ruby }:
+{ stdenv, lib, bundlerEnv, makeWrapper, git, gnutar, gzip, ruby }:
 
 stdenv.mkDerivation rec {
   name = "r10k-${version}";
@@ -21,14 +21,13 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/r10k $out/bin/r10k \
-      --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
+      --set PATH ${stdenv.lib.makeBinPath [ git gnutar gzip ]}
   '';
 
   meta = with lib; {
     description = "Puppet environment and module deployment";
     homepage    = https://github.com/puppetlabs/r10k;
-    license 	= licenses.asl20;
+    license     = licenses.asl20;
     maintainers = with maintainers; [ zimbatm ];
-    platforms 	= docker.meta.platforms;
   };
 }