Merge pull request #813 from bodil/master

Add Ponysay

pkgs/tools/misc/ponysay/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "ponysay-3.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
+    sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
+  };
+
+  buildInputs = [ python3 texinfo makeWrapper ];
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  patches = [ ./pathfix.patch ];
+
+  installPhase = ''
+    python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  meta = {
+    description = "cowsay reimplemention for ponies.";
+    homepage = http://terse.tk/ponysay/;
+    license = "GPLv3";
+  };
+}

pkgs/tools/misc/ponysay/pathfix.patch

@@ -0,0 +1,24 @@
+diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py
+--- ponysay-3.0.1/setup.py	2013-04-05 14:28:18.000000000 +0200
++++ ponysay.p/setup.py	2013-08-10 01:09:30.181043877 +0200
+@@ -514,7 +514,7 @@
+                 for command in commands:
+                     sourceed = 'completion/ponysay.%s' % (command)
+                     generated = 'completion/%s-completion.%s' % (shell, command)
+-                    generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
++                    generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
+                     Popen(generatorcmd.split(' ')).communicate()
+                     if conf[command] is not None:
+                         dest = generated + '.install'
+@@ -559,9 +559,9 @@
+                 for toolcommand in ('--dimensions', '--metadata'):
+                     if not self.free:
+                         print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
+-                        Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
++                        Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+                     else:
+-                        params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
++                        params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--']
+                         for sharefile in os.listdir(sharedir):
+                             if sharefile.endswith('.pony') and (sharefile != '.pony'):
+                                 if not Setup.validateFreedom(sharedir + '/' + sharefile):

pkgs/top-level/all-packages.nix

@@ -1526,6 +1526,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  ponysay = callPackage ../tools/misc/ponysay { };
+
   povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };