Adopt a few packages

3 files changed, 58 insertions, 53 deletions

diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix
index b97c9def822..06dfd28b739 100644
--- a/pkgs/tools/X11/xlaunch/default.nix
+++ b/pkgs/tools/X11/xlaunch/default.nix
@@ -3,57 +3,61 @@
 # !!! What does this package do, and does it belong in Nixpkgs?
 
 stdenv.mkDerivation {
-	name = "xlaunch";
-	inherit xorgserver;
-	buildCommand = "
-		cat << EOF > realizeuid.c
-		#include <sys/types.h>
-		#include <unistd.h>
-		#include <stdio.h>
-		int main(int argc, char ** argv, char ** envp)
-		{
-			uid_t a,b,c;
-			int i;
-			char *nargv[10000];
-			char arg1 [10];
-			nargv[0]=argv[0];
-			for (i=1; i<=argc; i++){
-				nargv[i+1]=argv[i];
-			}
-			nargv[1]=arg1;
-			getresuid (&a,&b,&c);
-			snprintf(arg1,8,\"%d\",a);
-			setresuid(c,c,c);
-			execve(\"\$out/libexec/xlaunch\", nargv, envp);
-		}
+  name = "xlaunch";
+  inherit xorgserver;
+  buildCommand = "
+    cat << EOF > realizeuid.c
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    int main(int argc, char ** argv, char ** envp)
+    {
+      uid_t a,b,c;
+      int i;
+      char *nargv[10000];
+      char arg1 [10];
+      nargv[0]=argv[0];
+      for (i=1; i<=argc; i++){
+        nargv[i+1]=argv[i];
+      }
+      nargv[1]=arg1;
+      getresuid (&a,&b,&c);
+      snprintf(arg1,8,\"%d\",a);
+      setresuid(c,c,c);
+      execve(\"\$out/libexec/xlaunch\", nargv, envp);
+    }
 EOF
-		mkdir -p \$out/bin
-		mkdir -p \$out/libexec
-		gcc realizeuid.c -o \$out/bin/xlaunch
-		echo '#! ${stdenv.shell}
-			USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' )
-			shift
-			case \"\$1\" in 
-				:*) export _display=\"\$1\"; 
-				shift
-			esac
-			_display=\${_display:-:0}
-			_display=\${_display#:}
-			echo Using :\$_display
-			if [ -n \"\$DO_X_RESET\" ]; then 
-			  RESET_OPTION=\"-once\"
-			else
-			  RESET_OPTION=\"-noreset\"
-			fi;
-			XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
-			PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
-			echo \"\$PRE_XCMD\" 
-			echo \"\$PRE_XCMD\" | bash
-			echo \"\$XCMD\" 
-			echo \"\$XCMD\" | bash &
-			while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done
-			su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\";
-		' >\$out/libexec/xlaunch
-		chmod a+x \$out/libexec/xlaunch
-	";
+    mkdir -p \$out/bin
+    mkdir -p \$out/libexec
+    gcc realizeuid.c -o \$out/bin/xlaunch
+    echo '#! ${stdenv.shell}
+      USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' )
+      shift
+      case \"\$1\" in 
+        :*) export _display=\"\$1\"; 
+        shift
+      esac
+      _display=\${_display:-:0}
+      _display=\${_display#:}
+      echo Using :\$_display
+      if [ -n \"\$DO_X_RESET\" ]; then 
+        RESET_OPTION=\"-once\"
+      else
+        RESET_OPTION=\"-noreset\"
+      fi;
+      XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
+      PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
+      echo \"\$PRE_XCMD\" 
+      echo \"\$PRE_XCMD\" | bash
+      echo \"\$XCMD\" 
+      echo \"\$XCMD\" | bash &
+      while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done
+      su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\";
+    ' >\$out/libexec/xlaunch
+    chmod a+x \$out/libexec/xlaunch
+  ";
+  meta = {
+    description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session'';
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
 }
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index cd0cea13a14..0bf1ec736fc 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "A port of the 7-zip archiver";
     # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction"
     platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
   };
 }
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 2b60bef197a..ed60e3147a8 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK+ front-end for command line archiving tools";
-    mainatainers = [ stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };