Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/text/popfile/default.nix

@@ -25,15 +25,12 @@ stdenv.mkDerivation rec {
     TimeDate # == DateParse
     HTMLTemplate
     # IO::Socket::Socks is not in nixpkgs
-    # IOSocketSocks 
+    # IOSocketSocks
     IOSocketSSL
     NetSSLeay
     SOAPLite
   ]);
 
-
-  phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ];
-
   installPhase = ''
     mkdir -p $out/bin
     # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax
@@ -42,11 +39,7 @@ stdenv.mkDerivation rec {
     cp -r * $out/bin
     cd $out/bin
     chmod +x *.pl
-  '';
 
-  patchPhase = "patchShebangs $out";
-
-  postInstall = ''
     find $out -name '*.pl' -executable | while read path; do
       wrapProgram "$path" \
         --prefix PERL5LIB : $PERL5LIB:$out/bin \
@@ -66,6 +59,4 @@ stdenv.mkDerivation rec {
     # http://getpopfile.org/docs/faq:systemrequirements
     platforms = stdenv.lib.platforms.linux;
   };
-
 }
-  

pkgs/tools/text/sgml/opensp/compat.nix

@@ -1,21 +0,0 @@
-{ stdenv, opensp }:
-
-stdenv.mkDerivation {
-  name = "sp-compat-${stdenv.lib.getVersion opensp}";
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    for i in ${opensp}/bin/o*; do
-      ln -sv $i $out/bin/''${i#${opensp}/bin/o}
-    done
-    '';
-
-  setupHook = opensp.setupHook;
-
-  meta = opensp.meta // {
-    description = "Compatibility wrapper for old programs looking for original sp programs";
-    platforms = stdenv.lib.platforms.unix;
-  };
-}