From aab20cdc510dc2cf109061992acd02bd19415f7d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 9 Dec 2015 16:24:17 -0600
Subject: rubber: 1.1 -> 1.3

* version upgrade
* minor formatting change
* assign ttuegel as maintainer
---
 pkgs/tools/typesetting/rubber/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'pkgs/tools/typesetting/rubber/default.nix')

diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index 7c58c480a791..101f43e86ce6 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -1,22 +1,21 @@
 { fetchurl, stdenv, python, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "rubber-1.1";
+  name = "rubber-1.3";
 
   src = fetchurl {
-    url = "http://ebeffara.free.fr/pub/${name}.tar.gz";
-    sha256 = "1xbkv8ll889933gyi2a5hj7hhh216k04gn8fwz5lfv5iz8s34gbq";
+    url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz";
+    sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh";
   };
 
   buildInputs = [ python texinfo ];
 
-  patchPhase = "substituteInPlace configure --replace which \"type -P\"";
-
-  postInstall = "rm $out/share/rubber/modules/etex.rub";
+  patchPhase = ''
+    substituteInPlace configure --replace which "type -P"
+  '';
 
   meta = {
     description = "Wrapper for LaTeX and friends";
-
     longDescription = ''
       Rubber is a program whose purpose is to handle all tasks related
       to the compilation of LaTeX documents.  This includes compiling
@@ -26,9 +25,8 @@ stdenv.mkDerivation rec {
       produce PostScript documents is also included, as well as usage
       of pdfLaTeX to produce PDF documents.
     '';
-
     license = stdenv.lib.licenses.gpl2Plus;
-
     homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/;
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
 }
-- 
cgit 1.4.1


From 3856e6939fc683c2568afb1889311e97728022a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 9 Dec 2015 16:27:49 -0600
Subject: rubber: wrap Python programs

---
 pkgs/tools/typesetting/rubber/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools/typesetting/rubber/default.nix')

diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index 101f43e86ce6..96e1f532bffd 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, texinfo }:
+{ fetchurl, stdenv, python, pythonPackages, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "rubber-1.3";
@@ -9,11 +9,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ python texinfo ];
+  nativeBuildInputs = [ pythonPackages.wrapPython ];
 
   patchPhase = ''
     substituteInPlace configure --replace which "type -P"
   '';
 
+  postInstall = "wrapPythonPrograms";
+
   meta = {
     description = "Wrapper for LaTeX and friends";
     longDescription = ''
-- 
cgit 1.4.1